karthikalakshmi
/
Android_Retail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Reviewed-on: Pozomind/pozo-retail-app#277
This commit is contained in:
TamilSelvan 2026-03-12 16:11:43 +05:30
parent 78eadcf495 b2e2315155
commit 0419ed82bf
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Features/BookingScreen/BookingData/BookingData.js
View File

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

14
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
View File

@ -92,10 +92,10 @@ const Printstyle4 = ({
const orderNo = FieldDetails?.['Order No']; const orderNo = FieldDetails?.['Order No'];
const paymentTypelabel = FieldDetails?.['Payment Type Label']; const paymentTypelabel = FieldDetails?.['Payment Type Label'];
const WeightasKg = FieldDetails?.['Weight']; const WeightasKg = FieldDetails?.['Weight'];
const BillLabel=FieldDetails?.['BillNoLabel'] const BillLabel = FieldDetails?.['BillNoLabel']
const Total_Label=FieldDetails?.['Total Label'] const Total_Label = FieldDetails?.['Total Label']
const BillNoLabel = (printDatas?.PrintDocLabel && BillLabel) ? printDatas?.PrintDocLabel : "Bill No"; const BillNoLabel = (printDatas?.PrintDocLabel && BillLabel) ? printDatas?.PrintDocLabel : "Bill No";
const TotalLabel = (printDatas?.PrintTotalLabel && Total_Label) ? printDatas?.PrintTotalLabel : "SUB TOTAL"; const TotalLabel = (printDatas?.PrintTotalLabel && Total_Label) ? printDatas?.PrintTotalLabel : "SUB TOTAL";
const GlobalSlNo = useSelector(GlobalprintSlNo); const GlobalSlNo = useSelector(GlobalprintSlNo);
const GlobalItem = useSelector(GlobalprintItem); const GlobalItem = useSelector(GlobalprintItem);
const GlobalMRP = useSelector(GlobalprintMRP); const GlobalMRP = useSelector(GlobalprintMRP);
@ -1956,7 +1956,6 @@ const Printstyle4 = ({
})()} })()}
</div> </div>
)} )}
{/* <hr className="PrintStyle4-print-dottline" /> */}
<div className="PrintStyle4-FourthDiv"> <div className="PrintStyle4-FourthDiv">
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? ( {!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
'' ''
@ -3916,7 +3915,6 @@ const Printstyle4 = ({
</div> </div>
</> </>
)} )}
{DineInData?.length > 0 && ( {DineInData?.length > 0 && (
<> <>
<div <div
@ -4093,7 +4091,7 @@ const Printstyle4 = ({
} }
</div> </div>
) )
).trim()} )?.trim()}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -4215,7 +4213,6 @@ const Printstyle4 = ({
)} )}
{DineInData?.length > 0 && TakeawayData?.length > 0 && ( {DineInData?.length > 0 && TakeawayData?.length > 0 && (
<> <>
<hr className="PrintStyle4-print-dottline" />
<div> <div>
<div>Takeaway:&nbsp;{Number(TakeawayTotal).toFixed(2)}</div> <div>Takeaway:&nbsp;{Number(TakeawayTotal).toFixed(2)}</div>
<div>Dine In:&nbsp;{Number(DineInTotal).toFixed(2)} </div> <div>Dine In:&nbsp;{Number(DineInTotal).toFixed(2)} </div>
@ -4789,7 +4786,6 @@ const Printstyle4 = ({
})()} })()}
</div> </div>
)} )}
<hr className="PrintStyle4-print-dottline" />
<div className="PrintStyle4-FourthDiv"> <div className="PrintStyle4-FourthDiv">
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? ( {!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
'' ''