ordering-components-external 13.2.30 → 13.2.32

package/_modules/components/LoginForm/index.js

@@ -36,7 +36,7 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
  * Component to manage login behavior without UI component
  */
 var LoginForm = exports.LoginForm = function LoginForm(props) {
-  var _configs$phone_passwo, _configs$opt_email_en, _configs$otp_cellphon, _configs$email_passwo, _configs$spoonity_ena, _configs$device_code_;
+  var _configs$phone_passwo, _configs$opt_email_en, _configs$otp_cellphon, _configs$whatsapp_otp, _configs$email_passwo, _configs$spoonity_ena, _configs$device_code_;
   var UIComponent = props.UIComponent,
     handleButtonLoginClick = props.handleButtonLoginClick,
     handleSuccessLogin = props.handleSuccessLogin,
@@ -110,9 +110,10 @@ var LoginForm = exports.LoginForm = function LoginForm(props) {
   var useLoginByCellphone = (configs === null || configs === void 0 || (_configs$phone_passwo = configs.phone_password_login_enabled) === null || _configs$phone_passwo === void 0 ? void 0 : _configs$phone_passwo.value) === '1';
   var useLoginOtpEmail = (configs === null || configs === void 0 || (_configs$opt_email_en = configs.opt_email_enabled) === null || _configs$opt_email_en === void 0 ? void 0 : _configs$opt_email_en.value) === '1';
   var useLoginOtpCellphone = (configs === null || configs === void 0 || (_configs$otp_cellphon = configs.otp_cellphone_enabled) === null || _configs$otp_cellphon === void 0 ? void 0 : _configs$otp_cellphon.value) === '1';
-  var useLoginByEmail = useLoginByCellphone || useLoginOtpEmail || useLoginOtpCellphone ? (configs === null || configs === void 0 || (_configs$email_passwo = configs.email_password_login_enabled) === null || _configs$email_passwo === void 0 ? void 0 : _configs$email_passwo.value) === '1' : true;
+  var useLoginOtpWhatsapp = (configs === null || configs === void 0 || (_configs$whatsapp_otp = configs.whatsapp_otp_login_enabled) === null || _configs$whatsapp_otp === void 0 ? void 0 : _configs$whatsapp_otp.value) === '1';
+  var useLoginByEmail = useLoginByCellphone || useLoginOtpEmail || useLoginOtpCellphone || useLoginOtpWhatsapp ? (configs === null || configs === void 0 || (_configs$email_passwo = configs.email_password_login_enabled) === null || _configs$email_passwo === void 0 ? void 0 : _configs$email_passwo.value) === '1' : true;
   var useLoginSpoonity = (configs === null || configs === void 0 || (_configs$spoonity_ena = configs.spoonity_enabled) === null || _configs$spoonity_ena === void 0 ? void 0 : _configs$spoonity_ena.value) === '1';
-  var useLoginOtp = useLoginOtpEmail || useLoginOtpCellphone;
+  var useLoginOtp = useLoginOtpEmail || useLoginOtpCellphone || useLoginOtpWhatsapp;
   var isDeviceLoginEnabled = (configs === null || configs === void 0 || (_configs$device_code_ = configs.device_code_login_enabled) === null || _configs$device_code_ === void 0 ? void 0 : _configs$device_code_.value) === '1';
   defaultLoginTab = useLoginByEmail ? 'email' : useLoginByCellphone ? 'cellphone' : 'otp';
   var _useState13 = (0, _react.useState)(defaultLoginTab),
@@ -163,7 +164,7 @@ var LoginForm = exports.LoginForm = function LoginForm(props) {
               _credentials = _defineProperty(_defineProperty({}, otpType, values && values[otpType] || credentials[otpType]), "one_time_password", values && (values === null || values === void 0 ? void 0 : values.code) || otpState);
               if (otpType === 'cellphone') {
                 _credentials = _objectSpread(_objectSpread({}, _credentials), {}, {
-                  country_phone_code: values && ((values === null || values === void 0 ? void 0 : values.country_phone_code) || (credentials === null || credentials === void 0 ? void 0 : credentials.country_phone_code))
+                  country_phone_code: values && (values === null || values === void 0 ? void 0 : values.country_phone_code) || (credentials === null || credentials === void 0 ? void 0 : credentials.country_phone_code)
                 });
               }
             } else {
@@ -475,14 +476,14 @@ var LoginForm = exports.LoginForm = function LoginForm(props) {
     };
   }();
   var generateOtpCode = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(values) {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(values, channel) {
       var body, email, cellphone, countryPhoneCode, response, _yield$response$json, result, error, _t5;
       return _regenerator().w(function (_context4) {
         while (1) switch (_context4.p = _context4.n) {
           case 0:
             body = {
               type: 4,
-              channel: otpType === 'email' ? 1 : 2,
+              channel: otpType === 'email' ? 1 : channel || 2,
               size: 6
             };
             email = (values === null || values === void 0 ? void 0 : values.email) || (credentials === null || credentials === void 0 ? void 0 : credentials.email);
@@ -552,7 +553,7 @@ var LoginForm = exports.LoginForm = function LoginForm(props) {
         }
       }, _callee4, null, [[1, 5]]);
     }));
-    return function generateOtpCode(_x4) {
+    return function generateOtpCode(_x4, _x5) {
       return _ref4.apply(this, arguments);
     };
   }();
@@ -654,6 +655,7 @@ var LoginForm = exports.LoginForm = function LoginForm(props) {
     useLoginByCellphone: useLoginByCellphone,
     useLoginOtpEmail: useLoginOtpEmail,
     useLoginOtpCellphone: useLoginOtpCellphone,
+    useLoginOtpWhatsapp: useLoginOtpWhatsapp,
     useLoginSpoonity: useLoginSpoonity,
     handleLoginSpoonity: handleLoginSpoonity,
     setCellphoneStartZero: setCellphoneStartZero

package/_modules/components/SignupForm/index.js

@@ -37,7 +37,7 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
  * Component to manage signup behavior without UI component
  */
 var SignupForm = exports.SignupForm = function SignupForm(props) {
-  var _configs$email_otp_si, _configs$phone_otp_si, _configs$full_details;
+  var _configs$email_otp_si, _configs$phone_otp_si, _configs$whatsapp_otp, _configs$full_details;
   var UIComponent = props.UIComponent,
     useChekoutFileds = props.useChekoutFileds,
     handleButtonSignupClick = props.handleButtonSignupClick,
@@ -134,7 +134,8 @@ var SignupForm = exports.SignupForm = function SignupForm(props) {
     setCellphoneStartZero = _useState18[1];
   var useSignUpOtpEmail = (configs === null || configs === void 0 || (_configs$email_otp_si = configs.email_otp_signup_enabled) === null || _configs$email_otp_si === void 0 ? void 0 : _configs$email_otp_si.value) === '1' && !isCustomerMode;
   var useSignUpOtpCellphone = (configs === null || configs === void 0 || (_configs$phone_otp_si = configs.phone_otp_signup_enabled) === null || _configs$phone_otp_si === void 0 ? void 0 : _configs$phone_otp_si.value) === '1' && !isCustomerMode;
-  var useSignUpFullDetails = useSignUpOtpEmail || useSignUpOtpCellphone ? (configs === null || configs === void 0 || (_configs$full_details = configs.full_details_signup_enabled) === null || _configs$full_details === void 0 ? void 0 : _configs$full_details.value) === '1' : true;
+  var useSignUpOtpWhatsapp = (configs === null || configs === void 0 || (_configs$whatsapp_otp = configs.whatsapp_otp_signup_enabled) === null || _configs$whatsapp_otp === void 0 ? void 0 : _configs$whatsapp_otp.value) === '1' && !isCustomerMode;
+  var useSignUpFullDetails = useSignUpOtpEmail || useSignUpOtpCellphone || useSignUpOtpWhatsapp ? (configs === null || configs === void 0 || (_configs$full_details = configs.full_details_signup_enabled) === null || _configs$full_details === void 0 ? void 0 : _configs$full_details.value) === '1' : true;
   var defaultSignUpTab = useSignUpFullDetails ? 'default' : useSignUpOtpEmail ? 'otpEmail' : 'otpCellphone';
   var _useState19 = (0, _react.useState)(defaultSignUpTab),
     _useState20 = _slicedToArray(_useState19, 2),
@@ -362,7 +363,7 @@ var SignupForm = exports.SignupForm = function SignupForm(props) {
     };
   }();
   var generateOtpCode = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(values) {
+    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(values, channel) {
       var body, email, cellphone, countryPhoneCode, response, _yield$response$json, result, error, _t3;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.p = _context3.n) {
@@ -382,7 +383,7 @@ var SignupForm = exports.SignupForm = function SignupForm(props) {
           case 1:
             body = {
               type: 4,
-              channel: signUpTab === 'otpEmail' ? 1 : 2,
+              channel: signUpTab === 'otpEmail' ? 1 : channel || 2,
               size: 6
             };
             email = (values === null || values === void 0 ? void 0 : values.email) || (signupData === null || signupData === void 0 ? void 0 : signupData.email);
@@ -465,7 +466,7 @@ var SignupForm = exports.SignupForm = function SignupForm(props) {
         }
       }, _callee3, null, [[2, 6]]);
     }));
-    return function generateOtpCode(_x3) {
+    return function generateOtpCode(_x3, _x4) {
       return _ref5.apply(this, arguments);
     };
   }();
@@ -544,7 +545,7 @@ var SignupForm = exports.SignupForm = function SignupForm(props) {
         }
       }, _callee4, null, [[1, 4]]);
     }));
