FIX #60 Print Header Integrated code missing

src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx

@@ -29,6 +29,7 @@ import {
   GlobalprintLogo,
   GlobalprintCredit,
   GlobalprintTax,
+  GlobalSelectedPrintHeaderColor,
 } from '../../../../Features/ThemeChange/ThemeChange';
 import {
   GlobalUpiIDprint,
@@ -123,6 +124,7 @@ const Printstyle6 = ({
   const paymentTypeUPI = PaymentStatus?.find(
     (ps) => ps.PaymentTypeName === 'UPI'
   );
+   const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
 
   console.log(GlobalDiscount, Discount, 'Discount');
 
@@ -400,7 +402,9 @@ const Printstyle6 = ({
                           />
                         ) : null}
                       </div>
-                      {GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}
+                      <div style={{ color: SelectedHeaderColor }}>
+                        {GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}
+                      </div>
                     </div>
 
                     <div style={{ fontSize: 'clamp(0.75rem, 2.5vw, 1rem)' }}>
@@ -3170,7 +3174,9 @@ const Printstyle6 = ({
                     />
                   ) : null}
                 </div>
-                {GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}
+               <div style={{ color: SelectedHeaderColor }}>
+                  {GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}
+                </div>
               </div>
 
               <div style={{ fontSize: 'clamp(0.75rem, 2.5vw, 1rem)' }}>

src/Pages/Preference/PreferenceList.jsx

@@ -749,16 +749,6 @@ const PreferenceList = () => {
 
               {renderCheckbox('scanlayout', 'Do you Want Scan Layout Page?')}
             </div>
-
-          </Form>
-        </div>
-         <Form
-            ref={formRef}
-            layout="vertical"
-            onFinish={handleSubmit}
-            initialValues={initialValues}
-            className="preferences-list"
-          >
             <div className="PreferencesBTN">
               <Buttons
                 buttonText="Submit Preferences"
@@ -768,7 +758,8 @@ const PreferenceList = () => {
                 icon={<ArrowRightOutlined />}
               />
             </div>
-            </Form>
+          </Form>
+        </div>
       </div>
     </>
   );

src/Styles/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.scss

@@ -42,22 +42,30 @@
   justify-content: center;
   border-radius: 10px;
 }
-.grid-container {
+.gridEQcontainer {
   display: grid;
   grid-template-columns: auto auto auto;
-  padding: 5px;
+  padding: 12px;
+  border-radius: 6px;
   background: #e1eef1;
   margin: 5px;
 }
-.grid-item {
+.gridEQitem {
   background-color: rgba(255, 255, 255, 0.8);
   // border: 1px solid rgba(0, 0, 0, 0.8);
   padding: 5px;
   font-size: 30px;
   text-align: center;
-  border-radius: 25px;
+  border-radius: 30px;
-  margin: 6px;
+  margin: 5px;
-  // margin-left: 10px;
+  height: 60px;
+  width: 90%;
+  cursor: pointer;
+  font-family: "Poppins";
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-weight: 400;
 }
 .grid-item-add {
   background-color: var(--SELECTED_COLOR);
@@ -90,14 +98,27 @@
   flex-direction: row;
   align-items: center;
   column-gap: 0.5rem;
-  font-family: 'Poppins';
+  font-family: "Poppins", sans-serif;
 }
 .EditQuantity-Quantitybox {
   width: 5rem;
   height: 2rem;
   border: none;
   background-color: #eff3f3;
+  border: 1px solid #e4e4e4;
   padding-left: 5px;
+  border-radius: 4px;
+  font-family: "Poppins", sans-serif;
+  font-size: 15px;
+  font-weight: 400;
+  letter-spacing: 0.3px;
+  outline: none !important;
+  &:focus {
+    border-color: #a6daff;
+  }
+  &:active {
+    border-color: #a6daff;
+  }
 }
 .EditQuantity-Pricebox {
   width: 5rem;
@@ -110,6 +131,14 @@
   height: 2rem;
   width: 2rem;
   border: none;
+  border: 1px solid #ffdfdf;
+  border-radius: 4px;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #ffeded;
+  color: #c21919;
 }
 .EditQuantity-PriceChange {
   display: flex;

src/Styles/BookingScreen/Components/BSBillingTables/BSPacking/BSPacking.scss

@@ -41,10 +41,10 @@ $white: #ffffff;
 .packing-container {
     max-width: 50rem;
     //   margin: 0 auto;
-    padding: 1.5rem;
+    margin: 1rem 0;
-    @include gradient-bg(#eff6ff, #e0e7ff);
+    padding: 1rem;
+    @include gradient-bg(#e6f1ff, #dfe7ff);
     border-radius: 1rem;
-    box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1);
 
     // Header section
     .header {
@@ -119,15 +119,15 @@ $white: #ffffff;
     .rows-header {
         display: grid;
         // grid-template-columns: 120px 120px 120px 120px 100px; // Type, Qty, Count, Total, Action
-        grid-template-columns: 1fr  1fr 1fr 1fr 1fr  1fr ; 
+        grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
         background: $gray-100;
-        padding: 0.75rem 1rem;
+        padding: 0.5rem 0.5rem;
         font-weight: 600;
         font-size: 0.875rem;
         color: $gray-700;
         border-radius: 0.5rem;
         border: 1px solid $gray-200;
-        margin-bottom: 0.50rem;
+        margin-bottom: 0.5rem;
 
         .header-cell {
             text-align: center;
@@ -279,9 +279,8 @@ $white: #ffffff;
                 gap: 0.5rem;
 
                 .action-button {
-                    
+                    width: 2rem;
-                    width: 2.0rem;
+                    height: 2rem;
-                    height: 2.0rem;
                     border-radius: 50%;
                     border: none;
                     color: $white;
@@ -311,7 +310,7 @@ $white: #ffffff;
                 min-width: 2rem;
 
                 .total-display {
-                    padding: 0.25rem 0.70rem;
+                    padding: 0.25rem 0.7rem;
                     background: $gray-50;
                     // border: 1px solid $gray-200;
                     // border-radius: 0.5rem;
@@ -338,8 +337,7 @@ $white: #ffffff;
         background: $white;
         border-radius: 0.75rem;
         padding: 1.5rem;
-        box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1);
+        border: 2px solid #d6e1ff;
-        border: 2px solid $gray-100;
 
         .summary-content {
             display: flex;

src/Styles/PurchaseReturn/purchasereturn.scss

@@ -338,7 +338,7 @@
   display: flex;
   align-items: center;
   gap: 7px;
-  padding: 10px 16px;
+  padding: 8px 16px;
   background-color: #0bad77;
   border-radius: 7px;
   color: white;
@@ -346,7 +346,7 @@
   font-family: 'Poppins';
   font-weight: 400;
   white-space: nowrap;
-  font-size: 14px;
+  font-size: 13.5px;
   transition: all 0.2s;
   &:hover {
     background-color: #069666;
@@ -356,15 +356,15 @@
   display: flex;
   align-items: center;
   gap: 7px;
-  padding: 10px 16px;
+  padding: 8px 16px;
-  background-color: #0ea5e9;
+  background-color: #1292ee;
   border-radius: 7px;
   color: white;
   cursor: pointer;
-  font-family: 'Poppins';
+  font-family: "Poppins";
   font-weight: 400;
   white-space: nowrap;
-  font-size: 14px;
+  font-size: 13.5px;
   transition: all 0.2s;
   &:hover {
     background-color: #0985be;