ordering-ui-external 2.6.7 → 2.7.0

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

@@ -95,8 +95,8 @@ const BusinessControllerUI = (props) => {
 
   const handleBusinessClick = (e) => {
     if (favoriteRef?.current?.contains(e.target)) return
-
-    if (onPreorderBusiness && !isBusinessOpen) onPreorderBusiness(business)
+    const hasMenu = business?.menus?.filter(menu => menu?.enabled && menu?.products?.length > 0).length
+    if (onPreorderBusiness && (!isBusinessOpen || !hasMenu)) onPreorderBusiness(business)
     else handleClick(business)
   }
 

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

@@ -94,7 +94,7 @@ const BusinessProductsCategoriesUI = (props) => {
           categoryListsElement.scrollTo({
             top: 0,
             left: moveAmount,
-            behavior: 'smooth'
+            behavior: 'auto'
           })
         }
         setSelectedCateogry(category)

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

@@ -83,7 +83,8 @@ const BusinessProductsListingUI = (props) => {
     onBusinessClick,
     handleChangePriceFilterValues,
     priceFilterValues,
-    handleUpdateProfessionals
+    handleUpdateProfessionals,
+    isCustomLayout
   } = props
 
   const { business, loading, error } = businessState
@@ -224,7 +225,7 @@ const BusinessProductsListingUI = (props) => {
   }
   const adjustBusiness = async (adjustBusinessId) => {
     const _carts = carts?.[adjustBusinessId]
-    const products = carts?.[adjustBusinessId]?.products
+    const products = carts?.[adjustBusinessId]?.products || []
     const unavailableProducts = products.filter(product => product.valid !== true)
     const alreadyRemoved = sessionStorage.getItem('already-removed')
     sessionStorage.removeItem('already-removed')
@@ -327,7 +328,7 @@ const BusinessProductsListingUI = (props) => {
       <ProductsContainer>
         {!props.useKioskApp && (
           <HeaderContent>
-            {!location.pathname.includes('/marketplace') && (
+            {!isCustomLayout && !location.pathname.includes('/marketplace') && (
               <div id='back-arrow'>
                 <ArrowLeft className='back-arrow' onClick={() => handleGoToBusinessList()} />
               </div>
@@ -352,8 +353,8 @@ const BusinessProductsListingUI = (props) => {
           businessState={businessState}
           sortByOptions={sortByOptions}
           categoryState={categoryState}
+          isCustomLayout={isCustomLayout}
           categoriesState={props.categoriesState}
-          isCustomLayout={props.isCustomLayout}
           useKioskApp={props.useKioskApp}
           categorySelected={categorySelected}
           openCategories={openCategories}

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

@@ -1,7 +1,6 @@
 import React from 'react'
 import { CardCvcElement, CardElement, CardExpiryElement, CardNumberElement } from '@stripe/react-stripe-js'
-import { CardForm as CardFormController, useLanguage } from 'ordering-components-external'
-
+import { CardForm as CardFormController, useLanguage, useValidationFields } from 'ordering-components-external'
 import {
   FormStripe,
   FormRow,
@@ -10,7 +9,9 @@ import {
   CardNumberField,
   CardExpiryCvcField,
   CardExpiryField,
-  CardCvcField
+  CardCvcField,
+  CardZipcodeField,
+  ZipcodeField
 } from './styles'
 
 import { Button } from '../../styles/Buttons'
@@ -43,10 +44,14 @@ const CardFormUI = (props) => {
     handleChange,
     isSplitForm,
     handleChangeExpiry,
-    handleChangeCvc
+    handleChangeCvc,
+    errorZipcode
   } = props
 
   const [, t] = useLanguage()
+  const [validationFields] = useValidationFields()
+  const zipCodeEnabled = validationFields?.fields?.card?.zipcode?.enabled
+  const zipCodeRequired = validationFields?.fields?.card?.zipcode?.required
 
   return (
     <>
@@ -93,6 +98,22 @@ const CardFormUI = (props) => {
                   <ErrorMessage>{errorCvc}</ErrorMessage>
                 </CardCvcField>
               </CardExpiryCvcField>
+              {zipCodeEnabled && (
+                <CardZipcodeField>
+                  <label>{t('ZIPCODE', 'Zipcode')}</label>
+                  <ZipcodeField
+                    name='zipcode'
+                    placeholder={`${t('ZIPCODE', 'Zipcode')}${zipCodeRequired ? '*' : ''}`}
+                    options={CARD_ELEMENT_OPTIONS}
+                    onChange={handleChange}
+                    pattern='[0-9]'
+                    type='number'
+                  />
+                  {errorZipcode && (
+                    <ErrorMessage>{t('ZIPCODE_IS_INCOMPLETED', 'The zipcode is incompleted.')}</ErrorMessage>
+                  )}
+                </CardZipcodeField>
+              )}
             </>
           }
         </FormRow>

package/src/themes/five/src/components/CardForm/styles.js

@@ -40,6 +40,10 @@ export const CardCvcField = styled.div`
   color: #ADB2B9;
 `
 
+export const CardZipcodeField = styled.div`
+  color: #ADB2B9;
+`
+
 export const CardNumberField = styled.div`
   width: 100%;
   color: #ADB2B9;
@@ -98,3 +102,34 @@ export const FormActions = styled.div`
     }
   }
 `
+
+export const ZipcodeField = styled.input`
+  font-weight: 500;
+  font-size: 16px;
+  box-sizing: border-box;
+  width: 100% !important;
+  &:-webkit-autofill {
+    color: '#fce883'
+  }
+  &::placeholder {
+    font-weight: 500
+  }
+  &:focus(){
+    box-shadow: rgba(50, 50, 93, 0.109804) 0px 4px 6px,
+      rgba(0, 0, 0, 0.0784314) 0px 1px 3px;
+    -webkit-transition: all 150ms ease;
+    transition: all 150ms ease;
+  }
+
+  &::-webkit-outer-spin-button,
+  &::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+
+  /* Firefox */
+  &[type=number] {
+    -moz-appearance: textfield;
+  }
+  
+`

package/src/themes/five/src/components/CardFormCustom/cardUtils.js

@@ -0,0 +1,111 @@
+import Payment from 'payment'
+
+const clearNumber = (value = '') => {
+  return value.replace(/\D+/g, '')
+}
+
+export const formatCreditCardNumber = (value) => {
+  if (!value) {
+    return value
+  }
+
+  const issuer = Payment.fns.cardType(value)
+  const clearValue = clearNumber(value)
+  let nextValue
+
+  switch (issuer) {
+    case 'amex':
+      nextValue = `${clearValue.slice(0, 4)} ${clearValue.slice(
+        4,
+        10
+      )} ${clearValue.slice(10, 15)}`
+      break
+    case 'dinersclub':
+      nextValue = `${clearValue.slice(0, 4)} ${clearValue.slice(
+        4,
+        10
+      )} ${clearValue.slice(10, 14)}`
+      break
+    default:
+      nextValue = `${clearValue.slice(0, 4)} ${clearValue.slice(
+        4,
+        8
+      )} ${clearValue.slice(8, 12)} ${clearValue.slice(12, 19)}`
+      break
+  }
+
+  return nextValue.trim()
+}
+
+export const formatCVC = (value, prevValue, allValues = {}) => {
+  const clearValue = clearNumber(value)
+  let maxLength = 4
+
+  if (allValues.number) {
+    const issuer = Payment.fns.cardType(allValues.number)
+    maxLength = issuer === 'amex' ? 4 : 3
+  }
+
+  return clearValue.slice(0, maxLength)
+}
+
+export const formatExpirationDate = (value) => {
+  const clearValue = clearNumber(value)
+
+  if (clearValue.length >= 3) {
+    return `${clearValue.slice(0, 2)}/${clearValue.slice(2, 4)}`
+  }
+
+  return clearValue
+}
+
+export const getCardType = (number) => {
+  // visa
+  var re = new RegExp('^4')
+  if (number.match(re) != null) {
+    return 'Visa'
+  }
+
+  // Mastercard
+  // Updated for Mastercard 2017 BINs expansion
+  if (/^(5[1-5][0-9]{14}|2(22[1-9][0-9]{12}|2[3-9][0-9]{13}|[3-6][0-9]{14}|7[0-1][0-9]{13}|720[0-9]{12}))$/.test(number)) {
+    return 'Mastercard'
+  }
+  // AMEX
+  re = new RegExp('^3[47]')
+  if (number.match(re) != null) {
+    return 'AMEX'
+  }
+
+  // Discover
+  re = new RegExp('^(6011|622(12[6-9]|1[3-9][0-9]|[2-8][0-9]{2}|9[0-1][0-9]|92[0-5]|64[4-9])|65)')
+  if (number.match(re) != null) {
+    return 'Discover'
+  }
+
+  // Diners
+  re = new RegExp('^36')
+  if (number.match(re) != null) {
+    return 'Diners'
+  }
+
+  // Diners - Carte Blanche
+  re = new RegExp('^30[0-5]')
+  if (number.match(re) != null) {
+    return 'Diners - Carte Blanche'
+  }
+
+  // JCB
+  re = new RegExp('^35(2[89]|[3-8][0-9])')
+  if (number.match(re) != null) {
+    return 'JCB'
+  }
+
+  // Visa Electron
+  re = new RegExp('^(4026|417500|4508|4844|491(3|7))')
+  if (number.match(re) != null) {
+    return 'Visa Electron'
+  }
+
+  return ''
+}

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

@@ -0,0 +1,161 @@
+import React, { useState } from 'react'
+import Card from 'react-credit-cards-2'
+import 'react-credit-cards-2/es/styles-compiled.css'
+import {
+  formatCreditCardNumber,
+  formatCVC,
+  formatExpirationDate,
+  getCardType
+} from './cardUtils'
+import { useForm } from 'react-hook-form'
+import { Input } from '../../styles/Inputs'
+import { useLanguage } from 'ordering-components-external'
+import Button from '../../styles/Buttons'
+import { FormContainer, InputContainer } from './styles'
+
+export const CardFormCustom = (props) => {
+  const {
+    handleNewCard,
+    setAddCardOpen
+  } = props
+
+  const [, t] = useLanguage()
+  const [formState, setFormState] = useState({
+    cvc: '',
+    expiry: '',
+    focus: '',
+    name: '',
+    number: ''
+  })
+
+  const formMethods = useForm()
+
+  const handleInputFocus = (e) => {
+    setFormState({
+      ...formState,
+      focus: e.target.name
+    })
+  }
+
+  const handleInputChange = ({ target }) => {
+    if (target.name === 'number') {
+      target.value = formatCreditCardNumber(target.value)
+    } else if (target.name === 'expiry') {
+      target.value = formatExpirationDate(target.value)
+    } else if (target.name === 'cvc') {
+      target.value = formatCVC(target.value)
+    }
+    setFormState({
+      ...formState,
+      [target.name]: target.value
+    })
+  }
+
+  const onSubmit = (values) => {
+    const cardBrand = getCardType(values?.number)
+    const lastFourDigits = values?.number.substr(-4)
+    const card = {
+      type: 'card',
+      brand: cardBrand,
+      last4: lastFourDigits,
+      ccnumber: values?.number?.replace(/\s/g, ''),
+      ccexp: values?.expiry?.replace('/', ''),
+      cvv: values?.cvc
+    }
+    handleNewCard(card)
+    setAddCardOpen(false)
+  }
+
+  return (
+    <FormContainer id='PaymentForm'>
+      <Card
+        cvc={formState.cvc}
+        expiry={formState.expiry}
+        focused={formState.focus}
+        name={formState.name}
+        number={formState.number}
+        placeholders={{
+          name: t('YOUR_NAME_HERE', 'Your name here')
+        }}
+      />
+      <form
+        onSubmit={formMethods.handleSubmit(onSubmit)}
+      >
+        <InputContainer>
+          <Input
+            type='tel'
+            name='number'
+            placeholder={t('CARD_NUMBER', 'Card number')}
+            inputMode='numeric'
+            onChange={handleInputChange}
+            onFocus={handleInputFocus}
+            pattern='[\d| ]{16,22}'
+            format={formatCreditCardNumber}
+            maxLength={19}
+            ref={
+              formMethods.register({
+                required: t('CARD_NUMBER_REQUIRED', 'Card number is required'),
+                pattern: /^[\d| ]{16,22}$/i
+              })
+            }
+            isError={formMethods.errors.number}
+          />
+        </InputContainer>
+        <InputContainer>
+          <Input
+            type='text'
+            name='name'
+            placeholder={t('NAME', 'Name')}
+            onChange={handleInputChange}
+            onFocus={handleInputFocus}
+            ref={
+              formMethods.register({
+                required: t('NAME_REQUIRED', 'Name is required'),
+              })
+            }
+            isError={formMethods.errors.name}
+          />
+        </InputContainer>
+        <InputContainer>
+          <Input
+            type='text'
+            name='expiry'
+            pattern='\d\d/\d\d'
+            placeholder={t('EXPIRY', 'Expiry')}
+            onChange={handleInputChange}
+            onFocus={handleInputFocus}
+            format={formatExpirationDate}
+            ref={
+              formMethods.register({
+                required: t('EXPIRY_DATE_REQUIRED', 'Expiry date required')
+              })
+            }
+            isError={formMethods.errors.expiry}
+          />
+          <Input
+            type='text'
+            name='cvc'
+            placeholder={t('CVC', 'CVC')}
+            pattern='\d{3,4}'
+            onChange={handleInputChange}
+            onFocus={handleInputFocus}
+            format={formatCVC}
+            ref={
+              formMethods.register({
+                required: t('CVC_REQUIRED', 'CVC is required')
+              })
+            }
+            isError={formMethods.errors.cvc}
+          />
+        </InputContainer>
+        <Button
+          type='submit'
+          color='primary'
+          disabled={Object.keys(formMethods.errors)?.length > 0}
+        >
+          {t('SAVE', 'Save')}
+        </Button>
+      </form>
+    </FormContainer>
+  )
+}

package/src/themes/five/src/components/CardFormCustom/styles.js

@@ -0,0 +1,20 @@
+import styled, { css } from 'styled-components'
+
+export const InputContainer = styled.div`
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+
+  input{
+    box-sizing: border-box;
+    width: 100%;
+    margin: 10px;
+  }
+`
+
+export const FormContainer = styled.div`
+  button{
+    width: 100%;
+    margin: 10px;
+  }
+`

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

@@ -421,7 +421,7 @@ const CartUI = (props) => {
                         </tr>
                       ))
                     }
-                    {orderState?.options?.type === 1 && cart?.delivery_price_with_discount > 0 && !hideDeliveryFee && (
+                    {orderState?.options?.type === 1 && !hideDeliveryFee && (
                       <tr>
                         <td>{t('DELIVERY_FEE', 'Delivery Fee')}</td>
                         <td>{parsePrice(cart?.delivery_price_with_discount)}</td>

package/src/themes/five/src/components/CartPopover/styles.js

@@ -31,7 +31,7 @@ export const PopoverBody = styled.div`
   padding: 15px;
   border-radius: 10px;
   max-width: 500px;
-  z-index: 2000;
+  z-index: 10002;
   box-shadow: rgba(0, 0, 0, 0.2) 0px 8px 24px;
 `
 

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

@@ -21,7 +21,6 @@ import { UpsellingPage } from '../UpsellingPage'
 import parsePhoneNumber from 'libphonenumber-js'
 import { useHistory } from 'react-router-dom'
 import { ArrowLeft } from 'react-bootstrap-icons'
-
 import {
   Container,
   WrapperLeftContainer,
@@ -129,7 +128,7 @@ const CheckoutUI = (props) => {
   const [openModal, setOpenModal] = useState({ login: false, signup: false })
   const [allowedGuest, setAllowedGuest] = useState(false)
   const [cardList, setCardList] = useState([])
-
+  const cardsMethods = ['stripe', 'credomatic']
   const businessConfigs = businessDetails?.business?.configs ?? []
   const isTableNumberEnabled = configs?.table_numer_enabled?.value
   const isWalletCashEnabled = businessConfigs.find(config => config.key === 'wallet_cash_enabled')?.value === '1'
@@ -147,7 +146,7 @@ const CheckoutUI = (props) => {
 
   const isDisablePlaceOrderButton = !cart?.valid ||
     (!paymethodSelected && cart?.balance > 0) ||
-    (paymethodSelected?.gateway === 'stripe' && cardList?.cards?.length === 0) ||
+    (cardsMethods.includes(paymethodSelected?.gateway) && cardList?.cards?.length === 0) ||
     placing ||
     errorCash ||
     loading ||
@@ -246,7 +245,7 @@ const CheckoutUI = (props) => {
     if (userSelected && userSelected?.cellphone) {
       if (userSelected?.country_phone_code) {
         let phone = null
-        phone = `+${userSelected?.country_phone_code}${userSelected?.cellphone}`
+        phone = `+${userSelected?.country_phone_code}${userSelected?.cellphone.replace(`+${userSelected?.country_phone_code}`, '')}`
         const phoneNumber = parsePhoneNumber(phone)
         if (!phoneNumber?.isValid()) {
           errors.push(t('VALIDATION_ERROR_MOBILE_PHONE_INVALID', 'The field Phone number is invalid.'))
@@ -526,24 +525,24 @@ const CheckoutUI = (props) => {
 
         {
           !!(!isMultiDriverTips && driverTipsField) &&
-            <>
-              <DriverTipContainer>
-                <h1>{t('DRIVER_TIPS', 'Driver Tips')}</h1>
-                <p>{t('100%_OF_THE_TIP_YOUR_DRIVER', '100% of the tip goes to your driver')}</p>
-                <DriverTips
-                  businessId={cart?.business_id}
-                  driverTipsOptions={driverTipsOptions}
-                  isFixedPrice={parseInt(configs?.driver_tip_type?.value, 10) === 1}
-                  isDriverTipUseCustom={!!parseInt(configs?.driver_tip_use_custom?.value, 10)}
-                  driverTip={parseInt(configs?.driver_tip_type?.value, 10) === 1
-                    ? cart?.driver_tip
-                    : cart?.driver_tip_rate}
-                  cart={cart}
-                  useOrderContext
-                />
-              </DriverTipContainer>
-              <DriverTipDivider />
-            </>
+          <>
+            <DriverTipContainer>
+              <h1>{t('DRIVER_TIPS', 'Driver Tips')}</h1>
+              <p>{t('100%_OF_THE_TIP_YOUR_DRIVER', '100% of the tip goes to your driver')}</p>
+              <DriverTips
+                businessId={cart?.business_id}
+                driverTipsOptions={driverTipsOptions}
+                isFixedPrice={parseInt(configs?.driver_tip_type?.value, 10) === 1}
+                isDriverTipUseCustom={!!parseInt(configs?.driver_tip_use_custom?.value, 10)}
+                driverTip={parseInt(configs?.driver_tip_type?.value, 10) === 1
+                  ? cart?.driver_tip
+                  : cart?.driver_tip_rate}
+                cart={cart}
+                useOrderContext
+              />
+            </DriverTipContainer>
+            <DriverTipDivider />
+          </>
         }
         {!cartState.loading && placeSpotsEnabled && cart?.business_id && (
           <SelectSpotContainer>
@@ -576,7 +575,7 @@ const CheckoutUI = (props) => {
               businessConfigs={businessConfigs}
               loyaltyRewardRate={
                 creditPointPlanOnBusiness?.accumulation_rate ??
-                  (!!creditPointPlanOnBusiness && creditPointPlan?.accumulation_rate) ?? 0
+                (!!creditPointPlanOnBusiness && creditPointPlan?.accumulation_rate) ?? 0
               }
             />
           </CartContainer>
@@ -756,7 +755,8 @@ export const Checkout = (props) => {
     handleOrderRedirect,
     handleCheckoutRedirect,
     handleSearchRedirect,
-    handleCheckoutListRedirect
+    handleCheckoutListRedirect,
+    businessSlug
   } = props
 
   const [orderState, { confirmCart }] = useOrder()
@@ -773,7 +773,9 @@ export const Checkout = (props) => {
   const [isResetPaymethod, setIsResetPaymethod] = useState(false)
 
   const cartsWithProducts = orderState?.carts && (Object.values(orderState?.carts)?.filter(cart => cart?.products && cart?.products?.length) || null)
-
+  const carts = businessSlug
+    ? cartsWithProducts.filter((cart) => cart?.business?.slug === businessSlug || businessSlug === cart?.business_id)
+    : cartsWithProducts
   const closeAlert = () => {
     setAlertState({
       open: false,
@@ -813,7 +815,7 @@ export const Checkout = (props) => {
   const getOrder = async (cartId) => {
     try {
       let result = {}
-      const cart = cartsWithProducts.find(cart => cart.uuid === cartId)
+      const cart = carts.find(cart => cart.uuid === cartId)
       const userCustomer = JSON.parse(window.localStorage.getItem('user-customer'))
       if (cart && !userCustomer) {
         result = { ...cart }
@@ -838,8 +840,18 @@ export const Checkout = (props) => {
         handleOrderRedirect(result.order.uuid)
         setCartState({ ...cartState, loading: false })
       } else if (result.status === 2) {
+        let credomaticData = null
+        if (result?.paymethod_data?.gateway === 'credomatic') {
+          const urlParams = new URLSearchParams(window.location.search)
+          const paramsObj = Object.fromEntries(urlParams.entries())
+          credomaticData = {
+            credomatic: {
+              ...paramsObj
+            }
+          }
+        }
         try {
-          const confirmCartRes = await confirmCart(cartUuid)
+          const confirmCartRes = await confirmCart(cartUuid, credomaticData)
           if (confirmCartRes.error) {
             setAlertState({
               open: true,
@@ -911,17 +923,17 @@ export const Checkout = (props) => {
 
   return (
     <>
-      {!cartUuid && orderState.carts && cartsWithProducts && cartsWithProducts?.length === 0 && (
+      {!cartUuid && orderState.carts && carts && carts?.length === 0 && (
         <NotFoundSource
           content={t('NOT_FOUND_CARTS', 'Sorry, You don\'t seem to have any carts.')}
           btnTitle={t('SEARCH_REDIRECT', 'Go to Businesses')}
           onClickButton={handleSearchRedirect}
         />
       )}
-      {!cartUuid && orderState.carts && cartsWithProducts && cartsWithProducts?.length > 0 && (
+      {!cartUuid && orderState.carts && carts && carts?.length > 0 && (
         <CartsList>
           <CartContent
-            carts={cartsWithProducts}
+            carts={carts}
             isOrderStateCarts={!!orderState.carts}
             isForceOpenCart
           />

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

@@ -59,7 +59,9 @@ export const Header = (props) => {
     isHideSignup,
     isCustomerMode,
     searchValue,
-    setSearchValue
+    setSearchValue,
+    businessSlug,
+    notificationState
   } = props
 
   const { pathname } = useLocation()
@@ -90,6 +92,9 @@ export const Header = (props) => {
   const isMulticheckoutPage = window.location.pathname?.includes('/multi-checkout')
 
   const cartsWithProducts = (orderState?.carts && Object.values(orderState?.carts).filter(cart => cart.products && cart.products?.length > 0)) || null
+  const carts = businessSlug
+    ? cartsWithProducts.filter((cart) => cart?.business?.slug === businessSlug || businessSlug === cart?.business_id)
+    : cartsWithProducts
 
   const windowSize = useWindowSize()
   const onlineStatus = useOnlineStatus()
@@ -367,7 +372,7 @@ export const Header = (props) => {
                           {!isMulticheckoutPage ? (
                             <CartPopover
                               open={openPopover.cart}
-                              carts={cartsWithProducts}
+                              carts={carts}
                               onClick={() => handleTogglePopover('cart')}
                               onClose={() => handleClosePopover('cart')}
                               auth={auth}
@@ -380,7 +385,7 @@ export const Header = (props) => {
                       ) : (
                         <HeaderOption
                           variant='cart'
-                          totalCarts={cartsWithProducts?.length}
+                          totalCarts={carts?.length}
                           onClick={(variant) => openModal(variant)}
                         />
                       )
@@ -469,7 +474,7 @@ export const Header = (props) => {
         >
           {modalSelected === 'cart' && (
             <CartContent
-              carts={cartsWithProducts}
+              carts={carts}
               isOrderStateCarts={!!orderState.carts}
               onClose={() => setModalIsOpen(false)}
             />