ordering-ui-react-native 0.23.1 → 0.23.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -577,12 +577,12 @@ export const OrderContentComponent = (props: OrderContent) => {
|
|
|
577
577
|
order?.taxes?.length > 0 && order?.taxes?.filter((tax: any) => tax?.type === 2 && tax?.rate !== 0 && tax?.target === 'delivery_fee').map((tax: any, i: number) => (
|
|
578
578
|
<Table key={`${tax.description}_${i}`}>
|
|
579
579
|
<OSRow>
|
|
580
|
-
<OText
|
|
580
|
+
<OText mBottom={4}>
|
|
581
581
|
{tax.name || t('INHERIT_FROM_BUSINESS', 'Inherit from business')}
|
|
582
582
|
{`(${verifyDecimals(tax?.rate, parseNumber)}%)`}
|
|
583
583
|
</OText>
|
|
584
584
|
</OSRow>
|
|
585
|
-
<OText
|
|
585
|
+
<OText mBottom={4}>{parsePrice(tax?.summary?.tax_after_discount ?? tax?.summary?.tax ?? 0)}</OText>
|
|
586
586
|
</Table>
|
|
587
587
|
))
|
|
588
588
|
}
|
|
@@ -225,8 +225,9 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
|
|
|
225
225
|
cartUuid: cart?.uuid,
|
|
226
226
|
businessLogo: cart?.business?.logo,
|
|
227
227
|
businessName: cart?.business?.name,
|
|
228
|
-
cartTotal: cart?.total
|
|
229
|
-
|
|
228
|
+
cartTotal: cart?.total,
|
|
229
|
+
fromProductsList: true
|
|
230
|
+
})
|
|
230
231
|
} else {
|
|
231
232
|
const groupKeys: any = {}
|
|
232
233
|
cartsAvailable.forEach((_cart: any) => {
|
|
@@ -377,7 +377,9 @@ const CheckoutUI = (props: any) => {
|
|
|
377
377
|
}
|
|
378
378
|
|
|
379
379
|
const handleRedirect = () => {
|
|
380
|
-
props.fromProductsList
|
|
380
|
+
props.fromProductsList
|
|
381
|
+
? navigation?.goBack()
|
|
382
|
+
: onNavigationRedirect('BottomTab', { screen: 'Cart' }, !props.fromMulti)
|
|
381
383
|
}
|
|
382
384
|
|
|
383
385
|
useEffect(() => {
|