-    return function checkVerifyPhoneCode(_x4) {
+    return function checkVerifyPhoneCode(_x5) {
       return _ref6.apply(this, arguments);
     };
   }();
@@ -688,7 +689,8 @@ var SignupForm = exports.SignupForm = function SignupForm(props) {
     willVerifyOtpState: willVerifyOtpState,
     useSignUpFullDetails: useSignUpFullDetails,
     useSignUpOtpEmail: useSignUpOtpEmail,
-    useSignUpOtpCellphone: useSignUpOtpCellphone
+    useSignUpOtpCellphone: useSignUpOtpCellphone,
+    useSignUpOtpWhatsapp: useSignUpOtpWhatsapp
   })));
 };
 SignupForm.propTypes = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-components-external",
-  "version": "13.2.30",
+  "version": "13.2.32",
   "description": "Ordering Internal Dashboard",
   "main": "./_modules/index.js",
   "scripts": {

package/src/components/LoginForm/index.js

@@ -39,10 +39,11 @@ export const LoginForm = (props) => {
   const useLoginByCellphone = configs?.phone_password_login_enabled?.value === '1'
   const useLoginOtpEmail = configs?.opt_email_enabled?.value === '1'
   const useLoginOtpCellphone = configs?.otp_cellphone_enabled?.value === '1'
-  const useLoginByEmail = (useLoginByCellphone || useLoginOtpEmail || useLoginOtpCellphone)
+  const useLoginOtpWhatsapp = configs?.whatsapp_otp_login_enabled?.value === '1'
+  const useLoginByEmail = (useLoginByCellphone || useLoginOtpEmail || useLoginOtpCellphone || useLoginOtpWhatsapp)
     ? configs?.email_password_login_enabled?.value === '1' : true
   const useLoginSpoonity = configs?.spoonity_enabled?.value === '1'
-  const useLoginOtp = useLoginOtpEmail || useLoginOtpCellphone
+  const useLoginOtp = useLoginOtpEmail || useLoginOtpCellphone || useLoginOtpWhatsapp
   const isDeviceLoginEnabled = configs?.device_code_login_enabled?.value === '1'
 
   defaultLoginTab = useLoginByEmail ? 'email' : useLoginByCellphone ? 'cellphone' : 'otp'
@@ -76,7 +77,9 @@ export const LoginForm = (props) => {
         if (otpType === 'cellphone') {
           _credentials = {
             ..._credentials,
-            country_phone_code: values && (values?.country_phone_code || credentials?.country_phone_code)
+            country_phone_code:
+              (values && values?.country_phone_code) ||
+              credentials?.country_phone_code
           }
         }
       } else {
@@ -312,10 +315,10 @@ export const LoginForm = (props) => {
     }
   }
 
-  const generateOtpCode = async (values) => {
+  const generateOtpCode = async (values, channel) => {
     const body = {
       type: 4,
-      channel: otpType === 'email' ? 1 : 2,
+      channel: otpType === 'email' ? 1 : (channel || 2),
       size: 6
     }
     const email = values?.email || credentials?.email
@@ -433,6 +436,7 @@ export const LoginForm = (props) => {
           useLoginByCellphone={useLoginByCellphone}
           useLoginOtpEmail={useLoginOtpEmail}
           useLoginOtpCellphone={useLoginOtpCellphone}
+          useLoginOtpWhatsapp={useLoginOtpWhatsapp}
           useLoginSpoonity={useLoginSpoonity}
           handleLoginSpoonity={handleLoginSpoonity}
           setCellphoneStartZero={setCellphoneStartZero}

package/src/components/SignupForm/index.js

@@ -49,7 +49,8 @@ export const SignupForm = (props) => {
 
   const useSignUpOtpEmail = configs?.email_otp_signup_enabled?.value === '1' && !isCustomerMode
   const useSignUpOtpCellphone = configs?.phone_otp_signup_enabled?.value === '1' && !isCustomerMode
-  const useSignUpFullDetails = (useSignUpOtpEmail || useSignUpOtpCellphone) ? configs?.full_details_signup_enabled?.value === '1' : true
+  const useSignUpOtpWhatsapp = configs?.whatsapp_otp_login_enabled?.value === '1' && !isCustomerMode
+  const useSignUpFullDetails = (useSignUpOtpEmail || useSignUpOtpCellphone || useSignUpOtpWhatsapp) ? configs?.full_details_signup_enabled?.value === '1' : true
 
   const defaultSignUpTab = useSignUpFullDetails ? 'default' : useSignUpOtpEmail ? 'otpEmail' : 'otpCellphone'
   const [signUpTab, setSignUpTab] = useState(defaultSignUpTab)
@@ -232,7 +233,7 @@ export const SignupForm = (props) => {
     }
   }
 
-  const generateOtpCode = async (values) => {
+  const generateOtpCode = async (values, channel) => {
     if (isReCaptchaEnable && reCaptchaValue === null) {
       setCheckPhoneCodeState({
         ...checkPhoneCodeState,
@@ -246,7 +247,7 @@ export const SignupForm = (props) => {
     }
     const body = {
       type: 4,
-      channel: signUpTab === 'otpEmail' ? 1 : 2,
+      channel: signUpTab === 'otpEmail' ? 1 : (channel || 2),
       size: 6
     }
     const email = values?.email || signupData?.email
@@ -478,6 +479,7 @@ export const SignupForm = (props) => {
           useSignUpFullDetails={useSignUpFullDetails}
           useSignUpOtpEmail={useSignUpOtpEmail}
           useSignUpOtpCellphone={useSignUpOtpCellphone}
+          useSignUpOtpWhatsapp={useSignUpOtpWhatsapp}
         />
       )}
     </>

package/src/components/UserVerification/index.js

@@ -1,6 +1,7 @@
 import React, { useState } from 'react'
 import { useSession } from '../../contexts/SessionContext'
 import { useApi } from '../../contexts/ApiContext'
+import { useConfig } from '../../contexts/ConfigContext'
 import { useWebsocket } from '../../contexts/WebsocketContext'
 
 /**
@@ -14,6 +15,8 @@ export const UserVerification = (props) => {
   const [ordering] = useApi()
   const socket = useWebsocket()
   const [{ user, token }, { changeUser }] = useSession()
+  const [{ configs }] = useConfig()
+  const useWhatsappVerification = configs?.whatsapp_otp_login_enabled?.value === '1'
 
   const [verifyEmailState, setVerifyEmailState] = useState({
     loadingSendCode: false,
@@ -235,6 +238,7 @@ export const UserVerification = (props) => {
           checkVerifyEmailCode={checkVerifyEmailCode}
           checkVerifyPhoneCode={checkVerifyPhoneCode}
           cleanErrorsState={cleanErrorsState}
+          useWhatsappVerification={useWhatsappVerification}
         />
       )}
     </>