Merge pull request 'fixed bugs' (#177) from temp/bug-fix-250226 into main

Reviewed-on: Pozomind/pozo-retail-app#177

src/Pages/BookingScreen/Components/BSBillingTables/ComboBillTableEdit/ComboEditQtyAndRate.jsx

@@ -3262,7 +3262,7 @@ const ComboEditQtyAndRate = (props) => {
               min="0"
               onChange={(e) => quantityValidation(e.target.value)}
               onBlur={() => {
-                if (Quantity && Quantity.trim() !== '') {
+                if (Quantity && String(Quantity || '').trim() !== '') {
                   AddProductQuantity();
                 }
               }}

src/Pages/BookingScreen/Components/UtillComponents/BSNavBarDragItems.jsx

@@ -33,11 +33,12 @@ import { DropDowns } from '../../../../Components/Forms/DropDown.jsx';
 import { Messages } from '../../../../Components/Notifications/Messages.jsx';
 import '../../../../Styles/BookingScreen/Components/UtillComponents/BSNavBarDragItems.scss';
 import { getTemplateData } from '../../../../Features/ThemeChange/ThemeChange.js';
+import { capitalizeFirstLetter } from '../../../../utils/calculations.js';
 
 const BSNavBarDragItems = ({
   type,
   drawerOpen = false,
-  setDrawerOpen = () => {},
+  setDrawerOpen = () => { },
 }) => {
   const draggingComponent = useSelector(GlobaldraggingComponent);
   const GlobalisFavClickedCheck = useSelector(GlobalisFavClicked);
@@ -199,7 +200,7 @@ const BSNavBarDragItems = ({
                       draggingComponent === item.name ? 'selected' : ''
                     }
                   >
-                    {item.name}
+                    {capitalizeFirstLetter(item.name)}
                   </button>
                 ))}
               </div>
@@ -319,7 +320,7 @@ const BSNavBarDragItems = ({
                           )}
                         </Draggable>
                       ))
-                      : 'NO data Found'}
+                      : 'No Data Found'}
                     {provided.placeholder}
                   </div>
                 )}

src/Pages/Payment/PaymentOptions/PaymentOptions.jsx

@@ -55,6 +55,7 @@ function PaymentOptions({ setModalOpen }) {
   const [paymentMode, setPaymentMode] = useState([]);
   const [BusinessUpiModes, setBusinessUpiModes] = useState([]);
   const [paymentGatewayMode, setPaymentGatewayMode] = useState([]);
+  console.log(paymentOptions, "paymentOptions", BusinessUpiModes)
   const [paymentDeviceMode, setPaymentDeviceMode] = useState([]);
   const [selectedConfigs, setSelectedConfigs] = useState({
     salesDetails: [],
@@ -421,7 +422,6 @@ function PaymentOptions({ setModalOpen }) {
           BranchId: BranchId,
           DetailType: 'BU',
         };
-        ALERT('HIH');
         const Businessupidetails = await dispatch(
           getPaymentUPIDetails(BusiData)
         ).unwrap();
@@ -864,8 +864,7 @@ function PaymentOptions({ setModalOpen }) {
         {configDetails?.some((detail) =>
           detail?.optionDetails?.some((opt) => opt.optionName === configName)
         ) &&
-          modeOptions.length > 0 &&
+          modeOptions.length > 0 ? (configName === 'Business Upi' && section === 'kioskSales' ? (
-          (configName === 'Business Upi' && section === 'kioskSales' ? (
             <Radio.Group
               value={getSelectedRadioValue()}
               onChange={(e) => {
@@ -951,7 +950,7 @@ function PaymentOptions({ setModalOpen }) {
                 </div>
               );
             })
-          ))}
+          )) : <div style={{ color: '#c71b1d' }}>No payment methods available</div>}
       </div>
     );
   };

src/Pages/StockTransfer/StockReceived.jsx

@@ -121,7 +121,7 @@ const StockReceived = ({ productDetails, editable = true, onDataChange }) => {
               <th className="tableheaderSR">Products</th>
               <th className="tableheaderSR">Category</th>
               <th className="tableheaderSR">Sub Category</th>
-              <th className="tableheaderSR">Varient</th>
+              <th className="tableheaderSR">Variant</th>
               <th className="tableheaderSR">Received Qty</th>
               <th className="tableheaderSR-accepted">Accepted Qty</th>
             </tr>

src/Styles/BookingScreen/Components/BSItemCards/BSItemCard.scss

@@ -99,7 +99,7 @@
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
- }
+}
 
 .BSItemCard-itemPrice {
   color: #52c41a;
@@ -333,6 +333,7 @@
     width: 8rem !important;
     height: 6rem !important;
   }
+
   .BSItemCard-itemName {
     width: 60px !important;
     font-size: 10px;
@@ -385,7 +386,7 @@
   border-spacing: 0px;
 }
 
-.QRStockchange-table .ant-table-wrapper .ant-table-thead > tr > th {
+.QRStockchange-table .ant-table-wrapper .ant-table-thead>tr>th {
   color: black !important;
   font-weight: 600 !important;
   font-size: 14px;
@@ -407,6 +408,7 @@
 .BkPrdCardDeActive {
   // pointer-events: none;
   border: 1px solid #f10000;
+
   // border-radius: 8px;
   .BSItemCard-container-smallimage {
     width: 10.9rem;
@@ -440,7 +442,7 @@
   padding: 1.8rem 0.5rem;
   column-gap: 0.5rem;
   row-gap: 1rem;
- }
+}
 
 .Brand-Card-modal-table::-webkit-scrollbar {
   width: 10px !important;
@@ -555,13 +557,13 @@
   background-color: #fafafa;
 }
 
-.Card-modal-table .ant-table-wrapper .ant-table-thead > tr > th {
+.Card-modal-table .ant-table-wrapper .ant-table-thead>tr>th {
   color: black !important;
   font-weight: 600 !important;
   font-size: 14px;
 }
 
-.Card-modal-table .ant-table-row > td {
+.Card-modal-table .ant-table-row>td {
   color: black !important;
   font-weight: 500 !important;
   font-size: 16px;
@@ -816,6 +818,7 @@
 
 .Payment-loader1 {
   .Payment-loader {
+
     // column-gap: 1rem;
     .contener_mixte {
       top: 5px;
@@ -1019,6 +1022,7 @@
   gap: 1.7rem !important;
   overflow: scroll;
   height: 100%;
+  scrollbar-width: none;
 
   @media (max-width: 500px) {
     gap: 0.5rem !important;
@@ -1351,7 +1355,7 @@
   font-family: "Poppins";
   font-size: 0.8rem;
 
-  > div:nth-child(1) {
+  >div:nth-child(1) {
     font-size: 0.8rem;
     font-weight: 600;
   }
@@ -1660,6 +1664,7 @@
     color: #ffffff;
     border-color: #f44336;
     cursor: not-allowed;
+
     &:hover {
       color: #c90b0b;
       background-color: #ffff;
@@ -1676,6 +1681,7 @@
     background-color: #ffe8bf;
     color: #5f4204;
     border-color: #ff9800;
+
     &:hover {
       background-color: #5f4204;
       color: #ffe8bf;

src/utils/calculations.js

@@ -3,3 +3,8 @@ export const calculateOverAllQtyLimit = (orders) => {
         return acc + (cartItem?.OrderQty || 0);
     }, 0)
 }
+
+export const capitalizeFirstLetter = (text) => {
+    if (!text) return '';
+    return text.charAt(0).toUpperCase() + text.slice(1);
+};