Merge pull request 'Fix barcode and product master issues' (#87) from temp/barcode-and-product-master-fix into main

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

src/Pages/Product/Printstyles.js

@@ -1,4 +1,15 @@
 export const style = `<style>
+  * {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+  }
+  
+  html, body {
+    margin: 0 !important;
+    padding: 0 !important;
+    height: auto;
+  }
 .heading
 {
   color: #1292EE;
@@ -367,6 +378,8 @@ height: 149mm;
   grid-template-columns: repeat(6, 15mm);
   width: 90mm;
   column-gap: 0.5mm;
+  align-items: center;
+  justify-content: center;
 }
 
     .BarQrprint3 {
@@ -546,7 +559,9 @@ height: 149mm;
   grid-template-columns: repeat(3, 35mm);
   width: 105mm;
     column-gap: 0;
+    row-gap: 0;
     padding: 0; 
+    margin: 0;
 }
 
 .barcode-wrapper-22x35 {
@@ -607,6 +622,7 @@ height: 149mm;
   width: 105mm;
   margin: 0;
   padding: 0;
+
 }
 
 .label-wrapper-22x35 {
@@ -761,9 +777,10 @@ height: 149mm;
   display: grid;
   grid-template-columns: repeat(6, 15mm);
   width: 100%;
-  column-gap: 0.5mm;
+  column-gap: 0;
   row-gap: 0;
-  align-items: flex-start;
+  align-items: center;
+  justify-content: center;
 }
 
 .label-15x15-wrapper {
@@ -778,12 +795,12 @@ height: 149mm;
 }
 
 .label-15x15-content {
-  width: 100%;
-  height: 100%;
+  width: 15mm;
+  height: 15mm;
   display: flex;
   flex-direction: column;
   align-items: center;
-  justify-content: flex-start;
+  justify-content: center;
 
   text-align: center;
 }
@@ -826,6 +843,11 @@ export const getPageStyle = (width) => `
         size: ${width}mm auto;
         margin: 0;
       }
+
+      html, body {
+        margin: 0 !important;
+        padding: 0 !important;
+      }
     }
   </style>
 `;

src/Pages/Product/ProductForm.jsx

@@ -536,9 +536,15 @@ const ProductForm = ({ formType }) => {
   }, [imageopen]);
 
   useEffect(() => {
+    if (
+      AppId !== undefined && AppId !== null &&
+      CompId !== undefined && CompId !== null &&
+      BranchId !== undefined && BranchId !== null
+    ) {
       productFetchData();
       fetchRackData();
-  }, []);
+    }
+  }, [AppId, CompId, BranchId]);
 
   useEffect(() => {
     if (imageUrl == '') {
@@ -683,7 +689,7 @@ const ProductForm = ({ formType }) => {
   // sree
   const productFetchData = async () => {
     const response = await dispatch(
-      getProductData(AppId, BranchId, CompId)
+      getProductData({ AppId, BranchId, CompId })
     ).unwrap();
     setProductData(response?.data?.data);
     console.log(response, 'responseresponse');
@@ -2623,8 +2629,7 @@ const ProductForm = ({ formType }) => {
                         <div className="productonlineImg">
                           {imagedata?.map((item, index) => (
                             <div
-                              className={`singleimg ${
-                                selectedImage === item ? 'selected' : ''
+                              className={`singleimg ${selectedImage === item ? 'selected' : ''
                                 }`}
                               key={index}
                               onClick={() => setSelectedImage(item)}