ordering-ui-react-native 0.15.94 → 0.15.97
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 +1 -1
- package/src/components/BusinessController/index.tsx +8 -2
- package/src/types/index.tsx +3 -2
- package/themes/business/src/components/OrderDetails/Delivery.tsx +3 -1
- package/themes/original/src/components/PaymentOptionCash/index.tsx +2 -2
- package/themes/original/src/components/ProductItemAccordion/index.tsx +1 -1
package/package.json
CHANGED
|
@@ -32,6 +32,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
|
|
|
32
32
|
business,
|
|
33
33
|
handleClick,
|
|
34
34
|
isBusinessOpen,
|
|
35
|
+
getBusinessOffer,
|
|
35
36
|
businessWillCloseSoonMinutes,
|
|
36
37
|
isBusinessClose
|
|
37
38
|
} = props;
|
|
@@ -145,9 +146,14 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
|
|
|
145
146
|
/>
|
|
146
147
|
</BusinessLogo>
|
|
147
148
|
<BusinessState>
|
|
148
|
-
{
|
|
149
|
+
{(isBusinessOpen || !!getBusinessOffer(business?.offers)) && (
|
|
149
150
|
<View style={styles.businessStateView}>
|
|
150
|
-
|
|
151
|
+
{getBusinessOffer(business?.offers) && (
|
|
152
|
+
<OText color={theme.colors.white} size={18} style={styles.businessStateText}>
|
|
153
|
+
{getBusinessOffer(business?.offers) || parsePrice(0)}
|
|
154
|
+
</OText>
|
|
155
|
+
)}
|
|
156
|
+
<OText color={theme.colors.white} size={18} style={styles.businessStateText}>
|
|
151
157
|
{t('PREORDER', 'PREORDER')}
|
|
152
158
|
</OText>
|
|
153
159
|
</View>
|
package/src/types/index.tsx
CHANGED
|
@@ -143,8 +143,9 @@ export interface BusinessControllerParams {
|
|
|
143
143
|
orderType?: any;
|
|
144
144
|
handleClick?: any;
|
|
145
145
|
isBusinessOpen?: boolean;
|
|
146
|
-
businessWillCloseSoonMinutes?: number
|
|
147
|
-
isBusinessClose?: number
|
|
146
|
+
businessWillCloseSoonMinutes?: number;
|
|
147
|
+
isBusinessClose?: number;
|
|
148
|
+
getBusinessOffer: any;
|
|
148
149
|
}
|
|
149
150
|
export interface BusinessProductsListingParams {
|
|
150
151
|
navigation?: any;
|
|
@@ -73,6 +73,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
|
|
|
73
73
|
key?: string | null;
|
|
74
74
|
}>({ open: false, content: [], key: null });
|
|
75
75
|
|
|
76
|
+
const validStatusComplete = [9, 19, 23]
|
|
77
|
+
|
|
76
78
|
const logisticOrderStatus = [4, 6, 7]
|
|
77
79
|
|
|
78
80
|
const showFloatButtonsPickUp: any = {
|
|
@@ -393,7 +395,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
|
|
|
393
395
|
widthButton={'45%'}
|
|
394
396
|
/>
|
|
395
397
|
)}
|
|
396
|
-
{(order?.status
|
|
398
|
+
{(validStatusComplete.includes(order?.status)) && (
|
|
397
399
|
<>
|
|
398
400
|
<FloatingButton
|
|
399
401
|
disabled={props.order?.loading}
|