Merge pull request 'Dev Issue Fixing' (#297) from Sales-Optimization into main

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

src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3overall.jsx

@@ -104,7 +104,10 @@ const BSBillingTable3overall = () => {
             ? 'BSTable3_overallLayout1 BSTable3_overall-1'
             : 'BSTable3_overall'
       }
-      style={{ height: containerHeight }}
+      // style={{ height: containerHeight }}
+      style={{
+        height: isMobile ? '75vh' : '85vh',
+      }}
     >
       {/* ✅ Cart/Table */}
       {isCartOpen && (!isSmallScreen || tableData) && (

src/Pages/StockMaster/StockForm.jsx

@@ -3891,19 +3891,7 @@ const StockForm = ({ formType }) => {
                               style={{ width: '250px' }}
                             ></AutoComplete>
                           </FloatLabel>
-                          {/* <Tooltip title={'BarCode/QrCode'} placement={'top'}>
+                          
-                            <BsUpcScan
-                              strokeWidth={0.5}
-                              color="#000"
-                              style={{
-                                fontSize: '16px',
-                                color: scanner ? '#52c41a' : '#888',
-                                fontWeight: '600',
-                              }}
-                              className="product-scan-Icon"
-                              onClick={handleScanSearch}
-                            />
-                          </Tooltip> */}
                           {isMobile ? (
                             <div className="IsmoBileBarcode">
                               <BarCodeScan

src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss

@@ -325,7 +325,7 @@
   overflow: auto;
   scrollbar-width: none;
   width: inherit;
-  height: 85vh !important;
+  // height: 85vh !important;
   gap: 4px;
   border-radius: 10px;
   @media (max-width: 768px) {

src/Styles/BookingScreen/Template/BSLayout1/BSLayout1.scss

@@ -265,7 +265,7 @@ body {
     font-size: 10px;
     gap: 10px !important;
     justify-content: flex-end !important;
-    .SalesCountComponent-Master{
+    .SalesCountComponent-Master {
       display: none;
     }
   }
@@ -284,6 +284,8 @@ body {
   gap: 2px;
   padding: 2px 6px;
   background: linear-gradient(to bottom right, #2a3447, #1e2536);
+  position: relative;
+  bottom: 1px;
   .SalesCountComponent-Master {
     color: #fff;
   }

src/Styles/BookingScreen/Template/BSLayout2/BSLayout2.scss

@@ -434,7 +434,7 @@ body {
     font-size: 10px;
     gap: 10px !important;
     justify-content: flex-end !important;
-    .SalesCountComponent-Master{
+    .SalesCountComponent-Master {
       display: none;
     }
   }
@@ -454,6 +454,9 @@ body {
   gap: 2px;
   padding: 2px 6px;
   background: linear-gradient(to bottom right, #2a3447, #1e2536);
+  position: relative;
+  bottom: 1px;
+
   .SalesCountComponent-Master {
     color: #fff;
   }

src/Styles/BookingScreen/Template/BSLayout3/BSLayout3.scss

@@ -468,6 +468,9 @@
   gap: 2px;
   padding: 2px 6px;
   background: linear-gradient(to bottom right, #2a3447, #1e2536);
+  position: relative;
+  bottom: 1px;
+
   .SalesCountComponent-Master {
     color: #fff;
   }

src/Styles/BookingScreen/Template/BSLayout4/BSLayout4.scss

@@ -253,7 +253,7 @@
     font-size: 10px;
     gap: 10px !important;
     justify-content: flex-end !important;
-    .SalesCountComponent-Master{
+    .SalesCountComponent-Master {
       display: none;
     }
   }
@@ -272,6 +272,9 @@
   gap: 2px;
   padding: 2px 6px;
   background: linear-gradient(to bottom right, #2a3447, #1e2536);
+  position: relative;
+  bottom: 1px;
+
   .SalesCountComponent-Master {
     color: #fff;
   }

src/Styles/BookingScreen/Template/BSLayout5/BSLayout5.scss

@@ -137,7 +137,7 @@
     font-size: 10px;
     gap: 10px !important;
     justify-content: flex-end !important;
-    .SalesCountComponent-Master{
+    .SalesCountComponent-Master {
       display: none;
     }
   }
@@ -157,6 +157,9 @@
   gap: 2px;
   padding: 2px 6px;
   background: linear-gradient(to bottom right, #2a3447, #1e2536);
+  position: relative;
+  bottom: 1px;
+
   .SalesCountComponent-Master {
     color: #fff;
   }

src/Styles/BookingScreen/Template/BSLayout6/BSLayout6.scss

@@ -262,6 +262,9 @@
   gap: 2px;
   padding: 2px 6px;
   background: linear-gradient(to bottom right, #2a3447, #1e2536);
+  position: relative;
+  bottom: 1px;
+
   .SalesCountComponent-Master {
     color: #fff;
   }

src/Styles/OverAllStyle/OverAllStyle.scss

@@ -513,6 +513,18 @@
     top: 35%;
     cursor: pointer;
   }
+
+  .IsmoBileBarcode {
+    position: absolute;
+    right: 10px;
+    top: 35%;
+    .BarCodeScanMaster {
+      padding: 0 !important;
+      svg {
+        font-size: 25px !important;
+      }
+    }
+  }
 }
 
 .Bulkuploadpost {

src/Styles/Stock/StockMaster.scss

@@ -432,6 +432,17 @@
     top: 35%;
     cursor: pointer;
   }
+  .IsmoBileBarcode {
+    position: absolute;
+    right: 10px;
+    top: 25%;
+    .BarCodeScanMaster {
+      padding: 0 !important;
+      svg {
+        font-size: 25px !important;
+      }
+    }
+  }
 }
 
 .extracted-data-form {