ordering-ui-external 9.0.0 → 9.0.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/_bundles/{7.ordering-ui.8051ac183d2464013c73.js → 7.ordering-ui.b569d61a58e10b1c0bff.js} +1 -1
- package/_bundles/{ordering-ui.8051ac183d2464013c73.js → ordering-ui.b569d61a58e10b1c0bff.js} +2 -2
- package/_modules/components/VerticalOrdersLayout/SingleOrderCard/index.js +2 -1
- package/_modules/themes/five/src/components/SingleOrderCard/index.js +2 -1
- package/package.json +2 -2
- package/src/components/VerticalOrdersLayout/SingleOrderCard/index.js +22 -18
- package/src/themes/five/src/components/SingleOrderCard/index.js +3 -1
- /package/_bundles/{0.ordering-ui.8051ac183d2464013c73.js → 0.ordering-ui.b569d61a58e10b1c0bff.js} +0 -0
- /package/_bundles/{1.ordering-ui.8051ac183d2464013c73.js → 1.ordering-ui.b569d61a58e10b1c0bff.js} +0 -0
- /package/_bundles/{2.ordering-ui.8051ac183d2464013c73.js → 2.ordering-ui.b569d61a58e10b1c0bff.js} +0 -0
- /package/_bundles/{4.ordering-ui.8051ac183d2464013c73.js → 4.ordering-ui.b569d61a58e10b1c0bff.js} +0 -0
- /package/_bundles/{5.ordering-ui.8051ac183d2464013c73.js → 5.ordering-ui.b569d61a58e10b1c0bff.js} +0 -0
- /package/_bundles/{6.ordering-ui.8051ac183d2464013c73.js → 6.ordering-ui.b569d61a58e10b1c0bff.js} +0 -0
- /package/_bundles/{7.ordering-ui.8051ac183d2464013c73.js.LICENSE.txt → 7.ordering-ui.b569d61a58e10b1c0bff.js.LICENSE.txt} +0 -0
- /package/_bundles/{8.ordering-ui.8051ac183d2464013c73.js → 8.ordering-ui.b569d61a58e10b1c0bff.js} +0 -0
- /package/_bundles/{9.ordering-ui.8051ac183d2464013c73.js → 9.ordering-ui.b569d61a58e10b1c0bff.js} +0 -0
- /package/_bundles/{ordering-ui.8051ac183d2464013c73.js.LICENSE.txt → ordering-ui.b569d61a58e10b1c0bff.js.LICENSE.txt} +0 -0
|
@@ -43,6 +43,7 @@ var SingleOrderCardUI = function SingleOrderCardUI(props) {
|
|
|
43
43
|
var _useUtils = (0, _orderingComponentsExternal.useUtils)(),
|
|
44
44
|
_useUtils2 = _slicedToArray(_useUtils, 1),
|
|
45
45
|
parseDate = _useUtils2[0].parseDate;
|
|
46
|
+
var isGiftCardOrder = !(order !== null && order !== void 0 && order.business_id);
|
|
46
47
|
var handleChangeFavorite = function handleChangeFavorite(order) {
|
|
47
48
|
handleFavoriteOrder && handleFavoriteOrder(!(order !== null && order !== void 0 && order.favorite));
|
|
48
49
|
};
|
|
@@ -100,7 +101,7 @@ var SingleOrderCardUI = function SingleOrderCardUI(props) {
|
|
|
100
101
|
utc: false
|
|
101
102
|
}))), !hideOrderStatus && /*#__PURE__*/_react.default.createElement("p", {
|
|
102
103
|
className: "status"
|
|
103
|
-
}, (_getOrderStatus = getOrderStatus(order.status)) === null || _getOrderStatus === void 0 ? void 0 : _getOrderStatus.value))), /*#__PURE__*/_react.default.createElement(_styles2.Reorder, null, !hideReviewOrderButton && /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
|
|
104
|
+
}, (_getOrderStatus = getOrderStatus(order.status)) === null || _getOrderStatus === void 0 ? void 0 : _getOrderStatus.value))), !isGiftCardOrder && /*#__PURE__*/_react.default.createElement(_styles2.Reorder, null, !hideReviewOrderButton && /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
|
|
104
105
|
outline: true,
|
|
105
106
|
disabled: !!(order !== null && order !== void 0 && order.review),
|
|
106
107
|
color: "primary",
|
|
@@ -101,6 +101,7 @@ var SingleOrderCardUI = function SingleOrderCardUI(props) {
|
|
|
101
101
|
_useState12 = _slicedToArray(_useState11, 2),
|
|
102
102
|
isDriverReviewed = _useState12[0],
|
|
103
103
|
setIsDriverReviewed = _useState12[1];
|
|
104
|
+
var isGiftCardOrder = !(order !== null && order !== void 0 && order.business_id);
|
|
104
105
|
var handleClickCard = function handleClickCard(e, order) {
|
|
105
106
|
if (e.target.closest('.favorite') || e.target.closest('.review') || e.target.closest('.reorder')) return;
|
|
106
107
|
if (customArray) {
|
|
@@ -292,7 +293,7 @@ var SingleOrderCardUI = function SingleOrderCardUI(props) {
|
|
|
292
293
|
isBusinessesPage: isBusinessesPage
|
|
293
294
|
}, !pastOrders && /*#__PURE__*/_react.default.createElement("h2", null, isSkeleton ? /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
|
|
294
295
|
width: 50
|
|
295
|
-
}) : parsePrice((order === null || order === void 0 ? void 0 : (_order$business15 = order.business) === null || _order$business15 === void 0 ? void 0 : _order$business15.length) > 1 ? order === null || order === void 0 ? void 0 : order.total : (order === null || order === void 0 ? void 0 : (_order$summary2 = order.summary) === null || _order$summary2 === void 0 ? void 0 : _order$summary2.total) || (order === null || order === void 0 ? void 0 : order.total)))), pastOrders && /*#__PURE__*/_react.default.createElement(_styles.ButtonWrapper, {
|
|
296
|
+
}) : parsePrice((order === null || order === void 0 ? void 0 : (_order$business15 = order.business) === null || _order$business15 === void 0 ? void 0 : _order$business15.length) > 1 ? order === null || order === void 0 ? void 0 : order.total : (order === null || order === void 0 ? void 0 : (_order$summary2 = order.summary) === null || _order$summary2 === void 0 ? void 0 : _order$summary2.total) || (order === null || order === void 0 ? void 0 : order.total)))), pastOrders && !isGiftCardOrder && /*#__PURE__*/_react.default.createElement(_styles.ButtonWrapper, {
|
|
296
297
|
isCustomerMode: isCustomerMode
|
|
297
298
|
}, !isOrderReviewed && !isFavorite && (!(order !== null && order !== void 0 && order.review) || order.driver && !(order !== null && order !== void 0 && order.user_review)) && !hideReviewOrderButton && !isCustomerMode && /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
|
|
298
299
|
outline: true,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ordering-ui-external",
|
|
3
|
-
"version": "9.0.
|
|
3
|
+
"version": "9.0.2",
|
|
4
4
|
"description": "Ordering UI Components",
|
|
5
5
|
"main": "./_modules/index.js",
|
|
6
6
|
"exports": {
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
"lodash": "^4.17.19",
|
|
88
88
|
"moment": "^2.29.4",
|
|
89
89
|
"nanoid": "^4.0.0",
|
|
90
|
-
"ordering-components-external": "8.0.
|
|
90
|
+
"ordering-components-external": "8.0.1",
|
|
91
91
|
"payment": "^2.4.6",
|
|
92
92
|
"polished": "^3.6.6",
|
|
93
93
|
"react-bootstrap-icons": "^1.7.2",
|
|
@@ -34,6 +34,8 @@ const SingleOrderCardUI = (props) => {
|
|
|
34
34
|
const [, t] = useLanguage()
|
|
35
35
|
const [{ parseDate }] = useUtils()
|
|
36
36
|
|
|
37
|
+
const isGiftCardOrder = !order?.business_id
|
|
38
|
+
|
|
37
39
|
const handleChangeFavorite = (order) => {
|
|
38
40
|
handleFavoriteOrder && handleFavoriteOrder(!order?.favorite)
|
|
39
41
|
}
|
|
@@ -110,24 +112,26 @@ const SingleOrderCardUI = (props) => {
|
|
|
110
112
|
)}
|
|
111
113
|
</BusinessInformation>
|
|
112
114
|
</OrderPastContent>
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
115
|
+
{!isGiftCardOrder && (
|
|
116
|
+
<Reorder>
|
|
117
|
+
{!hideReviewOrderButton && (
|
|
118
|
+
<Button
|
|
119
|
+
outline
|
|
120
|
+
disabled={!!order?.review}
|
|
121
|
+
color='primary'
|
|
122
|
+
className='review'
|
|
123
|
+
onClick={() => setOrderSelected(order)}
|
|
124
|
+
>
|
|
125
|
+
{!!order?.review ? t('REVIEWED', 'Reviewed') : t('REVIEW', 'Review')}
|
|
126
|
+
</Button>
|
|
127
|
+
)}
|
|
128
|
+
{!hideReorderButton && typeof order?.id === 'number' && (
|
|
129
|
+
<Button color='primary' className='reorder' outline onClick={() => handleReorder(order.id)}>
|
|
130
|
+
{orderID === order.id && reorderLoading ? t('LOADING', 'Loading...') : t('REORDER', 'Reorder')}
|
|
131
|
+
</Button>
|
|
132
|
+
)}
|
|
133
|
+
</Reorder>
|
|
134
|
+
)}
|
|
131
135
|
</SingleCard>
|
|
132
136
|
)
|
|
133
137
|
}
|
|
@@ -59,6 +59,8 @@ const SingleOrderCardUI = (props) => {
|
|
|
59
59
|
const [isProductReviewed, setIsProductReviewed] = useState(false)
|
|
60
60
|
const [isDriverReviewed, setIsDriverReviewed] = useState(false)
|
|
61
61
|
|
|
62
|
+
const isGiftCardOrder = !order?.business_id
|
|
63
|
+
|
|
62
64
|
const handleClickCard = (e, order) => {
|
|
63
65
|
if (e.target.closest('.favorite') || e.target.closest('.review') || e.target.closest('.reorder')) return
|
|
64
66
|
|
|
@@ -254,7 +256,7 @@ const SingleOrderCardUI = (props) => {
|
|
|
254
256
|
}
|
|
255
257
|
</Price>
|
|
256
258
|
)}
|
|
257
|
-
{pastOrders && (
|
|
259
|
+
{pastOrders && !isGiftCardOrder && (
|
|
258
260
|
<ButtonWrapper isCustomerMode={isCustomerMode}>
|
|
259
261
|
{!isOrderReviewed && !isFavorite && (!order?.review || (order.driver && !order?.user_review)) && !hideReviewOrderButton && !isCustomerMode && (
|
|
260
262
|
<Button
|
/package/_bundles/{0.ordering-ui.8051ac183d2464013c73.js → 0.ordering-ui.b569d61a58e10b1c0bff.js}
RENAMED
|
File without changes
|
/package/_bundles/{1.ordering-ui.8051ac183d2464013c73.js → 1.ordering-ui.b569d61a58e10b1c0bff.js}
RENAMED
|
File without changes
|
/package/_bundles/{2.ordering-ui.8051ac183d2464013c73.js → 2.ordering-ui.b569d61a58e10b1c0bff.js}
RENAMED
|
File without changes
|
/package/_bundles/{4.ordering-ui.8051ac183d2464013c73.js → 4.ordering-ui.b569d61a58e10b1c0bff.js}
RENAMED
|
File without changes
|
/package/_bundles/{5.ordering-ui.8051ac183d2464013c73.js → 5.ordering-ui.b569d61a58e10b1c0bff.js}
RENAMED
|
File without changes
|
/package/_bundles/{6.ordering-ui.8051ac183d2464013c73.js → 6.ordering-ui.b569d61a58e10b1c0bff.js}
RENAMED
|
File without changes
|
|
File without changes
|
/package/_bundles/{8.ordering-ui.8051ac183d2464013c73.js → 8.ordering-ui.b569d61a58e10b1c0bff.js}
RENAMED
|
File without changes
|
/package/_bundles/{9.ordering-ui.8051ac183d2464013c73.js → 9.ordering-ui.b569d61a58e10b1c0bff.js}
RENAMED
|
File without changes
|