ordering-ui-external 1.0.1 → 1.1.0

package/_modules/themes/three/src/components/ForgotPasswordForm/index.js

@@ -97,7 +97,10 @@ var ForgotPasswordUI = function ForgotPasswordUI(props) {
       }
     });
     formMethods.setValue('email', e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''));
-    emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '');
+
+    if (emailInput !== null && emailInput !== void 0 && emailInput.current) {
+      emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '');
+    }
   };
 
   (0, _react.useEffect)(function () {

package/_modules/themes/three/src/components/LoginForm/index.js

@@ -255,7 +255,10 @@ var LoginFormUI = function LoginFormUI(props) {
       }
     });
     formMethods.setValue('email', e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''));
-    emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '');
+
+    if (emailInput !== null && emailInput !== void 0 && emailInput.current) {
+      emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '');
+    }
   };
 
   var handleChangePhoneNumber = function handleChangePhoneNumber(number, isValid) {

package/_modules/themes/three/src/components/SignUpForm/index.js

@@ -237,7 +237,10 @@ var SignUpFormUI = function SignUpFormUI(props) {
       }
     });
     formMethods.setValue('email', e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''));
-    emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '');
+
+    if (emailInput !== null && emailInput !== void 0 && emailInput.current) {
+      emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '');
+    }
   };
 
   (0, _react.useEffect)(function () {

package/_modules/themes/two/src/components/ForgotPasswordForm/index.js

@@ -94,7 +94,10 @@ var ForgotPasswordUI = function ForgotPasswordUI(props) {
       }
     });
     formMethods.setValue('email', e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''));
-    emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '');
+
+    if (emailInput !== null && emailInput !== void 0 && emailInput.current) {
+      emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '');
+    }
   };
 
   (0, _react.useEffect)(function () {

package/_modules/themes/two/src/components/LoginForm/index.js

@@ -256,7 +256,10 @@ var LoginFormUI = function LoginFormUI(props) {
       }
     });
     formMethods.setValue('email', e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''));
-    emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '');
+
+    if (emailInput !== null && emailInput !== void 0 && emailInput.current) {
+      emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '');
+    }
   };
 
   var handleChangePhoneNumber = function handleChangePhoneNumber(number, isValid) {

package/_modules/themes/two/src/components/SignUpForm/index.js

@@ -236,7 +236,10 @@ var SignUpFormUI = function SignUpFormUI(props) {
       }
     });
     formMethods.setValue('email', e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''));
