ordering-ui-react-native 0.22.65 → 0.22.66
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
|
@@ -77,7 +77,6 @@ export const OrderItem = React.memo((props: any) => {
|
|
|
77
77
|
marginLeft: 3,
|
|
78
78
|
},
|
|
79
79
|
title: {
|
|
80
|
-
marginBottom: showExternalId ? 0 : 6,
|
|
81
80
|
fontFamily: 'Poppins',
|
|
82
81
|
fontStyle: 'normal',
|
|
83
82
|
fontWeight: '600',
|
|
@@ -85,7 +84,6 @@ export const OrderItem = React.memo((props: any) => {
|
|
|
85
84
|
color: theme.colors.textGray,
|
|
86
85
|
},
|
|
87
86
|
date: {
|
|
88
|
-
marginBottom: showExternalId ? 0 : 6,
|
|
89
87
|
fontFamily: 'Poppins',
|
|
90
88
|
fontStyle: 'normal',
|
|
91
89
|
fontWeight: 'normal',
|
|
@@ -180,7 +178,7 @@ export const OrderItem = React.memo((props: any) => {
|
|
|
180
178
|
/>
|
|
181
179
|
</NotificationIcon>
|
|
182
180
|
)}
|
|
183
|
-
<View
|
|
181
|
+
<View>
|
|
184
182
|
{!order?.order_group_id && showExternalId && !order?.order_group && (
|
|
185
183
|
<OText
|
|
186
184
|
style={styles.date}
|
|
@@ -188,26 +186,28 @@ export const OrderItem = React.memo((props: any) => {
|
|
|
188
186
|
numberOfLines={1}
|
|
189
187
|
adjustsFontSizeToFit
|
|
190
188
|
>
|
|
191
|
-
{order?.external_id ?? t('NO_EXTERNAL_ID', 'No external Id ') + t('NO', 'Order No.') + order?.id}
|
|
189
|
+
{`${order?.external_id ?? t('NO_EXTERNAL_ID', 'No external Id ') + t('NO', 'Order No.') + order?.id}` + ' · ' + `${order?.delivery_datetime_utc
|
|
190
|
+
? parseDate(order?.delivery_datetime_utc)
|
|
191
|
+
: parseDate(order?.delivery_datetime, { utc: false })
|
|
192
|
+
}`}
|
|
192
193
|
</OText>
|
|
193
194
|
)}
|
|
194
|
-
<OText
|
|
195
|
+
{!showExternalId && (<OText
|
|
195
196
|
style={styles.date}
|
|
196
197
|
color={theme.colors.unselectText}
|
|
197
198
|
numberOfLines={1}
|
|
198
199
|
adjustsFontSizeToFit
|
|
199
200
|
>
|
|
200
|
-
{
|
|
201
|
+
{((!!order?.order_group_id && order?.order_group && isLogisticOrder
|
|
201
202
|
? `${order?.order_group?.orders?.length} ${t('ORDERS', 'Orders')}`
|
|
202
203
|
: (t('NO', 'Order No.') + order?.id)
|
|
203
|
-
) + ' · '
|
|
204
|
-
{order?.delivery_datetime_utc
|
|
204
|
+
) + ' · ' + `${order?.delivery_datetime_utc
|
|
205
205
|
? parseDate(order?.delivery_datetime_utc)
|
|
206
|
-
: parseDate(order?.delivery_datetime, { utc: false })}
|
|
206
|
+
: parseDate(order?.delivery_datetime, { utc: false })}`)}
|
|
207
207
|
</OText>
|
|
208
|
+
)}
|
|
208
209
|
{((currentTabSelected === 'pending' || currentTabSelected === 'inProgress') && allowColumns?.timer) && (
|
|
209
210
|
<>
|
|
210
|
-
{!showExternalId && <OText> · </OText>}
|
|
211
211
|
<OText
|
|
212
212
|
style={styles.date}
|
|
213
213
|
color={
|