diff --git a/src/Features/BookingScreen/BookingData/BookingData.js b/src/Features/BookingScreen/BookingData/BookingData.js index d167ffd..7f368ad 100644 --- a/src/Features/BookingScreen/BookingData/BookingData.js +++ b/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}` ); } } diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx index 66a0564..22a5a1b 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx @@ -92,10 +92,10 @@ const Printstyle4 = ({ const orderNo = FieldDetails?.['Order No']; const paymentTypelabel = FieldDetails?.['Payment Type Label']; const WeightasKg = FieldDetails?.['Weight']; - const BillLabel=FieldDetails?.['BillNoLabel'] - const Total_Label=FieldDetails?.['Total Label'] - const BillNoLabel = (printDatas?.PrintDocLabel && BillLabel) ? printDatas?.PrintDocLabel : "Bill No"; - const TotalLabel = (printDatas?.PrintTotalLabel && Total_Label) ? printDatas?.PrintTotalLabel : "SUB TOTAL"; + const BillLabel = FieldDetails?.['BillNoLabel'] + const Total_Label = FieldDetails?.['Total Label'] + const BillNoLabel = (printDatas?.PrintDocLabel && BillLabel) ? printDatas?.PrintDocLabel : "Bill No"; + const TotalLabel = (printDatas?.PrintTotalLabel && Total_Label) ? printDatas?.PrintTotalLabel : "SUB TOTAL"; const GlobalSlNo = useSelector(GlobalprintSlNo); const GlobalItem = useSelector(GlobalprintItem); const GlobalMRP = useSelector(GlobalprintMRP); @@ -1956,7 +1956,6 @@ const Printstyle4 = ({ })()} )} - {/*