ordering-ui-external 14.1.60 → 14.1.61
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/_modules/themes/five/src/components/Checkout/index.js +2 -1
- package/_modules/themes/five/src/components/PaymentOptions/index.js +4 -4
- package/package.json +1 -1
- package/src/themes/five/src/components/Checkout/index.js +1 -0
- package/src/themes/five/src/components/PaymentOptions/index.js +5 -6
|
@@ -624,7 +624,8 @@ var CheckoutUI = function CheckoutUI(props) {
|
|
|
624
624
|
requiredFields: requiredFields,
|
|
625
625
|
openUserModal: setIsOpen,
|
|
626
626
|
paymethodClicked: paymethodClicked,
|
|
627
|
-
setPaymethodClicked: setPaymethodClicked
|
|
627
|
+
setPaymethodClicked: setPaymethodClicked,
|
|
628
|
+
validateDriverTipField: validateDriverTipField
|
|
628
629
|
})), isWalletEnabled && !(businessDetails !== null && businessDetails !== void 0 && businessDetails.loading) && /*#__PURE__*/_react.default.createElement(_styles.WalletPaymentOptionContainer, null, /*#__PURE__*/_react.default.createElement(_PaymentOptionWallet.PaymentOptionWallet, {
|
|
629
630
|
cart: cart,
|
|
630
631
|
loyaltyPlansState: loyaltyPlansState,
|
|
@@ -123,7 +123,8 @@ var PaymentOptionsUI = function PaymentOptionsUI(props) {
|
|
|
123
123
|
requiredFields = props.requiredFields,
|
|
124
124
|
openUserModal = props.openUserModal,
|
|
125
125
|
paymethodClicked = props.paymethodClicked,
|
|
126
|
-
setPaymethodClicked = props.setPaymethodClicked
|
|
126
|
+
setPaymethodClicked = props.setPaymethodClicked,
|
|
127
|
+
validateDriverTipField = props.validateDriverTipField;
|
|
127
128
|
var _useLanguage = (0, _orderingComponentsExternal.useLanguage)(),
|
|
128
129
|
_useLanguage2 = _slicedToArray(_useLanguage, 2),
|
|
129
130
|
t = _useLanguage2[1];
|
|
@@ -162,11 +163,10 @@ var PaymentOptionsUI = function PaymentOptionsUI(props) {
|
|
|
162
163
|
})) === null || _list$filter === void 0 ? void 0 : _list$filter.filter(function (p) {
|
|
163
164
|
return useKioskApp ? includeKioskPaymethods.includes(p.gateway) : p;
|
|
164
165
|
});
|
|
165
|
-
var paymethodsFieldRequired = ['paypal', 'apple_pay', 'global_apple_pay'];
|
|
166
|
+
var paymethodsFieldRequired = ['paypal', 'apple_pay', 'global_apple_pay', 'google_pay'];
|
|
166
167
|
var isAlsea = ['alsea', 'alsea-staging'].includes(ordering.project);
|
|
167
168
|
var handlePaymentMethodClick = function handlePaymentMethodClick(paymethod) {
|
|
168
|
-
|
|
169
|
-
if (paymethodsFieldRequired.includes(paymethod === null || paymethod === void 0 ? void 0 : paymethod.gateway) && options.type === 1 && validationFields !== null && validationFields !== void 0 && (_validationFields$fie = validationFields.fields) !== null && _validationFields$fie !== void 0 && (_validationFields$fie = _validationFields$fie.checkout) !== null && _validationFields$fie !== void 0 && (_validationFields$fie = _validationFields$fie.driver_tip) !== null && _validationFields$fie !== void 0 && _validationFields$fie.enabled && validationFields !== null && validationFields !== void 0 && (_validationFields$fie2 = validationFields.fields) !== null && _validationFields$fie2 !== void 0 && (_validationFields$fie2 = _validationFields$fie2.checkout) !== null && _validationFields$fie2 !== void 0 && (_validationFields$fie2 = _validationFields$fie2.driver_tip) !== null && _validationFields$fie2 !== void 0 && _validationFields$fie2.required && Number(cart === null || cart === void 0 ? void 0 : cart.driver_tip) <= 0) {
|
|
169
|
+
if (paymethodsFieldRequired.includes(paymethod === null || paymethod === void 0 ? void 0 : paymethod.gateway) && validateDriverTipField) {
|
|
170
170
|
setAlertState({
|
|
171
171
|
open: true,
|
|
172
172
|
content: [t('DRIVER_TIPS_REQUIRED', 'Driver tips is required, please select a driver tip before select this paymethod')]
|
package/package.json
CHANGED
|
@@ -107,7 +107,8 @@ const PaymentOptionsUI = (props) => {
|
|
|
107
107
|
requiredFields,
|
|
108
108
|
openUserModal,
|
|
109
109
|
paymethodClicked,
|
|
110
|
-
setPaymethodClicked
|
|
110
|
+
setPaymethodClicked,
|
|
111
|
+
validateDriverTipField
|
|
111
112
|
} = props
|
|
112
113
|
const [, t] = useLanguage()
|
|
113
114
|
const [{ token, user }] = useSession()
|
|
@@ -131,16 +132,13 @@ const PaymentOptionsUI = (props) => {
|
|
|
131
132
|
|
|
132
133
|
const supportedMethods = list?.filter(p => !multiCheckoutMethods.includes(p.gateway))?.filter(p => useKioskApp ? includeKioskPaymethods.includes(p.gateway) : p)
|
|
133
134
|
|
|
134
|
-
const paymethodsFieldRequired = ['paypal', 'apple_pay', 'global_apple_pay']
|
|
135
|
+
const paymethodsFieldRequired = ['paypal', 'apple_pay', 'global_apple_pay', 'google_pay']
|
|
135
136
|
|
|
136
137
|
const isAlsea = ['alsea', 'alsea-staging'].includes(ordering.project)
|
|
137
138
|
|
|
138
139
|
const handlePaymentMethodClick = (paymethod) => {
|
|
139
140
|
if (paymethodsFieldRequired.includes(paymethod?.gateway) &&
|
|
140
|
-
|
|
141
|
-
validationFields?.fields?.checkout?.driver_tip?.enabled &&
|
|
142
|
-
validationFields?.fields?.checkout?.driver_tip?.required &&
|
|
143
|
-
(Number(cart?.driver_tip) <= 0)
|
|
141
|
+
validateDriverTipField
|
|
144
142
|
) {
|
|
145
143
|
setAlertState({
|
|
146
144
|
open: true,
|
|
@@ -148,6 +146,7 @@ const PaymentOptionsUI = (props) => {
|
|
|
148
146
|
})
|
|
149
147
|
return
|
|
150
148
|
}
|
|
149
|
+
|
|
151
150
|
if (paymethodsFieldRequired.includes(paymethod?.gateway) && requiredFields.length > 0) {
|
|
152
151
|
openUserModal && openUserModal(true)
|
|
153
152
|
setPaymethodClicked({
|