Merge pull request 'branchloginissueandprint' (#277) from branchloginissueandprint into main

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

src/Features/BookingScreen/BookingData/BookingData.js

@@ -758,7 +758,7 @@ export const getPreferenceData = createAsyncThunk(
       AppId != undefined
     ) {
       return await axiosRetailInstanceData.get(
-        `/settings?BranchId=${BranchId}&CompId=${CompId}&AppId=${AppId}`
+        `/Settings?branchId=${BranchId}&compId=${CompId}&appId=${AppId}`
       );
     }
   }

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

@@ -1956,7 +1956,6 @@ const Printstyle4 = ({
                           })()}
                         </div>
                       )}
-                    {/* <hr className="PrintStyle4-print-dottline" /> */}
                     <div className="PrintStyle4-FourthDiv">
                       {!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
                         ''
@@ -3916,7 +3915,6 @@ const Printstyle4 = ({
               </div>
             </>
           )}
-
           {DineInData?.length > 0 && (
             <>
               <div
@@ -4093,7 +4091,7 @@ const Printstyle4 = ({
                                         }
                                       </div>
                                     )
-                                  ).trim()}
+                                  )?.trim()}
                                 </td>
                               )}
                             {GlobaldummyData
@@ -4215,7 +4213,6 @@ const Printstyle4 = ({
           )}
           {DineInData?.length > 0 && TakeawayData?.length > 0 && (
             <>
-              <hr className="PrintStyle4-print-dottline" />
               <div>
                 <div>Takeaway:&nbsp;{Number(TakeawayTotal).toFixed(2)}</div>
                 <div>Dine In:&nbsp;{Number(DineInTotal).toFixed(2)} </div>
@@ -4789,7 +4786,6 @@ const Printstyle4 = ({
                 })()}
               </div>
             )}
-          <hr className="PrintStyle4-print-dottline" />
           <div className="PrintStyle4-FourthDiv">
             {!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
               ''