-    emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '');
+
+    if (emailInput !== null && emailInput !== void 0 && emailInput.current) {
+      emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '');
+    }
   };
 
   (0, _react.useEffect)(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-external",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Ordering UI Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -82,8 +82,8 @@
     "jspdf": "^2.3.1",
     "libphonenumber-js": "^1.9.4",
     "lodash": "^4.17.19",
-    "moment": "^2.29.0",
-    "ordering-components-external": "1.0.1",
+    "moment": "^2.29.4",
+    "ordering-components-external": "1.1.0",
     "polished": "^3.6.6",
     "react-bootstrap-icons": "^1.7.2",
     "react-calendar": "^3.3.1",

package/src/components/BusinessBasicInformation/index.js

@@ -10,7 +10,7 @@ import { useTheme } from 'styled-components'
 import { Modal } from '../Modal'
 import { BusinessInformation } from '../BusinessInformation'
 
-import { useUtils, useOrder, useLanguage } from 'ordering-components-external'
+import { useUtils, useOrder, useLanguage, useOrderingTheme } from 'ordering-components-external'
 
 import { convertHoursToMinutes } from '../../utils'
 
@@ -38,6 +38,7 @@ export const BusinessBasicInformation = (props) => {
   const [orderState] = useOrder()
   const [, t] = useLanguage()
   const [{ parsePrice, parseDistance, optimizeImage }] = useUtils()
+  const [orderingTheme] = useOrderingTheme()
 
   const getBusinessType = () => {
     if (Object.keys(business).length <= 0) return t('GENERAL', 'General')
@@ -48,6 +49,13 @@ export const BusinessBasicInformation = (props) => {
     return _types.join(', ')
   }
 
+  const showLogo = !orderingTheme?.theme?.business_view?.components?.header?.components?.business?.components?.logo?.hidden
+  const showDeliveryFee = !orderingTheme?.theme?.business_view?.components?.header?.components?.business?.components?.fee?.hidden
+  const showTime = !orderingTheme?.theme?.business_view?.components?.header?.components?.business?.components?.time?.hidden
+  const showBusinessInfo = !orderingTheme?.theme?.business_view?.components?.header?.components?.business?.components?.business_info?.hidden
+  const showReviews = !orderingTheme?.theme?.business_view?.components?.header?.components?.business?.components?.reviews?.hidden
+  const showDistance = !orderingTheme?.theme?.business_view?.components?.header?.components?.business?.components?.distance?.hidden
+
   return (
     <>
       {props.beforeElements?.map((BeforeElement, i) => (
@@ -59,13 +67,15 @@ export const BusinessBasicInformation = (props) => {
       <BusinessContainer bgimage={business?.header} isSkeleton={isSkeleton} id='container' isClosed={!business?.open}>
         {!business?.open && <h1>{t('CLOSED', 'Closed')}</h1>}
         <BusinessContent>
-          <WrapperBusinessLogo>
-            {!loading ? (
-              <BusinessLogo bgimage={optimizeImage(business?.logo || theme.images?.dummies?.businessLogo, 'h_200,c_limit')} />
-            ) : (
-              <Skeleton height={70} width={70} />
-            )}
-          </WrapperBusinessLogo>
+          {showLogo && (
+            <WrapperBusinessLogo>
+              {!loading ? (
+                <BusinessLogo bgimage={optimizeImage(business?.logo || theme.images?.dummies?.businessLogo, 'h_200,c_limit')} />
+              ) : (
+                <Skeleton height={70} width={70} />
+              )}
+            </WrapperBusinessLogo>
+          )}
           <BusinessInfo className='info'>
             <BusinessInfoItem>
               <div>
@@ -74,50 +84,63 @@ export const BusinessBasicInformation = (props) => {
                 ) : (
                   <Skeleton width={100} />
                 )}
-                {!loading ? (
-                  <p>
-                    <FaStar className='start' />
-                    {business?.reviews?.total}
-                  </p>
-                ) : (
-                  <Skeleton width={100} />
+                {showReviews && (
+                  <>
+                    {!loading ? (
+                      <p>
+                        <FaStar className='start' />
+                        {business?.reviews?.total}
+                      </p>
+                    ) : (
+                      <Skeleton width={100} />
+                    )}
+                  </>
                 )}
               </div>
+              {showBusinessInfo && (
+                <div>
+                  {!loading ? (
+                    <p className='type'>{getBusinessType()}</p>
+                  ) : (
+                    <Skeleton width={100} />
+                  )}
+                </div>
+              )}
               <div>
-                {!loading ? (
-                  <p className='type'>{getBusinessType()}</p>
-                ) : (
-                  <Skeleton width={100} />
+                {showTime && (
+                  <>
+                    {!loading ? (
+                      <>
+                        {orderState?.options?.type === 1 ? (
+                          <h5>
+                            <FiClock />
+                            {convertHoursToMinutes(business?.delivery_time)}
+                          </h5>
+                        ) : (
+                          <h5>
+                            <FiClock />
+                            {convertHoursToMinutes(business?.pickup_time)}
+                          </h5>
+                        )}
+                      </>
+                    ) : (
+                      <Skeleton width={70} />
+                    )}
+                  </>
                 )}
-              </div>
-              <div>
-                {!loading ? (
+                {showDistance && (
                   <>
-                    {orderState?.options?.type === 1 ? (
+                    {!loading ? (
                       <h5>
-                        <FiClock />
-                        {convertHoursToMinutes(business?.delivery_time)}
+                        <GrLocation />
+                        {parseDistance(business?.distance || 0)}
                       </h5>
                     ) : (
-                      <h5>
-                        <FiClock />
-                        {convertHoursToMinutes(business?.pickup_time)}
-                      </h5>
+                      <Skeleton width={70} />
                     )}
                   </>
-                ) : (
-                  <Skeleton width={70} />
-                )}
-
-                {!loading ? (
-                  <h5>
-                    <GrLocation />
-                    {parseDistance(business?.distance || 0)}
-                  </h5>
-                ) : (
-                  <Skeleton width={70} />
                 )}
-                {orderState?.options.type === 1 && (
+                {orderState?.options.type === 1 && showDeliveryFee && (
                   <>
                     {!loading ? (
                       <h5>

package/src/components/BusinessProductsList/index.js

@@ -53,7 +53,7 @@ const BusinessProductsListUI = (props) => {
                   businessId={businessId}
                   onProductClick={onProductClick}
                   isCartOnProductsList={isCartOnProductsList}
-                  productAddedToCart={currentCart?.products?.find(Cproduct => Cproduct.id === product.id)}
+                  productAddedToCartLength={currentCart?.products?.reduce((productsLength, Cproduct) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0)}
                   productToIdLoading={productToIdLoading}
                 />
               ))
@@ -77,7 +77,7 @@ const BusinessProductsListUI = (props) => {
                           businessId={businessId}
                           onProductClick={onProductClick}
                           isCartOnProductsList={isCartOnProductsList}
-                          productAddedToCart={currentCart?.products?.find(Cproduct => Cproduct.id === product.id)}
+                          productAddedToCartLength={currentCart?.products?.reduce((productsLength, Cproduct) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0)}
                           productToIdLoading={productToIdLoading}
                         />
                       ))}
@@ -108,7 +108,7 @@ const BusinessProductsListUI = (props) => {
                               product={product}
                               onProductClick={onProductClick}
                               isCartOnProductsList={isCartOnProductsList}
-                              productAddedToCart={currentCart?.products?.find(Cproduct => Cproduct.id === product.id)}
+                              productAddedToCartLength={currentCart?.products?.reduce((productsLength, Cproduct) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0)}
                               productToIdLoading={productToIdLoading}
                             />
                           ))

package/src/components/BusinessProductsList/layouts/groceries/index.js

@@ -60,7 +60,7 @@ const BusinessProductsListUI = (props) => {
                   businessId={businessId}
                   onProductClick={onProductClick}
                   isCartOnProductsList={isCartOnProductsList}
-                  productAddedToCart={currentCart?.products?.find(Cproduct => Cproduct.id === product.id)}
+                  productAddedToCartLength={currentCart?.products?.reduce((productsLength, Cproduct) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0)}
                 />
               ))
             }
@@ -96,7 +96,7 @@ const BusinessProductsListUI = (props) => {
                       businessId={businessId}
                       onProductClick={onProductClick}
                       isCartOnProductsList={isCartOnProductsList}
-                      productAddedToCart={currentCart?.products?.find(Cproduct => Cproduct.id === product.id)}
+                      productAddedToCartLength={currentCart?.products?.reduce((productsLength, Cproduct) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0)}
                     />
                   ))}
                   {!categoryState?.loading && featProducts?.length && (
@@ -154,7 +154,7 @@ const BusinessProductsListUI = (props) => {
                             product={product}
                             onProductClick={onProductClick}
                             isCartOnProductsList={isCartOnProductsList}
-                            productAddedToCart={currentCart?.products?.find(Cproduct => Cproduct.id === product.id)}
+                            productAddedToCartLength={currentCart?.products?.reduce((productsLength, Cproduct) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0)}
                           />
                         ))
                       }

package/src/components/Checkout/index.js

@@ -393,6 +393,7 @@ const CheckoutUI = (props) => {
                 setCardData={setCardData}
                 handlePlaceOrder={handlePlaceOrder}
                 onPlaceOrderClick={onPlaceOrderClick}
+                setCreateOrder={setCreateOrder}
               />
             </PaymentMethodContainer>
           )}

package/src/components/ForgotPasswordForm/index.js

@@ -50,7 +50,9 @@ const ForgotPasswordUI = (props) => {
   const handleChangeInputEmail = (e) => {
     hanldeChangeInput({ target: { name: 'email', value: e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '') } })
     formMethods.setValue('email', e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''))
-    emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '')
+    if (emailInput?.current) {
+      emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '')
+    }
   }
 
   useEffect(() => {

package/src/components/Header/index.js

@@ -336,7 +336,7 @@ export const Header = (props) => {
                 )}
               </AddressWrapper>
               {!isCustomerMode && (isPreOrderSetting || configState?.configs?.preorder_status_enabled?.value === undefined) && (
-                <MomentControl 
+                <MomentControl
                   isModalBehavior
                 />
               )}

package/src/components/LoginForm/index.js

@@ -156,7 +156,9 @@ const LoginFormUI = (props) => {
   const handleChangeInputEmail = (e) => {
     handleChangeInput({ target: { name: 'email', value: e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '') } })
     formMethods.setValue('email', e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''))
-    emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '')
+    if (emailInput?.current) {
+      emailInput.current.value = e.target.value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '')
+    }
   }
 
   const handleChangePhoneNumber = (number, isValid) => {
@@ -310,14 +312,14 @@ const LoginFormUI = (props) => {
               isPopup={isPopup}
             >
               {
-              props.beforeMidElements?.map((BeforeMidElements, i) => (
-                <React.Fragment key={i}>
-                  {BeforeMidElements}
-                </React.Fragment>))
+                props.beforeMidElements?.map((BeforeMidElements, i) => (
+                  <React.Fragment key={i}>
+                    {BeforeMidElements}
+                  </React.Fragment>))
               }
               {
-              props.beforeMidComponents?.map((BeforeMidComponents, i) => (
-                <BeforeMidComponents key={i} {...props} />))
+                props.beforeMidComponents?.map((BeforeMidComponents, i) => (
+                  <BeforeMidComponents key={i} {...props} />))
               }
               {useLoginByEmail && loginTab === 'email' && (
                 <Input
@@ -335,7 +337,7 @@ const LoginFormUI = (props) => {
                 <InputPhoneNumber
                   value={credentials?.cellphone}
                   setValue={handleChangePhoneNumber}
-                  handleIsValid={() => {}}
+                  handleIsValid={() => { }}
                 />
               )}
 
@@ -399,14 +401,14 @@ const LoginFormUI = (props) => {
                 </WrapperPassword>
               )}
               {
-              props.afterMidElements?.map((MidElement, i) => (
-                <React.Fragment key={i}>
-                  {MidElement}
-                </React.Fragment>))
+                props.afterMidElements?.map((MidElement, i) => (
+                  <React.Fragment key={i}>
+                    {MidElement}
+                  </React.Fragment>))
               }
               {
-              props.afterMidComponents?.map((MidComponent, i) => (
-                <MidComponent key={i} {...props} />))
+                props.afterMidComponents?.map((MidComponent, i) => (
+                  <MidComponent key={i} {...props} />))
               }
               {!loginWithOtpState && (
                 <RedirectLink isPopup={isPopup}>
@@ -458,14 +460,14 @@ const LoginFormUI = (props) => {
             Object.keys(configs).length > 0 ? (
               <SocialButtons isPopup={isPopup}>
                 {(configs?.facebook_login?.value === 'true' ||
-                configs?.facebook_login?.value === '1') &&
-                configs?.facebook_id?.value &&
-              (
-                <FacebookLoginButton
-                  appId={configs?.facebook_id?.value}
-                  handleSuccessFacebookLogin={handleSuccessFacebook}
-                />
-              )}
+                  configs?.facebook_login?.value === '1') &&
+                  configs?.facebook_id?.value &&
+                  (
+                    <FacebookLoginButton
+                      appId={configs?.facebook_id?.value}
+                      handleSuccessFacebookLogin={handleSuccessFacebook}
+                    />
+                  )}
                 {configs?.apple_login_client_id?.value &&
                   (
                     <AppleLogin
@@ -480,12 +482,12 @@ const LoginFormUI = (props) => {
                   />
                 )}
                 {useLoginByCellphone && loginTab === 'cellphone' &&
-               configs && Object.keys(configs).length > 0 && (configs?.twilio_service_enabled?.value === 'true' ||
-                configs?.twilio_service_enabled?.value === '1') && (
-                  <SmsLoginButton
-                    handleSmsLogin={() => { setLoginWithOtpState(true) }}
-                  />
-                )}
+                  configs && Object.keys(configs).length > 0 && (configs?.twilio_service_enabled?.value === 'true' ||
+                    configs?.twilio_service_enabled?.value === '1') && (
+                    <SmsLoginButton
+                      handleSmsLogin={() => { setLoginWithOtpState(true) }}
+                    />
+                  )}
               </SocialButtons>
             ) : (
               <SkeletonSocialWrapper>