ordering-ui-admin-external 1.28.1 → 1.29.3

package/src/components/Orders/CreateCustomOrder/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/components/Orders/CreateCustomOrder/CardFormCustom/index.js

@@ -0,0 +1,161 @@
+import React, { useState } from 'react'
+import { useLanguage } from 'ordering-components-admin-external'
+import Card from 'react-credit-cards-2'
+import 'react-credit-cards-2/dist/es/styles-compiled.css'
+import {
+  formatCreditCardNumber,
+  formatCVC,
+  formatExpirationDate,
+  getCardType
+} from './cardUtils'
+import { useForm } from 'react-hook-form'
+import { Button, Input } from '../../../../styles'
+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
+          borderRadius='8px'
+          type='submit'
+          color='primary'
+          disabled={Object.keys(formMethods.errors)?.length > 0}
+        >
+          {t('SAVE', 'Save')}
+        </Button>
+      </form>
+    </FormContainer>
+  )
+}

package/src/components/Orders/CreateCustomOrder/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/components/Orders/CreateCustomOrder/CartBill/index.js

@@ -0,0 +1,267 @@
+import React, { useState } from 'react'
+import { useLanguage, useUtils, useOrder, useConfig, useValidationFields, useCustomer } from 'ordering-components-admin-external'
+import BsInfoCircle from '@meronex/icons/bs/BsInfoCircle'
+import MdCloseCircle from '@meronex/icons/ios/MdCloseCircle'
+import { useTheme } from 'styled-components'
+import { verifyDecimals } from '../../../../utils'
+import { CouponControl } from '../CouponControl'
+import { Confirm, Modal } from '../../../Shared'
+import { TaxInformation } from '../TaxInformation'
+
+import {
+  CartBillContainer,
+  CouponContainer,
+  IconContainer
+} from './styles'
+
+export const CartBill = (props) => {
+  const {
+    cart
+  } = props
+
+  const theme = useTheme()
+  const [, t] = useLanguage()
+  const [{ parsePrice, parseNumber }] = useUtils()
+  const [orderState, { removeOffer }] = useOrder()
+  const [{ configs }] = useConfig()
+  const [validationFields] = useValidationFields()
+  const [{ user }] = useCustomer()
+
+  const [openTaxModal, setOpenTaxModal] = useState({ open: false, tax: null })
+  const [confirm, setConfirm] = useState({ open: false, content: null, handleOnAccept: null })
+
+  const isCouponEnabled = validationFields?.fields?.checkout?.coupon?.enabled
+
+  const getIncludedTaxes = () => {
+    if (cart?.taxes === null) {
+      return cart?.business.tax_type === 1 ? cart?.tax : 0
+    } else {
+      return cart?.taxes.reduce((taxIncluded, tax) => {
+        return taxIncluded + (tax.type === 1 ? tax.summary?.tax : 0)
+      }, 0)
+    }
+  }
+
+  const getIncludedTaxesDiscounts = () => {
+    return cart?.taxes?.filter(tax => tax?.type === 1)?.reduce((carry, tax) => carry + (tax?.summary?.tax_after_discount ?? tax?.summary?.tax), 0)
+  }
+
+  const handleRemoveOfferClick = (id, userId) => {
+    const dataOffer = {
+      business_id: cart?.business_id,
+      offer_id: id
+    }
+    if (userId) dataOffer.user_id = userId
+    removeOffer(dataOffer)
+  }
+
+  const onRemoveOffer = (id) => {
+    setConfirm({
+      open: true,
+      content: t('QUESTION_DELETE_OFFER', 'Are you sure that you want to delete the offer?'),
+      title: t('OFFER', 'Offer'),
+      handleOnAccept: () => {
+        setConfirm({ ...confirm, open: false })
+        handleRemoveOfferClick(id, user?.id)
+      }
+    })
+  }
+
+  return (
+    <CartBillContainer>
+      <h3>{t('SUMMARY', '')}</h3>
+      <table>
+        <tbody>
+          <tr>
+            <td>{t('SUBTOTAL', 'Subtotal')}</td>
+            <td>{parsePrice(cart?.subtotal + getIncludedTaxes())}</td>
+          </tr>
+          {cart?.discount > 0 && cart?.total >= 0 && cart?.offers?.length === 0 && (
+            <tr>
+              {cart?.discount_type === 1 ? (
+                <td>
+                  {t('DISCOUNT', 'Discount')}{' '}
+                  <span>{`(${verifyDecimals(cart?.discount_rate, parsePrice)}%)`}</span>
+                </td>
+              ) : (
+                <td>{t('DISCOUNT', 'Discount')}</td>
+              )}
+              <td>- {parsePrice(cart?.discount || 0)}</td>
+            </tr>
+          )}
+          {
+            cart?.offers?.length > 0 && cart?.offers?.filter(offer => offer?.target === 1)?.map(offer => (
+              <tr key={offer.id}>
+                <td className='icon'>
+                  {offer.name}
+                  {offer.rate_type === 1 && (
+                    <span>{`(${verifyDecimals(offer?.rate, parsePrice)}%)`}</span>
+                  )}
+                  <IconContainer>
+                    <BsInfoCircle size='20' color={theme.colors.primary} onClick={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_1' })} />
+                    {!!offer?.id && (
+                      <MdCloseCircle size='24' color={theme.colors.primary} onClick={() => onRemoveOffer(offer?.id)} />
+                    )}
+                  </IconContainer>
+                </td>
+                <td>
+                  - {parsePrice(offer?.summary?.discount)}
+                </td>
+              </tr>
+            ))
+          }
+          {
+            cart?.offers?.filter(offer => offer?.target === 1)?.length > 0 &&
+            cart?.subtotal_with_discount > 0 &&
+            cart?.discount > 0 &&
+            cart?.total >= 0 &&
+            (
+              <tr>
+                <td>{t('SUBTOTAL_WITH_DISCOUNT', 'Subtotal with discount')}</td>
+                {cart?.business?.tax_type === 1 ? (
+                  <td>{parsePrice(cart?.subtotal_with_discount + getIncludedTaxesDiscounts() ?? 0)}</td>
+                ) : (
+                  <td>{parsePrice(cart?.subtotal_with_discount ?? 0)}</td>
+                )}
+              </tr>
+            )
+          }
+          {
+            cart?.taxes?.length > 0 && cart?.taxes?.filter(tax => tax?.type === 2 && tax?.rate !== 0).map(tax => (
+              <tr key={tax?.id}>
+                <td className='icon'>
+                  {tax.name || t('INHERIT_FROM_BUSINESS', 'Inherit from business')}
+                  <span>{`(${verifyDecimals(tax?.rate, parseNumber)}%)`}</span>
+                  <IconContainer onClick={() => setOpenTaxModal({ open: true, data: tax, type: 'tax' })}>
+                    <BsInfoCircle size='20' color={theme.colors.primary} />
+                  </IconContainer>
+                </td>
+                <td>{parsePrice(tax?.summary?.tax_after_discount ?? tax?.summary?.tax ?? 0)}</td>
+              </tr>
+            ))
+          }
+          {
+            cart?.fees?.length > 0 && cart?.fees?.filter(fee => !(fee.fixed === 0 && fee.percentage === 0)).map((fee, i) => (
+              <tr key={fee.id ?? i}>
+                <td className='icon'>
+                  {fee.name || t('INHERIT_FROM_BUSINESS', 'Inherit from business')}
+                  ({fee?.fixed > 0 && `${parsePrice(fee?.fixed)}${fee.percentage > 0 ? ' + ' : ''}`}{fee.percentage > 0 && `${fee.percentage}%`})
+                  <IconContainer onClick={() => setOpenTaxModal({ open: true, data: fee, type: 'fee' })}>
+                    <BsInfoCircle size='20' color={theme.colors.primary} />
+                  </IconContainer>
+                </td>
+                <td>{parsePrice(fee?.summary?.fixed + (fee?.summary?.percentage_after_discount ?? fee?.summary?.percentage) ?? 0)}</td>
+              </tr>
+            ))
+          }
+          {
+            cart?.offers?.length > 0 && cart?.offers?.filter(offer => offer?.target === 3)?.map(offer => (
+              <tr key={offer.id}>
+                <td className='icon'>
+                  {offer.name}
+                  {offer?.rate_type === 1 && (
+                    <span>{`(${verifyDecimals(offer?.rate, parsePrice)}%)`}</span>
+                  )}
+                  <IconContainer>
+                    <BsInfoCircle size='20' color={theme.colors.primary} onClick={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_3' })} />
+                    {!!offer?.id && (
+                      <MdCloseCircle size='24' color={theme.colors.primary} onClick={() => onRemoveOffer(offer?.id)} />
+                    )}
+                  </IconContainer>
+                </td>
+                <td>
+                  - {parsePrice(offer?.summary?.discount)}
+                </td>
+              </tr>
+            ))
+          }
+          {orderState?.options?.type === 1 && (
+            <tr>
+              <td>{t('DELIVERY_FEE', 'Delivery Fee')}</td>
+              <td>{parsePrice(cart?.delivery_price_with_discount)}</td>
+            </tr>
+          )}
+          {
+            cart?.offers?.length > 0 && cart?.offers?.filter(offer => offer?.target === 2)?.map(offer => (
+              <tr key={offer.id}>
+                <td className='icon'>
+                  {offer.name}
+                  {offer?.rate_type === 1 && (
+                    <span>{`(${verifyDecimals(offer?.rate, parsePrice)}%)`}</span>
+                  )}
+                  <IconContainer>
+                    <BsInfoCircle size='20' color={theme.colors.primary} onClick={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_2' })} />
+                    {!!offer?.id && (
+                      <MdCloseCircle size='24' color={theme.colors.primary} onClick={() => onRemoveOffer(offer?.id)} />
+                    )}
+                  </IconContainer>
+                </td>
+                <td>
+                  - {parsePrice(offer?.summary?.discount)}
+                </td>
+              </tr>
+            ))
+          }
+          {cart?.driver_tip > 0 && (
+            <tr>
+              <td>
+                {t('DRIVER_TIP', 'Driver tip')}{' '}
+                {cart?.driver_tip_rate > 0 &&
+                  parseInt(configs?.driver_tip_type?.value, 10) === 2 &&
+                  !parseInt(configs?.driver_tip_use_custom?.value, 10) &&
+                  (
+                    <span>{`(${verifyDecimals(cart?.driver_tip_rate, parseNumber)}%)`}</span>
+                  )}
+              </td>
+              <td>{parsePrice(cart?.driver_tip)}</td>
+            </tr>
+          )}
+        </tbody>
+      </table>
+      {isCouponEnabled && cart?.status !== 2 &&
+        (
+          <CouponContainer>
+            <CouponControl
+              businessId={cart?.business_id}
+              price={cart?.total}
+            />
+          </CouponContainer>
+        )}
+      <table className='total'>
+        <tbody>
+          <tr>
+            <td>{t('TOTAL', 'Total')}</td>
+            <td>{parsePrice(cart?.total >= 0 ? cart?.total : 0)}</td>
+          </tr>
+        </tbody>
+      </table>
+
+      <Modal
+        width='70%'
+        open={openTaxModal.open}
+        padding='20px'
+        closeOnBackdrop
+        title={`${openTaxModal.data?.name ||
+          t('INHERIT_FROM_BUSINESS', 'Inherit from business')} ${openTaxModal.data?.rate_type !== 2 ? `(${typeof openTaxModal.data?.rate === 'number' ? `${openTaxModal.data?.rate}%` : `${parsePrice(openTaxModal.data?.fixed ?? 0)} + ${openTaxModal.data?.percentage}%`})` : ''}  `}
+        onClose={() => setOpenTaxModal({ open: false, data: null, type: '' })}
+        modalTitleStyle={{ display: 'flex', justifyContent: 'center' }}
+      >
+        <TaxInformation
+          type={openTaxModal.type}
+          data={openTaxModal.data}
+          products={cart?.products}
+        />
+      </Modal>
+      <Confirm
+        title={t('PRODUCT', 'Product')}
+        content={confirm.content}
+        acceptText={t('ACCEPT', 'Accept')}
+        open={confirm.open}
+        onClose={() => setConfirm({ ...confirm, open: false })}
+        onCancel={() => setConfirm({ ...confirm, open: false })}
+        onAccept={confirm.handleOnAccept}
+        closeOnBackdrop={false}
+      />
+    </CartBillContainer>
+  )
+}

package/src/components/Orders/CreateCustomOrder/CartBill/styles.js

@@ -0,0 +1,67 @@
+import styled, { css } from 'styled-components'
+
+export const CartBillContainer = styled.div`
+  margin-top: 40px;
+  > h3 {
+    margin-bottom: 15px;
+  }
+
+  table {
+    width: 100%;
+    font-size: 14px;
+
+    td {
+      padding: 5px 0;
+    }
+
+    td span {
+      unicode-bidi: bidi-override;
+    }
+
+    tr td:nth-child(2) {
+      text-align: right;
+      ${props => props.theme?.rtl && css`
+        text-align: left;
+      `}
+    }
+
+    .icon {
+      display: flex;
+      align-items: center;
+      max-height: 25px;
+    }
+  }
+  table.total {
+    border-top: 1px solid ${props => props.theme.colors.borderColor};
+    margin-top: 10px;
+    tr {
+      td {
+        font-weight: bold;
+        font-size: 16px;
+
+        &#loyalty {
+          font-weight: normal;
+          font-size: 14px;
+        }
+      }
+    }
+  }
+`
+export const CouponContainer = styled.div`
+  margin-top: 10px;
+`
+export const IconContainer = styled.div`
+  position: relative;
+  display: inline-flex;
+  cursor: pointer;
+  margin-left: 5px;
+  height: 20px;
+  svg:nth-child(1){
+    position: relative;
+    top: -1px;
+  }
+  svg:nth-child(2){
+    position: relative;
+    top: -3px;
+  }
+`