ordering-ui-external 2.3.7 → 2.4.0

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

@@ -34,9 +34,9 @@ const PageBannerUI = (props) => {
   const onProductRedirect = ({ slug, category, product }) => {
     if (!category && !product) {
       if (businessUrlTemplate === '/store/:business_slug' || businessUrlTemplate === '/:business_slug') {
-        return events.emit('go_to_page', { page: 'business', params: { business_slug: slug }, replace: true })
+        return events.emit('go_to_page', { page: 'business', params: { business_slug: slug }, replace: false })
       } else {
-        return events.emit('go_to_page', { page: 'business', search: `?${businessUrlTemplate.split('?')[1].replace(':business_slug', '')}${slug}`, replace: true })
+        return events.emit('go_to_page', { page: 'business', search: `?${businessUrlTemplate.split('?')[1].replace(':business_slug', '')}${slug}`, replace: false })
       }
     }
     events.emit('product_banner_clicked')
@@ -48,7 +48,7 @@ const PageBannerUI = (props) => {
           category_slug: category,
           product_slug: product
         },
-        replace: true
+        replace: false
       })
     }
     if (productUrlTemplate.includes('/store/:category_slug/:product_slug')) {
@@ -60,7 +60,7 @@ const PageBannerUI = (props) => {
           product_slug: product
         },
         search: `?${businessParameter}=${slug}`,
-        replace: true
+        replace: false
       })
     }
     if (productUrlTemplate.includes('/store/:business_slug') && productUrlTemplate.includes('category_id')) {
@@ -73,7 +73,7 @@ const PageBannerUI = (props) => {
           business_slug: slug
         },
         search: `?${categoryParameter}=${category}&${productParameter}=${product}`,
-        replace: true
+        replace: false
       })
     }
     if (productUrlTemplate.includes('/:business_slug') && !productUrlTemplate.includes('store')) {
@@ -86,7 +86,7 @@ const PageBannerUI = (props) => {
           business_slug: slug
         },
         search: `?${categoryParameter}=${category}&${productParameter}=${product}`,
-        replace: true
+        replace: false
       })
     }
   }

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

@@ -1,7 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import Skeleton from 'react-loading-skeleton'
 import IosRadioButtonOn from '@meronex/icons/ios/IosRadioButtonOn'
-import BilStripe from '@meronex/icons/bi/BilStripe'
 import FaCcStripe from '@meronex/icons/fa/FaCcStripe'
 import FaStripeS from '@meronex/icons/fa/FaStripeS'
 import GrStripe from '@meronex/icons/gr/GrStripe'
@@ -197,7 +196,7 @@ const PaymentOptionsUI = (props) => {
                   (!isCustomerMode || (isCustomerMode && (paymethod.gateway === 'card_delivery' || paymethod.gateway === 'cash'))) && (
                     <PayCard
                       isDisabled={isDisabled}
-                      className={`card ${paymethodSelected?.id === paymethod.id ? 'active' : ''}`}
+                      className={`card ${(paymethodSelected?.id || isOpenMethod?.paymethod?.id) === paymethod.id ? 'active' : ''}`}
                       onClick={() => handlePaymentMethodClick(paymethod)}
                     >
                       <div>
@@ -328,7 +327,7 @@ const PaymentOptionsUI = (props) => {
         >
           {!isOpenMethod?.paymethod?.credentials?.publishable &&
             <Container>
-              <p>{t('ADD_PUBLISHABLE_KEY', 'Please add a stripe key')}</p>
+              <p>{t('ADD_PUBLISHABLE_KEY', 'Please add a publishable key')}</p>
             </Container>}
           {isOpenMethod?.paymethod?.credentials?.publishable && stripeDirectMethods?.includes(isOpenMethod?.paymethod?.gateway) && (
             <StripeElementsForm

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

@@ -3,10 +3,18 @@ import { QueryLoginSpoonity as QueryLoginSpoonityController, useLanguage } from
 import { SpinnerLoader } from '../../../../../components/SpinnerLoader'
 
 const QueryLoginSpoonityUI = (props) => {
+  const {
+    userState
+  } = props
+
   const [, t] = useLanguage()
 
   return (
-    <SpinnerLoader content={t('LOADING_DELICIOUS_FOOD', 'Loading Ordering Dashboard...')} />
+    <>
+      {userState?.loading ? (
+        <SpinnerLoader content={t('LOADING_DELICIOUS_FOOD', 'Loading Ordering Dashboard...')} />
+      ) : null}
+    </>
   )
 }
 

package/template/app.js

@@ -605,19 +605,21 @@ export const App = () => {
                     {
                       isKioskApp
                         ? <Redirect to={singleBusinessConfig.isActive ? `/${singleBusinessConfig.businessSlug}` : '/'} />
-                        : (
-                          orderStatus.loading && !orderStatus.options?.address?.location ? (
-                            <SpinnerLoader />
-                          ) : (
-                            isUserVerifyRequired ? (
-                              <Redirect to='/verify' />
+                        : queryIntegrationToken && queryIntegrationCode === 'spoonity'
+                          ? <QueryLoginSpoonity token={queryIntegrationToken} />
+                          : (
+                            orderStatus.loading && !orderStatus.options?.address?.location ? (
+                              <SpinnerLoader />
                             ) : (
-                              (orderStatus.options?.address?.location || isAllowUnaddressOrderType)
-                                ? <BusinessesList searchValueCustom={searchValue} />
-                                : <Redirect to={singleBusinessConfig.isActive ? `/${singleBusinessConfig.businessSlug}` : '/'} />
+                              isUserVerifyRequired ? (
+                                <Redirect to='/verify' />
+                              ) : (
+                                (orderStatus.options?.address?.location || isAllowUnaddressOrderType)
+                                  ? <BusinessesList searchValueCustom={searchValue} />
+                                  : <Redirect to={singleBusinessConfig.isActive ? `/${singleBusinessConfig.businessSlug}` : '/'} />
+                              )
                             )
                           )
-                        )
                     }
                   </Route>
                   <Route exact path='/business_search'>