ordering-ui-external 1.2.0 → 1.2.2

package/_modules/themes/five/src/components/Cart/index.js

@@ -193,7 +193,7 @@ var CartUI = function CartUI(props) {
   var openCarts = ((_Object$values = Object.values(orderState === null || orderState === void 0 ? void 0 : orderState.carts)) === null || _Object$values === void 0 ? void 0 : _Object$values.filter(function (cart) {
     var _cart$products;
 
-    return (cart === null || cart === void 0 ? void 0 : cart.products) && (cart === null || cart === void 0 ? void 0 : (_cart$products = cart.products) === null || _cart$products === void 0 ? void 0 : _cart$products.length) && (cart === null || cart === void 0 ? void 0 : cart.status) !== 2 && (cart === null || cart === void 0 ? void 0 : cart.valid_schedule) && (cart === null || cart === void 0 ? void 0 : cart.valid_products) && (cart === null || cart === void 0 ? void 0 : cart.valid_address) && (cart === null || cart === void 0 ? void 0 : cart.valid_maximum) && (cart === null || cart === void 0 ? void 0 : cart.valid_minimum);
+    return (cart === null || cart === void 0 ? void 0 : cart.products) && (cart === null || cart === void 0 ? void 0 : (_cart$products = cart.products) === null || _cart$products === void 0 ? void 0 : _cart$products.length) && (cart === null || cart === void 0 ? void 0 : cart.status) !== 2 && (cart === null || cart === void 0 ? void 0 : cart.valid_schedule) && (cart === null || cart === void 0 ? void 0 : cart.valid_products) && (cart === null || cart === void 0 ? void 0 : cart.valid_address) && (cart === null || cart === void 0 ? void 0 : cart.valid_maximum) && (cart === null || cart === void 0 ? void 0 : cart.valid_minimum) && !(cart !== null && cart !== void 0 && cart.wallets);
   })) || null || [];
   var cart = orderState === null || orderState === void 0 ? void 0 : (_orderState$carts = orderState.carts) === null || _orderState$carts === void 0 ? void 0 : _orderState$carts["businessId:".concat(props.cart.business_id)];
   var viewString = isStore ? 'business_view' : 'header';

package/_modules/themes/five/src/components/MultiCheckout/index.js

@@ -66,7 +66,7 @@ var mapConfigs = {
 };
 
 var MultiCheckoutUI = function MultiCheckoutUI(props) {
-  var _configs$google_maps_, _customerState$user;
+  var _Object$values, _configs$google_maps_, _customerState$user;
 
   var placing = props.placing,
       isCustomerMode = props.isCustomerMode,
@@ -76,7 +76,8 @@ var MultiCheckoutUI = function MultiCheckoutUI(props) {
       paymethodSelected = props.paymethodSelected,
       handleSelectPaymethod = props.handleSelectPaymethod,
       handleSelectWallet = props.handleSelectWallet,
-      handlePaymethodDataChange = props.handlePaymethodDataChange;
+      handlePaymethodDataChange = props.handlePaymethodDataChange,
+      onRedirectPage = props.onRedirectPage;
 
   var _useLanguage = (0, _orderingComponentsExternal.useLanguage)(),
       _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -102,6 +103,10 @@ var MultiCheckoutUI = function MultiCheckoutUI(props) {
       _useSession2 = _slicedToArray(_useSession, 1),
       user = _useSession2[0].user;
 
+  var _useOrder = (0, _orderingComponentsExternal.useOrder)(),
+      _useOrder2 = _slicedToArray(_useOrder, 1),
+      orderState = _useOrder2[0];
+
   var history = (0, _reactRouterDom.useHistory)();
 
   var _useState = (0, _react.useState)([]),
@@ -124,6 +129,11 @@ var MultiCheckoutUI = function MultiCheckoutUI(props) {
 
   var maximumCarts = 5;
   var isDisablePlaceOrderButton = !(paymethodSelected !== null && paymethodSelected !== void 0 && paymethodSelected.paymethod_id || paymethodSelected !== null && paymethodSelected !== void 0 && paymethodSelected.wallet_id) || openCarts.length > maximumCarts;
+  var walletCarts = ((_Object$values = Object.values(orderState === null || orderState === void 0 ? void 0 : orderState.carts)) === null || _Object$values === void 0 ? void 0 : _Object$values.filter(function (cart) {
+    var _cart$products;
+
+    return (cart === null || cart === void 0 ? void 0 : cart.products) && (cart === null || cart === void 0 ? void 0 : (_cart$products = cart.products) === null || _cart$products === void 0 ? void 0 : _cart$products.length) && (cart === null || cart === void 0 ? void 0 : cart.status) !== 2 && (cart === null || cart === void 0 ? void 0 : cart.valid_schedule) && (cart === null || cart === void 0 ? void 0 : cart.valid_products) && (cart === null || cart === void 0 ? void 0 : cart.valid_address) && (cart === null || cart === void 0 ? void 0 : cart.valid_maximum) && (cart === null || cart === void 0 ? void 0 : cart.valid_minimum) && (cart === null || cart === void 0 ? void 0 : cart.wallets);
+  })) || null || [];
 
   var handlePlaceOrder = function handlePlaceOrder() {
     if (!userErrors.length) {
@@ -191,6 +201,12 @@ var MultiCheckoutUI = function MultiCheckoutUI(props) {
       checkValidationFields();
     }
   }, [validationFields, user, customerState]);
+  (0, _react.useEffect)(function () {
+    if (openCarts.length) return;
+    onRedirectPage && onRedirectPage({
+      page: 'search'
+    });
+  }, [openCarts]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, openCarts.length === 0 ? /*#__PURE__*/_react.default.createElement(_NotFoundSource.NotFoundSource, {
     content: t('CARTS_NOT_FOUND', 'You don’t have carts available')
   }) : /*#__PURE__*/_react.default.createElement(_styles.Container, null, /*#__PURE__*/_react.default.createElement(_styles.WrapperLeftContainer, null, /*#__PURE__*/_react.default.createElement(_styles.WrapperLeftContent, null, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ArrowLeft, {
@@ -222,7 +238,7 @@ var MultiCheckoutUI = function MultiCheckoutUI(props) {
     handleSelectWallet: handleSelectWallet,
     handlePaymethodDataChange: handlePaymethodDataChange
   })))), /*#__PURE__*/_react.default.createElement(_styles.WrapperRightContainer, null, /*#__PURE__*/_react.default.createElement(_styles.CartContainer, null, /*#__PURE__*/_react.default.createElement(_styles.CartHeader, null, /*#__PURE__*/_react.default.createElement("h1", null, t('MOBILE_FRONT_YOUR_ORDER', 'Your order'))), openCarts.map(function (cart) {
-    var _cart$products;
+    var _cart$products2;
 
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
       key: cart.uuid
@@ -230,9 +246,9 @@ var MultiCheckoutUI = function MultiCheckoutUI(props) {
       isCartPending: (cart === null || cart === void 0 ? void 0 : cart.status) === 2,
       cart: cart,
       isMultiCheckout: true,
-      isProducts: (cart === null || cart === void 0 ? void 0 : (_cart$products = cart.products) === null || _cart$products === void 0 ? void 0 : _cart$products.length) || 0
+      isProducts: (cart === null || cart === void 0 ? void 0 : (_cart$products2 = cart.products) === null || _cart$products2 === void 0 ? void 0 : _cart$products2.length) || 0
     }), /*#__PURE__*/_react.default.createElement(_styles.DriverTipDivider, null));
-  }), openCarts.length > 0 && /*#__PURE__*/_react.default.createElement(_styles.MultiCartPriceContainer, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h4", null, t('TOTAL_FOR_ALL_CARTS', 'Total for all Carts')), /*#__PURE__*/_react.default.createElement("h4", null, parsePrice(totalCartsPrice))), /*#__PURE__*/_react.default.createElement("p", null, t('MULTI_CHECKOUT_DESCRIPTION', 'You will receive a receipt for each business. The payment is not combined between multiple stores. Each payment is processed by the store')))), /*#__PURE__*/_react.default.createElement(_styles.WrapperPlaceOrderButton, null, /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
+  }), walletCarts.length > 0 && /*#__PURE__*/_react.default.createElement(_styles.WarningText, null, t('WARNING_PARTIAL_WALLET_CARTS', 'Important: One or more carts can`t be completed due a partial payment with cash/points wallet and requires to be paid individually')), openCarts.length > 0 && /*#__PURE__*/_react.default.createElement(_styles.MultiCartPriceContainer, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h4", null, t('TOTAL_FOR_ALL_CARTS', 'Total for all Carts')), /*#__PURE__*/_react.default.createElement("h4", null, parsePrice(totalCartsPrice))), /*#__PURE__*/_react.default.createElement("p", null, t('MULTI_CHECKOUT_DESCRIPTION', 'You will receive a receipt for each business. The payment is not combined between multiple stores. Each payment is processed by the store')))), /*#__PURE__*/_react.default.createElement(_styles.WrapperPlaceOrderButton, null, /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
     color: "primary",
     disabled: isDisablePlaceOrderButton || placing,
     onClick: handlePlaceOrder

package/_modules/themes/five/src/components/SingleOrderCard/index.js

@@ -37,8 +37,6 @@ var _styles = require("./styles");
 
 var _styles2 = require("../OrdersOption/styles");
 
-var _OrderingThemeContext = require("ordering-components/_modules/contexts/OrderingThemeContext");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -109,7 +107,7 @@ var SingleOrderCardUI = function SingleOrderCardUI(props) {
       _useConfig2 = _slicedToArray(_useConfig, 1),
       configs = _useConfig2[0].configs;
 
-  var _useOrderingTheme = (0, _OrderingThemeContext.useOrderingTheme)(),
+  var _useOrderingTheme = (0, _orderingComponentsExternal.useOrderingTheme)(),
       _useOrderingTheme2 = _slicedToArray(_useOrderingTheme, 1),
       orderingTheme = _useOrderingTheme2[0];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-external",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Ordering UI Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "libphonenumber-js": "^1.9.4",
     "lodash": "^4.17.19",
     "moment": "^2.29.4",
-    "ordering-components-external": "1.1.0",
+    "ordering-components-external": "1.1.3",
     "polished": "^3.6.6",
     "react-bootstrap-icons": "^1.7.2",
     "react-calendar": "^3.3.1",

package/src/themes/five/src/components/Cart/index.js

@@ -86,7 +86,7 @@ const CartUI = (props) => {
 
   const isCouponEnabled = validationFields?.fields?.checkout?.coupon?.enabled
   const checkoutMultiBusinessEnabled = configs?.checkout_multi_business_enabled?.value === '1'
-  const openCarts = (Object.values(orderState?.carts)?.filter(cart => cart?.products && cart?.products?.length && cart?.status !== 2 && cart?.valid_schedule && cart?.valid_products && cart?.valid_address && cart?.valid_maximum && cart?.valid_minimum) || null) || []
+  const openCarts = (Object.values(orderState?.carts)?.filter(cart => cart?.products && cart?.products?.length && cart?.status !== 2 && cart?.valid_schedule && cart?.valid_products && cart?.valid_address && cart?.valid_maximum && cart?.valid_minimum && !cart?.wallets) || null) || []
 
   const cart = orderState?.carts?.[`businessId:${props.cart.business_id}`]
   const viewString = isStore ? 'business_view' : 'header'

package/src/themes/five/src/components/MultiCheckout/index.js

@@ -7,6 +7,7 @@ import {
   useConfig,
   useSession,
   useValidationFields,
+  useOrder,
   MultiCheckout as MultiCheckoutController
 } from 'ordering-components-external'
 
@@ -54,7 +55,8 @@ const MultiCheckoutUI = (props) => {
     paymethodSelected,
     handleSelectPaymethod,
     handleSelectWallet,
-    handlePaymethodDataChange
+    handlePaymethodDataChange,
+    onRedirectPage
   } = props
 
   const [, t] = useLanguage()
@@ -63,6 +65,7 @@ const MultiCheckoutUI = (props) => {
   const [customerState] = useCustomer()
   const [validationFields] = useValidationFields()
   const [{ user }] = useSession()
+  const [orderState] = useOrder()
   const history = useHistory()
 
   const [userErrors, setUserErrors] = useState([])
@@ -70,7 +73,7 @@ const MultiCheckoutUI = (props) => {
   const [alertState, setAlertState] = useState({ open: false, content: [] })
   const maximumCarts = 5
   const isDisablePlaceOrderButton = !(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) || openCarts.length > maximumCarts
-
+  const walletCarts = (Object.values(orderState?.carts)?.filter(cart => cart?.products && cart?.products?.length && cart?.status !== 2 && cart?.valid_schedule && cart?.valid_products && cart?.valid_address && cart?.valid_maximum && cart?.valid_minimum && cart?.wallets) || null) || []
   const handlePlaceOrder = () => {
     if (!userErrors.length) {
       handleGroupPlaceOrder && handleGroupPlaceOrder()
@@ -137,6 +140,11 @@ const MultiCheckoutUI = (props) => {
     }
   }, [validationFields, user, customerState])
 
+  useEffect(() => {
+    if (openCarts.length) return
+    onRedirectPage && onRedirectPage({ page: 'search' })
+  }, [openCarts])
+
   return (
     <>
       {openCarts.length === 0 ? (
@@ -202,6 +210,11 @@ const MultiCheckoutUI = (props) => {
                   <DriverTipDivider />
                 </React.Fragment>
               ))}
+              {walletCarts.length > 0 && (
+                <WarningText>
+                  {t('WARNING_PARTIAL_WALLET_CARTS', 'Important: One or more carts can`t be completed due a partial payment with cash/points wallet and requires to be paid individually')}
+                </WarningText>
+              )}
               {openCarts.length > 0 && (
                 <MultiCartPriceContainer>
                   <div>

package/src/themes/five/src/components/SingleOrderCard/index.js

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { useLanguage, useUtils, useConfig, useOrder, SingleOrderCard as SingleOrderCardController } from 'ordering-components-external'
+import { useLanguage, useUtils, useConfig, useOrder, useOrderingTheme, SingleOrderCard as SingleOrderCardController } from 'ordering-components-external'
 import { Heart as DisLike, HeartFill as Like } from 'react-bootstrap-icons'
 import { ReviewOrder } from '../ReviewOrder'
 import { ReviewProduct } from '../ReviewProduct'
@@ -28,7 +28,6 @@ import {
 import {
   BusinessInformation
 } from '../OrdersOption/styles'
-import { useOrderingTheme } from 'ordering-components/_modules/contexts/OrderingThemeContext'
 
 const SingleOrderCardUI = (props) => {
   const {