ordering-ui-react-native 0.14.45 → 0.14.48

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.
Files changed (14) hide show
  1. package/package.json +1 -1
  2. package/src/components/ProductForm/index.tsx +1 -1
  3. package/src/components/SingleProductCard/index.tsx +1 -1
  4. package/themes/original/src/components/BusinessesListing/index.tsx +100 -75
  5. package/themes/original/src/components/Cart/index.tsx +122 -24
  6. package/themes/original/src/components/Cart/styles.tsx +8 -1
  7. package/themes/original/src/components/OrderDetails/index.tsx +114 -42
  8. package/themes/original/src/components/OrderDetails/styles.tsx +8 -1
  9. package/themes/original/src/components/OrderSummary/index.tsx +132 -23
  10. package/themes/original/src/components/OrderSummary/styles.tsx +7 -0
  11. package/themes/original/src/components/ProductForm/index.tsx +54 -52
  12. package/themes/original/src/components/SingleProductCard/index.tsx +21 -11
  13. package/themes/original/src/components/SingleProductCard/styles.tsx +4 -0
  14. package/themes/original/src/components/TaxInformation/index.tsx +59 -27
package/themes/original/src/components/OrderDetails/index.tsx CHANGED
@@ -35,6 +35,7 @@ import {
35
35
  Icons,
36
36
  OrderDriver,
37
37
  Map,
38
+ Divider,
38
39
  } from './styles';
39
40
  import { OButton, OIcon, OModal, OText } from '../shared';
40
41
  import { ProductItemAccordion } from '../ProductItemAccordion';
@@ -100,7 +101,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
100
101
  business: false,
101
102
  driver: false,
102
103
  });
103
- const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, data: null })
104
+ const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, tax: null, type: '' })
104
105
 
105
106
  const { order, businessData } = props.order;
106
107
 
@@ -349,6 +350,10 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
349
350
  }
350
351
  }
351
352
 
