ordering-components-external 13.0.39 → 13.0.41

package/_modules/components/AddressForm/index.js

@@ -286,7 +286,9 @@ var AddressForm = exports.AddressForm = function AddressForm(props) {
             conditions = [];
             parameters = {
               location: "".concat(location === null || location === void 0 ? void 0 : location.lat, ",").concat(location === null || location === void 0 ? void 0 : location.lng),
-              type: options === null || options === void 0 ? void 0 : options.type
+              type: 2,
+              page: 1,
+              page_size: 5
             };
             if (franchiseId) {
               conditions.push({

package/_modules/components/Checkout/index.js

@@ -276,6 +276,13 @@ var Checkout = exports.Checkout = function Checkout(props) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            if (!placing) {
+              _context2.next = 3;
+              break;
+            }
+            showToast(_ToastContext.ToastType.Info, t('CART_IN_PROGRESS', 'Cart in progress'));
+            return _context2.abrupt("return");
+          case 3:
             paymethodData = paymethodSelected === null || paymethodSelected === void 0 ? void 0 : paymethodSelected.data;
             if (paymethodSelected !== null && paymethodSelected !== void 0 && paymethodSelected.paymethod && ['stripe', 'stripe_connect', 'stripe_direct'].includes(paymethodSelected === null || paymethodSelected === void 0 || (_paymethodSelected$pa5 = paymethodSelected.paymethod) === null || _paymethodSelected$pa5 === void 0 ? void 0 : _paymethodSelected$pa5.gateway)) {
               paymethodData = {
@@ -298,75 +305,75 @@ var Checkout = exports.Checkout = function Checkout(props) {
               });
             }
             if (!handleCustomClick) {
-              _context2.next = 9;
+              _context2.next = 12;
               break;
             }
             handleCustomClick(payload, paymethodSelected, cart);
             return _context2.abrupt("return");
-          case 9:
+          case 12:
             if (cart) {
-              _context2.next = 11;
+              _context2.next = 14;
               break;
             }
             return _context2.abrupt("return");
-          case 11:
+          case 14:
             payload = _objectSpread(_objectSpread(_objectSpread({}, payload), payloadProps), {}, {
               paymethod_data: _objectSpread(_objectSpread({}, paymethodData), paymentOptions)
             });
             setPlacing(true);
-            _context2.next = 15;
+            _context2.next = 18;
             return onChangeSpot();
-          case 15:
+          case 18:
             if (paymethodsWithoutSaveCard.includes(paymethodSelected === null || paymethodSelected === void 0 || (_paymethodSelected$pa6 = paymethodSelected.paymethod) === null || _paymethodSelected$pa6 === void 0 ? void 0 : _paymethodSelected$pa6.gateway)) {
               delete payload.paymethod_data;
             }
-            _context2.next = 18;
+            _context2.next = 21;
             return placeCart(cart.uuid, payload);
-          case 18:
+          case 21:
             result = _context2.sent;
             if (!(result !== null && result !== void 0 && result.error || !result)) {
-              _context2.next = 27;
+              _context2.next = 30;
               break;
             }
             setErrors(result === null || result === void 0 ? void 0 : result.result);
             if (!(dismissPlatformPay && (paymethodSelected === null || paymethodSelected === void 0 || (_paymethodSelected$pa7 = paymethodSelected.paymethod) === null || _paymethodSelected$pa7 === void 0 ? void 0 : _paymethodSelected$pa7.gateway) === 'apple_pay')) {
-              _context2.next = 24;
+              _context2.next = 27;
               break;
             }
-            _context2.next = 24;
+            _context2.next = 27;
             return dismissPlatformPay();
-          case 24:
+          case 27:
             refreshOrderOptions();
             setPlacing(false);
             return _context2.abrupt("return");
-          case 27:
+          case 30:
             cartResult = result === null || result === void 0 ? void 0 : result.result;
             if (!((cartResult === null || cartResult === void 0 || (_cartResult$paymethod = cartResult.paymethod_data) === null || _cartResult$paymethod === void 0 ? void 0 : _cartResult$paymethod.status) === 2 && actionsBeforePlace)) {
-              _context2.next = 31;
+              _context2.next = 34;
               break;
             }
-            _context2.next = 31;
+            _context2.next = 34;
             return actionsBeforePlace(paymethodSelected, result.result);
-          case 31:
+          case 34:
             if (!(confirmPayment && (result === null || result === void 0 || (_result$result = result.result) === null || _result$result === void 0 || (_result$result = _result$result.paymethod_data) === null || _result$result === void 0 ? void 0 : _result$result.gateway) === 'apple_pay')) {
-              _context2.next = 37;
+              _context2.next = 40;
               break;
             }
-            _context2.next = 34;
+            _context2.next = 37;
             return confirmPayment(result === null || result === void 0 || (_result$result2 = result.result) === null || _result$result2 === void 0 || (_result$result2 = _result$result2.paymethod_data) === null || _result$result2 === void 0 || (_result$result2 = _result$result2.result) === null || _result$result2 === void 0 ? void 0 : _result$result2.client_secret);
-          case 34:
+          case 37:
             _yield$confirmPayment = _context2.sent;
             confirmApplePayError = _yield$confirmPayment.error;
             if (confirmApplePayError) {
               setErrors(confirmApplePayError);
             }
-          case 37:
+          case 40:
             if (paymethodsWithoutSaveCard.includes(cartResult === null || cartResult === void 0 || (_cartResult$paymethod2 = cartResult.paymethod_data) === null || _cartResult$paymethod2 === void 0 ? void 0 : _cartResult$paymethod2.gateway) && cartResult !== null && cartResult !== void 0 && (_cartResult$paymethod3 = cartResult.paymethod_data) !== null && _cartResult$paymethod3 !== void 0 && (_cartResult$paymethod3 = _cartResult$paymethod3.result) !== null && _cartResult$paymethod3 !== void 0 && _cartResult$paymethod3.hash && (cartResult === null || cartResult === void 0 || (_cartResult$paymethod4 = cartResult.paymethod_data) === null || _cartResult$paymethod4 === void 0 ? void 0 : _cartResult$paymethod4.status) === 2 && !payloadProps.isNative) {
               handleConfirmCredomaticPage(cartResult, paymethodSelected);
             }
             setPlacing(false);
             onPlaceOrderClick && onPlaceOrderClick(payload, paymethodSelected, cartResult);
-          case 40:
+          case 43:
           case "end":
             return _context2.stop();
         }

package/_modules/components/MultiCheckout/index.js

@@ -152,6 +152,13 @@ var MultiCheckout = exports.MultiCheckout = function MultiCheckout(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            if (!placing) {
+              _context.next = 3;
+              break;
+            }
+            showToast(_ToastContext.ToastType.Info, t('CART_IN_PROGRESS', 'Cart in progress'));
+            return _context.abrupt("return");
+          case 3:
             paymethodData = paymethodSelected === null || paymethodSelected === void 0 ? void 0 : paymethodSelected.paymethod_data;
             if (paymethodSelected !== null && paymethodSelected !== void 0 && paymethodSelected.paymethod_data && ['stripe', 'stripe_connect', 'stripe_direct'].includes(paymethodSelected === null || paymethodSelected === void 0 || (_paymethodSelected$pa = paymethodSelected.paymethod) === null || _paymethodSelected$pa === void 0 ? void 0 : _paymethodSelected$pa.gateway)) {
               paymethodData = JSON.stringify({
@@ -178,27 +185,27 @@ var MultiCheckout = exports.MultiCheckout = function MultiCheckout(props) {
               });
             }
             setPlacing(true);
-            _context.next = 9;
+            _context.next = 12;
             return placeMultiCarts(payload, cartUuid);
-          case 9:
+          case 12:
             _yield$placeMultiCart = _context.sent;
             error = _yield$placeMultiCart.error;
             result = _yield$placeMultiCart.result;
             if (!error) {
-              _context.next = 14;
+              _context.next = 17;
               break;
             }
             return _context.abrupt("return");
-          case 14:
+          case 17:
             if (!((result === null || result === void 0 || (_result$paymethod_dat = result.paymethod_data) === null || _result$paymethod_dat === void 0 ? void 0 : _result$paymethod_dat.status) === 2 && actionsBeforePlace)) {
-              _context.next = 17;
+              _context.next = 20;
               break;
             }
-            _context.next = 17;
+            _context.next = 20;
             return actionsBeforePlace(paymethodSelected, result);
-          case 17:
+          case 20:
             if (!(confirmPayment && (paymethodSelected === null || paymethodSelected === void 0 ? void 0 : paymethodSelected.gateway) === 'global_apple_pay')) {
-              _context.next = 27;
+              _context.next = 30;
               break;
             }
             paymentEvent = result === null || result === void 0 || (_result$payment_event = result.payment_events) === null || _result$payment_event === void 0 ? void 0 : _result$payment_event.find(function (event) {
@@ -206,28 +213,28 @@ var MultiCheckout = exports.MultiCheckout = function MultiCheckout(props) {
               return event === null || event === void 0 || (_event$data = event.data) === null || _event$data === void 0 || (_event$data = _event$data.extra) === null || _event$data === void 0 ? void 0 : _event$data.client_secret;
             });
             if (!(paymentEvent !== null && paymentEvent !== void 0 && (_paymentEvent$data = paymentEvent.data) !== null && _paymentEvent$data !== void 0 && (_paymentEvent$data = _paymentEvent$data.extra) !== null && _paymentEvent$data !== void 0 && _paymentEvent$data.client_secret)) {
-              _context.next = 25;
+              _context.next = 28;
               break;
             }
-            _context.next = 22;
+            _context.next = 25;
             return confirmPayment(paymentEvent === null || paymentEvent === void 0 || (_paymentEvent$data2 = paymentEvent.data) === null || _paymentEvent$data2 === void 0 || (_paymentEvent$data2 = _paymentEvent$data2.extra) === null || _paymentEvent$data2 === void 0 ? void 0 : _paymentEvent$data2.client_secret);
-          case 22:
+          case 25:
             _yield$confirmPayment = _context.sent;
             confirmApplePayError = _yield$confirmPayment.error;
             if (confirmApplePayError !== null && confirmApplePayError !== void 0 && confirmApplePayError.message || confirmApplePayError !== null && confirmApplePayError !== void 0 && confirmApplePayError.localizedMessage) {
               showToast(_ToastContext.ToastType.Error, (confirmApplePayError === null || confirmApplePayError === void 0 ? void 0 : confirmApplePayError.message) || (confirmApplePayError === null || confirmApplePayError === void 0 ? void 0 : confirmApplePayError.localizedMessage));
             }
-          case 25:
+          case 28:
             setPlacing(false);
             if (!error) {
               onPlaceOrderClick && onPlaceOrderClick(result);
             }
-          case 27:
+          case 30:
             setPlacing(false);
             if (!error) {
               onPlaceOrderClick && onPlaceOrderClick(result);
             }
-          case 29:
+          case 32:
           case "end":
             return _context.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-components-external",
-  "version": "13.0.39",
+  "version": "13.0.41",
   "description": "Ordering Internal Dashboard",
   "main": "./_modules/index.js",
   "scripts": {

package/src/components/AddressForm/index.js

@@ -175,7 +175,9 @@ export const AddressForm = (props) => {
       const conditions = []
       const parameters = {
         location: `${location?.lat},${location?.lng}`,
-        type: options?.type
+        type: 2,
+        page: 1,
+        page_size: 5
       }
       if (franchiseId) {
         conditions.push({ attribute: 'franchise_id', value: franchiseId })
@@ -186,7 +188,11 @@ export const AddressForm = (props) => {
       }
       const source = {}
       requestsState.businesses = source
-      const fetchEndpoint = ordering.businesses().select(['delivery_zone', 'name', 'id', 'location', 'logo', 'slug', 'zones']).parameters(parameters).where(where)
+      const fetchEndpoint = ordering
+        .businesses()
+        .select(['delivery_zone', 'name', 'id', 'location', 'logo', 'slug', 'zones'])
+        .parameters(parameters)
+        .where(where)
       const { content: { error, result } } = await fetchEndpoint.get({ cancelToken: source })
       setBusinessesList({
         ...businessesList,

package/src/components/Checkout/index.js

@@ -150,6 +150,10 @@ export const Checkout = (props) => {
    * Method to handle click on Place order
    */
   const handlerClickPlaceOrder = async (paymentOptions, payloadProps, confirmPayment, dismissPlatformPay) => {
+    if (placing) {
+      showToast(ToastType.Info, t('CART_IN_PROGRESS', 'Cart in progress'))
+      return
+    }
     let paymethodData = paymethodSelected?.data
     if (paymethodSelected?.paymethod && ['stripe', 'stripe_connect', 'stripe_direct'].includes(paymethodSelected?.paymethod?.gateway)) {
       paymethodData = {

package/src/components/MultiCheckout/index.js

@@ -56,6 +56,10 @@ export const MultiCheckout = (props) => {
   const totalCartsFee = openCarts?.length && openCarts?.filter(cart => cart?.status !== 1 && cart?.valid)?.reduce((total, cart) => { return total + (cart?.delivery_price_with_discount) }, 0)
 
   const handleGroupPlaceOrder = async (confirmPayment) => {
+    if (placing) {
+      showToast(ToastType.Info, t('CART_IN_PROGRESS', 'Cart in progress'))
+      return
+    }
     let paymethodData = paymethodSelected?.paymethod_data
     if (paymethodSelected?.paymethod_data && ['stripe', 'stripe_connect', 'stripe_direct'].includes(paymethodSelected?.paymethod?.gateway)) {
       paymethodData = JSON.stringify({