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

Merge pull request 'Design and bsc1 issue' (#268) from March-3-deployment into main 

Reviewed-on: Pozomind/pozo-retail-app#268
This commit is contained in:
karthikalakshmi 2026-03-09 17:15:01 +05:30
parent e0eecd67b7 a2537cbc21
commit be6836f785
2 changed files with 59 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx
View File

@ -747,7 +747,8 @@ const BSC1Payment = (props) => {
useEffect(() => {
if (!preOrder) {
const totalSum = OrderCardDetail?.reduce(
(acc, card) => acc + parseFloat(card.OrderRate * card.OrderQty || 0),
// (acc, card) => acc + parseFloat(card.OrderRate * card.OrderQty || 0),
(acc, card) => acc + parseFloat(card.TotalAmt || 0),
0
);
@ -839,7 +840,7 @@ const BSC1Payment = (props) => {
? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2)
: (Number(Total) + Number(globalTipAmount)).toFixed(2)
);
console.log(currentOrderNetAmount,totalSum,"currentOrderNetAmount")
setTotalAmount(
salesBillEdit
? currentOrderNetAmount > previousNetAmount
@ -2238,6 +2239,9 @@ const BSC1Payment = (props) => {
ModelNumber: a.ModelNumber,
BatchRef: a.BatchRef,
PackageDtl: a.PackageDtl,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
}));
const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType

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

@ -380,7 +380,7 @@ const Printstyle4 = ({
} else if (DineInData?.length > 0) {
dataSource = DineInData;
}
console.log(dataSource, 'dataSource');
console.log(dataSource, 'dataSource');
// Paginate the data
const paginatedChunks = [];
for (let i = 0; i < dataSource.length; i += chunkSize) {
@ -843,7 +843,11 @@ console.log(dataSource, 'dataSource');
const descriptions = identifiers
.filter((d) => d.Description)
.map((d) => d.Description);
console.log(descriptions,identifiers,'descriptions')
console.log(
descriptions,
identifiers,
'descriptions'
);
const packageList =
PackageDetails?.filter(
(pkg) => pkg.ProdId === item.ProdId
@ -3595,6 +3599,7 @@ console.log(dataSource, 'dataSource');
...tableHeaderStyle,
width: '10px',
textAlign: 'right',
paddingLeft: '4px',
}}
>
Rate
@ -3606,6 +3611,7 @@ console.log(dataSource, 'dataSource');
...tableHeaderStyle,
width: '10px',
textAlign: 'right',
paddingLeft: '4px',
}}
>
Rate
@ -3689,9 +3695,15 @@ console.log(dataSource, 'dataSource');
))}
{/* Description from first identifier */}
{(item?.ProductIdentifierDtls?.length > 0 && item.ProductIdentifierDtls?.[0]?.Description)&&
(
<div>{item.ProductIdentifierDtls?.[0]?.Description}</div>
{item?.ProductIdentifierDtls?.length > 0 &&
item.ProductIdentifierDtls?.[0]
?.Description && (
<div>
{
item.ProductIdentifierDtls?.[0]
?.Description
}
</div>
)}
</td>
)}
@ -3737,9 +3749,17 @@ console.log(dataSource, 'dataSource');
))}
{/* Description from first identifier */}
{(item?.ProductIdentifierDtls?.length > 0 && item.ProductIdentifierDtls?.[0]?.Description)&&
(
<div>{item.ProductIdentifierDtls?.[0]?.Description}</div>
{item?.ProductIdentifierDtls?.length >
0 &&
item.ProductIdentifierDtls?.[0]
?.Description && (
<div>
{
item
.ProductIdentifierDtls?.[0]
?.Description
}
</div>
)}
</div>
) : (
@ -4053,9 +4073,16 @@ console.log(dataSource, 'dataSource');
})
.join('')
: '') +
(item?.ProductIdentifierDtls?.length > 0 && item.ProductIdentifierDtls?.[0]?.Description)&&
(
<div>{item.ProductIdentifierDtls?.[0]?.Description}</div>
(item?.ProductIdentifierDtls?.length >
0 &&
item.ProductIdentifierDtls?.[0]
?.Description) && (
<div>
{
item.ProductIdentifierDtls?.[0]
?.Description
}
</div>
)
).trim()}
</td>