353
+ const getIncludedTaxesDiscounts = () => {
354
+ return order?.taxes?.filter((tax: any) => tax?.type === 1)?.reduce((carry: number, tax: any) => carry + (tax?.summary?.tax_after_discount ?? tax?.summary?.tax), 0)
355
+ }
356
+
352
357
  const handleClickOrderReview = (order: any) => {
353
358
  navigation.navigate(
354
359
  'ReviewOrder',
@@ -527,7 +532,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
527
532
  onPress={() => order?.business?.cellphone &&
528
533
  Linking.openURL(`tel:${order?.business?.cellphone}`)
529
534
  }
530
- style={{ paddingEnd: 5 }}>
535
+ style={{ paddingEnd: 5 }}
536
+ >
531
537
  <OIcon
532
538
  src={theme.images.general.phone}
533
539
  width={16}
@@ -730,10 +736,10 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
730
736
  <Table>
731
737
  <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{t('SUBTOTAL', 'Subtotal')}</OText>
732
738
  <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
733
- {parsePrice(((order?.summary?.subtotal || order?.subtotal) + getIncludedTaxes()))}
739
+ {parsePrice(((order?.summary?.subtotal ?? order?.subtotal) + getIncludedTaxes()))}
734
740
  </OText>
735
741
  </Table>
736
- {(order?.summary?.discount > 0 || order?.discount > 0) && (
742
+ {(order?.summary?.discount > 0 ?? order?.discount > 0) && order?.offers?.length === 0 && (
737
743
  <Table>
738
744
  {order?.offer_type === 1 ? (
739
745
  <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
@@ -751,24 +757,53 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
751
757
  </OText>
752
758
  </Table>
753
759
  )}
760
+ {
761
+ order?.offers?.length > 0 && order?.offers?.filter((offer: any) => offer?.target === 1)?.map((offer: any) => (
762
+ <Table key={offer.id}>
763
+ <OSRow>
764
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal} numberOfLines={1}>
765
+ {offer.name}
766
+ {offer.rate_type === 1 && (
767
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{`(${verifyDecimals(offer?.rate, parsePrice)}%)`}</OText>
768
+ )}
769
+ </OText>
770
+ <TouchableOpacity style={{ marginLeft: 5 }} onPress={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_1' })}>
771
+ <AntIcon name='exclamationcircleo' size={18} color={theme.colors.primary} />
772
+ </TouchableOpacity>
773
+ </OSRow>
774
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>- {parsePrice(offer?.summary?.discount)}</OText>
775
+ </Table>
776
+ ))
777
+ }
778
+ <Divider />
779
+ {order?.summary?.subtotal_with_discount > 0 && order?.summary?.discount > 0 && order?.summary?.total >= 0 && (
780
+ <Table>
781
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{t('SUBTOTAL_WITH_DISCOUNT', 'Subtotal with discount')}</OText>
782
+ {order?.tax_type === 1 ? (
783
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{parsePrice((order?.summary?.subtotal_with_discount + getIncludedTaxesDiscounts() ?? 0))}</OText>
784
+ ) : (
785
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{parsePrice(order?.summary?.subtotal_with_discount ?? 0)}</OText>
786
+ )}
787
+ </Table>
788
+ )}
754
789
  {
755
790
  order?.taxes?.length === 0 && order?.tax_type === 2 && (
756
791
  <Table>
757
- <OText size={12}>
792
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
758
793
  {t('TAX', 'Tax')} {`(${verifyDecimals(order?.tax, parseNumber)}%)`}
759
794
  </OText>
760
- <OText size={12}>{parsePrice(order?.summary?.tax || 0)}</OText>
795
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{parsePrice(order?.summary?.tax || 0)}</OText>
761
796
  </Table>
762
797
  )
763
798
  }
764
799
  {
765
800
  order?.fees?.length === 0 && (
766
801
  <Table>
767
- <OText size={12}>
802
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
768
803
  {t('SERVICE_FEE', 'Service fee')}
769
804
  {`(${verifyDecimals(order?.service_fee, parseNumber)}%)`}
770
805
  </OText>
771
- <OText size={12}>{parsePrice(order?.summary?.service_fee || 0)}</OText>
806
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{parsePrice(order?.summary?.service_fee || 0)}</OText>
772
807
  </Table>
773
808
  )
774
809
  }
@@ -776,15 +811,15 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
776
811
  order?.taxes?.length > 0 && order?.taxes?.filter((tax: any) => tax?.type === 2 && tax?.rate !== 0).map((tax: any) => (
777
812
  <Table key={tax.id}>
778
813
  <OSRow>
779
- <OText size={12} numberOfLines={1}>
814
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal} numberOfLines={1}>
780
815
  {tax.name || t('INHERIT_FROM_BUSINESS', 'Inherit from business')}
781
816
  {`(${verifyDecimals(tax?.rate, parseNumber)}%)`}{' '}
782
817
  </OText>
783
- <TouchableOpacity onPress={() => setOpenTaxModal({ open: true, data: tax })}>
818
+ <TouchableOpacity onPress={() => setOpenTaxModal({ open: true, data: tax, type: 'tax' })}>
784
819
  <AntIcon name='exclamationcircleo' size={18} color={theme.colors.primary} />
785
820
  </TouchableOpacity>
786
821
  </OSRow>
787
- <OText size={12}>{parsePrice(tax?.summary?.tax || 0)}</OText>
822
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{parsePrice(tax?.summary?.tax_after_discount ?? tax?.summary?.tax ?? 0)}</OText>
788
823
  </Table>
789
824
  ))
790
825
  }
@@ -792,53 +827,84 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
792
827
  order?.fees?.length > 0 && order?.fees?.filter((fee: any) => !(fee.fixed === 0 && fee.percentage === 0))?.map((fee: any) => (
793
828
  <Table key={fee.id}>
794
829
  <OSRow>
795
- <OText size={12} numberOfLines={1}>
830
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal} numberOfLines={1}>
796
831
  {fee.name || t('INHERIT_FROM_BUSINESS', 'Inherit from business')}
797
832
  ({parsePrice(fee?.fixed)} + {fee.percentage}%){' '}
798
833
  </OText>
799
- <TouchableOpacity onPress={() => setOpenTaxModal({ open: true, data: fee })}>
834
+ <TouchableOpacity onPress={() => setOpenTaxModal({ open: true, data: fee, type: 'fee' })}>
800
835
  <AntIcon name='exclamationcircleo' size={18} color={theme.colors.primary} />
801
836
  </TouchableOpacity>
802
837
  </OSRow>
803
- <OText size={12}>{parsePrice(fee?.fixed + fee?.summary?.percentage || 0)}</OText>
838
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{parsePrice(fee?.summary?.fixed + (fee?.summary?.percentage_after_discount ?? fee?.summary?.percentage) ?? 0)}</OText>
804
839
  </Table>
805
840
  ))
806
841
  }
807
- {(order?.summary?.delivery_price > 0 ||
808
- order?.deliveryFee > 0) && (
809
- <Table>
810
- <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{t('DELIVERY_FEE', 'Delivery Fee')}</OText>
811
- <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
812
- {parsePrice(
813
- order?.summary?.delivery_price || order?.deliveryFee,
814
- )}
815
- </OText>
842
+ {
843
+ order?.offers?.length > 0 && order?.offers?.filter((offer: any) => offer?.target === 3)?.map((offer: any) => (
844
+ <Table key={offer.id}>
845
+ <OSRow>
846
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal} numberOfLines={1}>
847
+ {offer.name}
848
+ {offer.rate_type === 1 && (
849
+ <OText>{`(${verifyDecimals(offer?.rate, parsePrice)}%)`}</OText>
850
+ )}
851
+ </OText>
852
+ <TouchableOpacity style={{ marginLeft: 5 }} onPress={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_3' })}>
853
+ <AntIcon name='exclamationcircleo' size={18} color={theme.colors.primary} />
854
+ </TouchableOpacity>
855
+ </OSRow>
856
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>- {parsePrice(offer?.summary?.discount)}</OText>
816
857
  </Table>
817
- )}
818
- <Table>
819
- <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
820
- {t('DRIVER_TIP', 'Driver tip')}
821
- {(order?.summary?.driver_tip > 0 || order?.driver_tip > 0) &&
822
- parseInt(configs?.driver_tip_type?.value, 10) === 2 &&
823
- !parseInt(configs?.driver_tip_use_custom?.value, 10) &&
824
- `(${verifyDecimals(order?.driver_tip, parseNumber)}%)`}
825
- </OText>
826
- <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
827
- {parsePrice(
828
- order?.summary?.driver_tip || order?.totalDriverTip,
829
- )}
830
- </OText>
831
- </Table>
858
+ ))
859
+ }
860
+ {order?.summary?.delivery_price > 0 && (
861
+ <Table>
862
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{t('DELIVERY_FEE', 'Delivery Fee')}</OText>
863
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{parsePrice(order?.summary?.delivery_price)}</OText>
864
+ </Table>
865
+ )}
866
+ {
867
+ order?.offers?.length > 0 && order?.offers?.filter((offer: any) => offer?.target === 2)?.map((offer: any) => (
868
+ <Table key={offer.id}>
869
+ <OSRow>
870
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal} numberOfLines={1}>
871
+ {offer.name}
872
+ {offer.rate_type === 1 && (
873
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{`(${verifyDecimals(offer?.rate, parsePrice)}%)`}</OText>
874
+ )}
875
+ </OText>
876
+ <TouchableOpacity style={{ marginLeft: 5 }} onPress={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_2' })}>
877
+ <AntIcon name='exclamationcircleo' size={18} color={theme.colors.primary} />
878
+ </TouchableOpacity>
879
+ </OSRow>
880
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>- {parsePrice(offer?.summary?.discount)}</OText>
881
+ </Table>
882
+ ))
883
+ }
884
+ {order?.summary?.driver_tip > 0 && (
885
+ <Table>
886
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
887
+ {t('DRIVER_TIP', 'Driver tip')}
888
+ {order?.summary?.driver_tip > 0 &&
889
+ parseInt(configs?.driver_tip_type?.value, 10) === 2 &&
890
+ !parseInt(configs?.driver_tip_use_custom?.value, 10) &&
891
+ (
892
+ `(${verifyDecimals(order?.summary?.driver_tip, parseNumber)}%)`
893
+ )}
894
+ </OText>
895
+ <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>{parsePrice(order?.summary?.driver_tip ?? order?.totalDriverTip)}</OText>
896
+ </Table>
897
+ )}
832
898
  <Total>
833
899
  <Table>
834
900
  <OText size={20} lineHeight={30} weight={'600'} color={theme.colors.textNormal}>{t('TOTAL', 'Total')}</OText>
835
901
  <OText size={20} lineHeight={30} weight={'600'} color={theme.colors.textNormal}>
836
- {parsePrice(order?.summary?.total || order?.total)}
902
+ {parsePrice(order?.summary?.total ?? order?.total)}
837
903
  </OText>
838
904
  </Table>
839
905
  </Total>
840
906
  {order?.payment_events?.length > 0 && (
841
- <View style={{marginTop: 10}}>
907
+ <View style={{ marginTop: 10 }}>
842
908
  <OText size={20} weight='bold' color={theme.colors.textNormal}>{t('PAYMENTS', 'Payments')}</OText>
843
909
  <View
844
910
  style={{
@@ -904,10 +970,16 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
904
970
  </OModal>
905
971
  <OModal
906
972
  open={openTaxModal.open}
907
- onClose={() => setOpenTaxModal({ open: false, data: null })}
973
+ onClose={() => setOpenTaxModal({ open: false, data: null, type: '' })}
908
974
  entireModal
975
+ title={`${openTaxModal.data?.name ||
976
+ t('INHERIT_FROM_BUSINESS', 'Inherit from business')} ${openTaxModal.data?.rate_type !== 2 ? `(${typeof openTaxModal.data?.rate === 'number' ? `${openTaxModal.data?.rate}%` : `${parsePrice(openTaxModal.data?.fixed ?? 0)} + ${openTaxModal.data?.percentage}%`})` : ''} `}
909
977
  >
910
- <TaxInformation data={openTaxModal.data} products={order?.products} />
978
+ <TaxInformation
979
+ type={openTaxModal.type}
980
+ data={openTaxModal.data}
981
+ products={order?.products}
982
+ />
911
983
  </OModal>
912
984
  </OrderDetailsContainer>
913
985
  );
package/themes/original/src/components/OrderDetails/styles.tsx CHANGED
@@ -116,5 +116,12 @@ export const Map = styled.View`
116
116
  width: 100%;
117
117
  height: 250px;
118
118
  margin-top: 20px;
119
- border-radius: 20px
119
+ border-radius: 20px;
120
+ `
121
+
122
+ export const Divider = styled.View`
123
+ border-color: #EAEAEA;
124
+ border-width: 1px;
125
+ margin-top: 5px;
126
+ margin-bottom: 5px;
120
127
  `
package/themes/original/src/components/OrderSummary/index.tsx CHANGED
@@ -14,7 +14,8 @@ import {
14
14
  OSProductList,
15
15
  OSBill,
16
16
  OSTable,
17
- OSRow
17
+ OSRow,
18
+ Divider
18
19
  } from './styles';
19
20
 
20
21
  import { ProductItemAccordion } from '../ProductItemAccordion';
@@ -24,6 +25,7 @@ import { verifyDecimals } from '../../utils';
24
25
  import AntIcon from 'react-native-vector-icons/AntDesign'
25
26
  import { TaxInformation } from '../TaxInformation';
26
27
  import { TouchableOpacity } from 'react-native';
28
+ import { OAlert } from '../../../../../src/components/shared'
27
29
 
28
30
  const OrderSummaryUI = (props: any) => {
29
31
  const {
@@ -35,7 +37,8 @@ const OrderSummaryUI = (props: any) => {
35
37
  isFromCheckout,
36
38
  commentState,
37
39
  handleChangeComment,
38
- onNavigationRedirect
40
+ onNavigationRedirect,
41
+ handleRemoveOfferClick
39
42
  } = props;
40
43
 
41
44
  const theme = useTheme()
@@ -44,8 +47,8 @@ const OrderSummaryUI = (props: any) => {
44
47
  const [orderState] = useOrder();
45
48
  const [{ parsePrice, parseNumber }] = useUtils();
46
49
  const [validationFields] = useValidationFields();
47
- const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, data: null })
48
-
50
+ const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, data: null, type: '' })
51
+ const [confirm, setConfirm] = useState<any>({ open: false, content: null, handleOnAccept: null, id: null, title: null })
49
52
  const isCouponEnabled = validationFields?.fields?.checkout?.coupon?.enabled;
50
53
 
51
54
  const handleDeleteClick = (product: any) => {
@@ -61,7 +64,7 @@ const OrderSummaryUI = (props: any) => {
61
64
  categoryId: product?.category_id,
62
65
  productId: product?.id,
63
66
  isFromCheckout: isFromCheckout,
64
- })
67
+ })
65
68
  }
66
69
 
67
70
  const getIncludedTaxes = () => {
@@ -74,6 +77,22 @@ const OrderSummaryUI = (props: any) => {
74
77
  }
75
78
  }
76
79
 
80
+ const getIncludedTaxesDiscounts = () => {
81
+ return cart?.taxes?.filter((tax: any) => tax?.type === 1)?.reduce((carry: number, tax: any) => carry + (tax?.summary?.tax_after_discount ?? tax?.summary?.tax), 0)
82
+ }
83
+
84
+ const onRemoveOffer = (id: number) => {
85
+ setConfirm({
86
+ open: true,
87
+ content: [t('QUESTION_DELETE_OFFER', 'Are you sure that you want to delete the offer?')],
88
+ title: t('OFFER', 'Offer'),
89
+ handleOnAccept: () => {
90
+ setConfirm({ ...confirm, open: false })
91
+ handleRemoveOfferClick(id)
92
+ }
93
+ })
94
+ }
95
+
77
96
  const cart = orderState?.carts?.[`businessId:${props.cart.business_id}`]
78
97
 
79
98
  const walletName: any = {
@@ -109,9 +128,11 @@ const OrderSummaryUI = (props: any) => {
109
128
  <OSBill>
110
129
  <OSTable>
111
130
  <OText size={12}>{t('SUBTOTAL', 'Subtotal')}</OText>
112
- <OText size={12}>{parsePrice(cart?.subtotal + getIncludedTaxes())}</OText>
131
+ <OText size={12}>
132
+ {parsePrice(cart?.subtotal + getIncludedTaxes())}
133
+ </OText>
113
134
  </OSTable>
114
- {cart?.discount > 0 && cart?.total >= 0 && (
135
+ {cart?.discount > 0 && cart?.total >= 0 && cart?.offers?.length === 0 && (
115
136
  <OSTable>
116
137
  {cart?.discount_type === 1 ? (
117
138
  <OText size={12}>
@@ -125,34 +146,87 @@ const OrderSummaryUI = (props: any) => {
125
146
  </OSTable>
126
147
  )}
127
148
  {
128
- cart?.taxes?.length > 0 && cart?.taxes?.filter((tax: any) => tax?.type === 2 && tax?.rate !== 0).map((tax: any) => (
129
- <OSTable key={tax?.id}>
149
+ cart?.offers?.length > 0 && cart?.offers?.filter((offer: any) => offer?.target === 1)?.map((offer: any) => (
150
+ <OSTable key={offer.id}>
130
151
  <OSRow>
131
- <OText size={12} numberOfLines={1}>
132
- {tax?.name || t('INHERIT_FROM_BUSINESS', 'Inherit from business')}{' '}
152
+ <OText size={12}>{offer.name}</OText>
153
+ {offer.rate_type === 1 && (
154
+ <OText size={12}>{`(${verifyDecimals(offer?.rate, parsePrice)}%)`}</OText>
155
+ )}
156
+ <TouchableOpacity style={{ marginLeft: 3 }} onPress={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_1' })}>
157
+ <AntIcon name='exclamationcircleo' size={18} color={theme.colors.primary} />
158
+ </TouchableOpacity>
159
+ <TouchableOpacity style={{ marginLeft: 3 }} onPress={() => onRemoveOffer(offer?.id)}>
160
+ <AntIcon name='closecircle' size={18} color={theme.colors.primary} />
161
+ </TouchableOpacity>
162
+ </OSRow>
163
+ <OText size={12}>
164
+ - {parsePrice(offer?.summary?.discount)}
165
+ </OText>
166
+ </OSTable>
167
+ ))
168
+ }
169
+ <Divider />
170
+ {cart?.subtotal_with_discount > 0 && cart?.discount > 0 && cart?.total >= 0 && (
171
+ <OSTable>
172
+ <OText size={12} numberOfLines={1}>{t('SUBTOTAL_WITH_DISCOUNT', 'Subtotal with discount')}</OText>
173
+ {cart?.business?.tax_type === 1 ? (
174
+ <OText size={12}>{parsePrice(cart?.subtotal_with_discount + getIncludedTaxesDiscounts() ?? 0)}</OText>
175
+ ) : (
176
+ <OText size={12}>{parsePrice(cart?.subtotal_with_discount ?? 0)}</OText>
177
+ )}
178
+ </OSTable>
179
+ )}
180
+ {
181
+ cart.taxes?.length > 0 && cart.taxes.filter((tax: any) => tax.type === 2 && tax?.rate !== 0).map((tax: any) => (
182
+ <OSTable key={tax.id}>
183
+ <OSRow>
184
+ <OText size={12} numberOfLines={1} >
185
+ {tax.name || t('INHERIT_FROM_BUSINESS', 'Inherit from business')}{' '}
133
186
  {`(${verifyDecimals(tax?.rate, parseNumber)}%)`}{' '}
134
187
  </OText>
135
- <TouchableOpacity onPress={() => setOpenTaxModal({ open: true, data: tax })} >
136
- <AntIcon name='exclamationcircleo' size={20} color={theme.colors.primary} />
188
+ <TouchableOpacity onPress={() => setOpenTaxModal({ open: true, data: tax, type: 'tax' })} >
189
+ <AntIcon name='exclamationcircleo' size={18} color={theme.colors.primary} />
137
190
  </TouchableOpacity>
138
191
  </OSRow>
139
- <OText size={12}>{parsePrice(tax?.summary?.tax || 0)}</OText>
192
+ <OText size={12}>{parsePrice(tax?.summary?.tax_after_discount ?? tax?.summary?.tax ?? 0)}</OText>
140
193
  </OSTable>
141
194
  ))
142
195
  }
143
196
  {
144
- cart?.fees?.length > 0 && cart?.fees?.filter((fee: any) => !(fee.fixed === 0 && fee.percentage === 0))?.map((fee: any) => (
145
- <OSTable key={fee.id}>
197
+ cart?.fees?.length > 0 && cart?.fees?.filter((fee: any) => !(fee.fixed === 0 && fee.percentage === 0)).map((fee: any) => (
198
+ <OSTable key={fee?.id}>
146
199
  <OSRow>
147
200
  <OText size={12} numberOfLines={1}>
148
201
  {fee.name || t('INHERIT_FROM_BUSINESS', 'Inherit from business')}{' '}
149
- ({parsePrice(fee?.fixed)} + {fee.percentage}%){' '}
202
+ ({parsePrice(fee?.fixed)} + {fee?.percentage}%){' '}
150
203
  </OText>
151
- <TouchableOpacity onPress={() => setOpenTaxModal({ open: true, data: fee })} >
152
- <AntIcon name='exclamationcircleo' size={20} color={theme.colors.primary} />
204
+ <TouchableOpacity onPress={() => setOpenTaxModal({ open: true, data: fee, type: 'fee' })} >
205
+ <AntIcon name='exclamationcircleo' size={18} color={theme.colors.primary} />
153
206
  </TouchableOpacity>
154
207
  </OSRow>
155
- <OText size={12}>{parsePrice(fee?.summary?.fixed + fee?.summary?.percentage || 0)}</OText>
208
+ <OText size={12}>{parsePrice(fee?.summary?.fixed + (fee?.summary?.percentage_after_discount ?? fee?.summary?.percentage) ?? 0)}</OText>
209
+ </OSTable>
210
+ ))
211
+ }
212
+ {
213
+ cart?.offers?.length > 0 && cart?.offers?.filter((offer: any) => offer?.target === 3)?.map((offer: any) => (
214
+ <OSTable key={offer.id}>
215
+ <OSRow>
216
+ <OText size={12}>{offer.name}</OText>
217
+ {offer.rate_type === 1 && (
218
+ <OText size={12}>{`(${verifyDecimals(offer?.rate, parsePrice)}%)`}</OText>
219
+ )}
220
+ <TouchableOpacity style={{ marginLeft: 3 }} onPress={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_3' })}>
221
+ <AntIcon name='exclamationcircleo' size={18} color={theme.colors.primary} />
222
+ </TouchableOpacity>
223
+ <TouchableOpacity style={{ marginLeft: 3 }} onPress={() => onRemoveOffer(offer?.id)}>
224
+ <AntIcon name='closecircle' size={18} color={theme.colors.primary} />
225
+ </TouchableOpacity>
226
+ </OSRow>
227
+ <OText size={12}>
228
+ - {parsePrice(offer?.summary?.discount)}
229
+ </OText>
156
230
  </OSTable>
157
231
  ))
158
232
  }
@@ -162,6 +236,27 @@ const OrderSummaryUI = (props: any) => {
162
236
  <OText size={12}>{parsePrice(cart?.delivery_price)}</OText>
163
237
  </OSTable>
164
238
  )}
239
+ {
240
+ cart?.offers?.length > 0 && cart?.offers?.filter((offer: any) => offer?.target === 2)?.map((offer: any) => (
241
+ <OSTable key={offer.id}>
242
+ <OSRow>
243
+ <OText size={12}>{offer.name}</OText>
244
+ {offer.rate_type === 1 && (
245
+ <OText size={12}>{`(${verifyDecimals(offer?.rate, parsePrice)}%)`}</OText>
246
+ )}
247
+ <TouchableOpacity style={{ marginLeft: 3 }} onPress={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_2' })}>
248
+ <AntIcon name='exclamationcircleo' size={18} color={theme.colors.primary} />
249
+ </TouchableOpacity>
250
+ <TouchableOpacity style={{ marginLeft: 3 }} onPress={() => onRemoveOffer(offer?.id)}>
251
+ <AntIcon name='closecircle' size={18} color={theme.colors.primary} />
252
+ </TouchableOpacity>
253
+ </OSRow>
254
+ <OText size={12}>
255
+ - {parsePrice(offer?.summary?.discount)}
256
+ </OText>
257
+ </OSTable>
258
+ ))
259
+ }
165
260
  {cart?.driver_tip > 0 && (
166
261
  <OSTable>
167
262
  <OText size={12}>
@@ -201,7 +296,7 @@ const OrderSummaryUI = (props: any) => {
201
296
  {t('TOTAL', 'Total')}
202
297
  </OText>
203
298
  <OText size={14} style={{ fontWeight: 'bold' }} >
204
- {parsePrice(cart?.balance ?? cart?.total)}
299
+ {parsePrice(cart?.total >= 0 ? cart?.total : 0)}
205
300
  </OText>
206
301
  </OSTable>
207
302
  </View>
@@ -243,11 +338,25 @@ const OrderSummaryUI = (props: any) => {
243
338
  )}
244
339
  <OModal
245
340
  open={openTaxModal.open}
246
- onClose={() => setOpenTaxModal({ open: false, data: null })}
341
+ onClose={() => setOpenTaxModal({ open: false, data: null, type: '' })}
247
342
  entireModal
343
+ title={`${openTaxModal.data?.name ||
344
+ t('INHERIT_FROM_BUSINESS', 'Inherit from business')} ${openTaxModal.data?.rate_type !== 2 ? `(${typeof openTaxModal.data?.rate === 'number' ? `${openTaxModal.data?.rate}%` : `${parsePrice(openTaxModal.data?.fixed ?? 0)} + ${openTaxModal.data?.percentage}%`})` : ''} `}
248
345
  >
249
- <TaxInformation data={openTaxModal.data} products={cart.products} />
346
+ <TaxInformation
347
+ type={openTaxModal.type}
348
+ data={openTaxModal.data}
349
+ products={cart?.products}
350
+ />
250
351
  </OModal>
352
+ <OAlert
353
+ open={confirm.open}
354
+ title={confirm.title}
355
+ content={confirm.content}
356
+ onAccept={confirm.handleOnAccept}
357
+ onCancel={() => setConfirm({ ...confirm, open: false, title: null })}
358
+ onClose={() => setConfirm({ ...confirm, open: false, title: null })}
359
+ />
251
360
  </>
252
361
  )}
253
362
  </OSContainer>
package/themes/original/src/components/OrderSummary/styles.tsx CHANGED
@@ -39,3 +39,10 @@ export const OSRow = styled.View`
39
39
  overflow: hidden;
40
40
  width: 80%;
41
41
  `
42
+
43
+ export const Divider = styled.View`
44
+ border-color: #EAEAEA;
45
+ border-width: 1px;
46
+ margin-top: 5px;
47
+ margin-bottom: 10px;
48
+ `