ordering-ui-react-native 0.21.41-test → 0.21.41

package/themes/original/src/components/MultiCheckout/index.tsx

@@ -10,11 +10,11 @@ import {
   ToastType,
   MultiCheckout as MultiCheckoutController
 } from 'ordering-components/native'
-import { View, StyleSheet, Platform } from 'react-native'
+import { View, StyleSheet, Platform, ScrollView } from 'react-native'
 import { useTheme } from 'styled-components/native';
 import { Container } from '../../layouts/Container';
 import NavBar from '../NavBar';
-import { OText, OIcon, OModal } from '../shared';
+import { OText, OIcon, OModal, OButton } from '../shared';
 import { getTypesText } from '../../utils';
 import { UserDetails } from '../UserDetails'
 import { AddressDetails } from '../AddressDetails'
@@ -26,6 +26,8 @@ import { DriverTips } from '../DriverTips'
 import { CouponControl } from '../CouponControl';
 import { DriverTipsContainer } from '../Cart/styles'
 import { OSTable, OSCoupon } from '../OrderSummary/styles';
+import { SignupForm } from '../SignupForm'
+import { LoginForm } from '../LoginForm'
 
 import {
   ChContainer,
@@ -74,7 +76,11 @@ const MultiCheckoutUI = (props: any) => {
       paddingLeft: 40,
       paddingRight: 40
     },
-    wrapperNavbar: { paddingHorizontal: 40 }
+    wrapperNavbar: { paddingHorizontal: 40 },
+    detailWrapper: {
+			paddingHorizontal: 40,
+			width: '100%'
+		},
   })
 
   const [, { showToast }] = useToast();
@@ -83,7 +89,7 @@ const MultiCheckoutUI = (props: any) => {
   const [{ parsePrice, parseDate }] = useUtils();
   const [{ options, carts, loading }, { confirmCart }] = useOrder();
   const [validationFields] = useValidationFields();
-  const [{ user }] = useSession()
+  const [{ user }, { login }] = useSession()
 
   const configTypes = configs?.order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
   const isPreOrder = configs?.preorder_status_enabled?.value === '1'
@@ -134,6 +140,11 @@ const MultiCheckoutUI = (props: any) => {
   const [phoneUpdate, setPhoneUpdate] = useState(false);
   const [userErrors, setUserErrors] = useState<any>([]);
   const [placeByMethodPay, setPlaceByMethodPay] = useState(false)
+	const [allowedGuest, setAllowedGuest] = useState(false)
+	const [isOpen, setIsOpen] = useState(false)
+	const [requiredFields, setRequiredFields] = useState<any>([])
+	const stripePaymethods: any = ['stripe', 'stripe_direct', 'stripe_connect', 'stripe_redirect']
+	const [openModal, setOpenModal] = useState({ login: false, signup: false, isGuest: false })
   const [methodPaySupported, setMethodPaySupported] = useState({ enabled: false, message: null, loading: true })
   const methodsPay = ['global_google_pay', 'global_apple_pay']
   const isDisablePlaceOrderButton = cartGroup?.loading || (!(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) && cartGroup?.result?.balance > 0) ||
@@ -151,11 +162,12 @@ const MultiCheckoutUI = (props: any) => {
     setUserErrors([])
     const errors = []
     const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes']
+		const _requiredFields: any = []
 
     Object.values(validationFields?.fields?.checkout).map((field: any) => {
       if (field?.required && !notFields.includes(field.code)) {
         if (!user[field?.code]) {
-          errors.push(t(`VALIDATION_ERROR_${field.code.toUpperCase()}_REQUIRED`, `The field ${field?.name} is required`))
+          _requiredFields.push(field?.code)
         }
       }
     })
@@ -166,8 +178,9 @@ const MultiCheckoutUI = (props: any) => {
         validationFields?.fields?.checkout?.cellphone?.required) ||
         configs?.verification_phone_required?.value === '1')
     ) {
-      errors.push(t('VALIDATION_ERROR_MOBILE_PHONE_REQUIRED', 'The field Phone number is required'))
+      _requiredFields.push('cellphone')
     }
+		setRequiredFields(_requiredFields)
 
     if (phoneUpdate) {
       errors.push(t('NECESSARY_UPDATE_COUNTRY_PHONE_CODE', 'It is necessary to update your phone number'))
@@ -181,10 +194,19 @@ const MultiCheckoutUI = (props: any) => {
   }
 
   const handlePlaceOrder = (confirmPayment?: any) => {
-    if (!userErrors.length) {
+    if (stripePaymethods.includes(paymethodSelected?.gateway) && user?.guest_id) {
+			setOpenModal({ ...openModal, signup: true, isGuest: true })
+			return
+		}
+
+    if (!userErrors.length && (!requiredFields?.length || allowedGuest)) {
       handleGroupPlaceOrder && handleGroupPlaceOrder(confirmPayment)
       return
     }
+    if (requiredFields?.length) {
+			setIsOpen(true)
+			return
+		}
     let stringError = ''
     Object.values(userErrors).map((item: any, i: number) => {
       stringError += (i + 1) === userErrors.length ? `- ${item?.message || item}` : `- ${item?.message || item}\n`
@@ -193,6 +215,24 @@ const MultiCheckoutUI = (props: any) => {
     setIsUserDetailsEdit(true)
   }
 
+  const handlePlaceOrderAsGuest = () => {
+		setIsOpen(false)
+		handleGroupPlaceOrder && handleGroupPlaceOrder()
+	}
+
+  const handleSuccessSignup = (user: any) => {
+		login({
+			user,
+			token: user?.session?.access_token
+		})
+		openModal?.isGuest && handlePlaceOrderAsGuest()
+		setOpenModal({ ...openModal, signup: false, isGuest: false })
+	}
+
+	const handleSuccessLogin = (user: any) => {
+		if (user) setOpenModal({ ...openModal, login: false })
+	}
+
   useEffect(() => {
     if (validationFields && validationFields?.fields?.checkout) {
       checkValidationFields()
@@ -285,15 +325,45 @@ const MultiCheckoutUI = (props: any) => {
 
           <ChSection>
             <ChUserDetails>
-              <UserDetails
-                isUserDetailsEdit={isUserDetailsEdit}
-                useValidationFields
-                useDefualtSessionManager
-                useSessionUser
-                isCheckout
-                phoneUpdate={phoneUpdate}
-                togglePhoneUpdate={togglePhoneUpdate}
-              />
+              {(user?.guest_id && !allowedGuest) ? (
+                <View>
+                  <OText size={14} numberOfLines={1} ellipsizeMode='tail' color={theme.colors.textNormal}>
+                    {t('CUSTOMER_DETAILS', 'Customer details')}
+                  </OText>
+                  <OButton
+                    text={t('SIGN_UP', 'Sign up')}
+                    textStyle={{ color: theme.colors.white }}
+                    style={{ borderRadius: 7.6, marginTop: 20 }}
+                    onClick={() => setOpenModal({ ...openModal, signup: true })}
+                  />
+                  <OButton
+                    text={t('LOGIN', 'Login')}
+                    textStyle={{ color: theme.colors.primary }}
+                    bgColor={theme.colors.white}
+                    borderColor={theme.colors.primary}
+                    style={{ borderRadius: 7.6, marginTop: 20 }}
+                    onClick={() => setOpenModal({ ...openModal, login: true })}
+                  />
+                  <OButton
+                    text={t('CONTINUE_AS_GUEST', 'Continue as guest')}
+                    textStyle={{ color: theme.colors.black }}
+                    bgColor={theme.colors.white}
+                    borderColor={theme.colors.black}
+                    style={{ borderRadius: 7.6, marginTop: 20 }}
+                    onClick={() => setAllowedGuest(true)}
+                  />
+                </View>
+              ) : (
+                <UserDetails
+                  isUserDetailsEdit={isUserDetailsEdit}
+                  useValidationFields
+                  useDefualtSessionManager
+                  useSessionUser
+                  isCheckout
+                  phoneUpdate={phoneUpdate}
+                  togglePhoneUpdate={togglePhoneUpdate}
+                />
+              )}
             </ChUserDetails>
             <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginHorizontal: -40 }} />
           </ChSection>
@@ -484,6 +554,58 @@ const MultiCheckoutUI = (props: any) => {
             </OText>
           )}
         </ChContainer>
+        <OModal
+          open={openModal.signup}
+          onClose={() => setOpenModal({ ...openModal, signup: false, isGuest: false })}
+        >
+          <ScrollView style={{ paddingHorizontal: 20, width: '100%' }}>
+            <SignupForm
+              handleSuccessSignup={handleSuccessSignup}
+              isGuest
+              signupButtonText={t('SIGNUP', 'Signup')}
+              useSignupByEmail
+              useChekoutFileds
+            />
+          </ScrollView>
+        </OModal>
+        <OModal
+          open={openModal.login}
+          onClose={() => setOpenModal({ ...openModal, login: false })}
+        >
+          <ScrollView style={{ paddingHorizontal: 20, width: '100%' }}>
+            <LoginForm
+              handleSuccessLogin={handleSuccessLogin}
+              isGuest
+              loginButtonText={t('LOGIN', 'Login')}
+              loginButtonBackground={theme.colors.primary}
+            />
+          </ScrollView>
+        </OModal>
+        <OModal
+						open={isOpen}
+						onClose={() => setIsOpen(false)}
+					>
+						<View style={styles.detailWrapper}>
+							<UserDetails
+								isUserDetailsEdit
+								useValidationFields
+								useDefualtSessionManager
+								useSessionUser
+								isCheckout
+								isEdit
+								phoneUpdate={phoneUpdate}
+								togglePhoneUpdate={togglePhoneUpdate}
+								requiredFields={requiredFields}
+								hideUpdateButton
+								handlePlaceOrderAsGuest={handlePlaceOrderAsGuest}
+								onClose={() => {
+									setIsOpen(false)
+									handlePlaceOrder()
+								}}
+								setIsOpen={setIsOpen}
+							/>
+						</View>
+					</OModal>
       </Container>
 
       <FloatingButton

package/themes/original/src/components/OrderProgress/index.tsx

@@ -208,7 +208,8 @@ export const OrderProgress = (props: any) => {
       initialPage: 1,
       pageSize: 10,
       controlType: 'infinity'
-    }
+    },
+    noGiftCardOrders: true
   }
 
   return <OrderList {...orderProgressProps} />

package/themes/original/src/components/PaymentOptions/index.tsx

@@ -11,6 +11,7 @@ import {
 	useLanguage,
 	ToastType,
 	useToast,
+	useSession
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import { PaymentOptionCash } from '../PaymentOptionCash';
@@ -78,6 +79,7 @@ const PaymentOptionsUI = (props: any) => {
 
 	const theme = useTheme();
 	const [, { showToast }] = useToast();
+	const [{ user }] = useSession()
 	const { confirmApplePayPayment } = useApplePay()
 
 	const getPayIcon = (method: string) => {
@@ -120,7 +122,7 @@ const PaymentOptionsUI = (props: any) => {
 	const paymethodsFieldRequired = ['paypal', 'apple_pay', 'global_apple_pay']
 
 	const handlePaymentMethodClick = (paymethod: any) => {
-		if (cart?.balance > 0) {
+		if (cart?.balance > 0 || !!user?.guest_id) {
 			if (paymethodsFieldRequired.includes(paymethod?.gateway) && requiredFields.length > 0) {
 				openUserModal && openUserModal(true)
 				setPaymethodClicked({

package/themes/original/src/components/ProductForm/index.tsx

@@ -505,7 +505,7 @@ export const ProductOptionsUI = (props: any) => {
 					<TouchableOpacity style={{ marginTop: 10 }} onPress={handleUpdateGuest}>
 						{actionStatus?.loading ? (
 							<Placeholder Animation={Fade}>
-								<PlaceholderLine width={60} height={20} />
+								<PlaceholderLine height={20} />
 							</Placeholder>
 						) : (
 							<OText color={theme.colors.primary} size={13} style={{ textAlign: 'center' }}>{t('AS_GUEST_USER', 'As guest user')}</OText>

package/themes/business/src/components/StarPrinter/SearchPrinter.tsx

@@ -1,94 +0,0 @@
-import { OIconButton } from 'ordering-ui-react-native/themes/business/src/components/shared';
-import React, { useState } from 'react';
-import {
-  View,
-  Text,
-  Button,
-  FlatList,
-} from 'react-native';
-
-import {
-  InterfaceType,
-  StarDeviceDiscoveryManager,
-  StarDeviceDiscoveryManagerFactory,
-  StarPrinter
-} from 'react-native-star-io10';
-import { useTheme } from 'styled-components';
-
-export const SearchStarPrinter = ({ navigation }: any) => {
-
-  const theme = useTheme();
-  let _manager: StarDeviceDiscoveryManager;
-
-  const [state, setState] = useState({
-    bluetoonabled: true,
-    printers: [],
-  })
-
-  let _onPressDiscoveryButton = async () => {
-    setState({
-      ...state,
-      printers: [],
-    });
-
-    try {
-      await _manager?.stopDiscovery()
-
-      var interfaceTypes: Array<InterfaceType> = []
-      if (state.bluetoonabled) {
-        interfaceTypes.push(InterfaceType.Bluetooth);
-      }
-
-      _manager = await StarDeviceDiscoveryManagerFactory.create(interfaceTypes);
-      _manager.discoveryTime = 10000;
-
-      _manager.onPrinterFound = (printer: StarPrinter) => {
-        const printers = state.printers;
-        printers.push(printer);
-        setState({
-          ...state,
-          printers: printers
-        });
-
-        console.log(`Found printer: ${printer.connectionSettings.identifier}.`);
-      };
-
-      _manager.onDiscoveryFinished = () => {
-        console.log(`Discovery finished.`);
-      };
-
-      await _manager.startDiscovery();
-    }
-    catch (error) {
-      console.log(`Error: ${String(error)}`);
-    }
-  }
-
-  const handleArrowBack: any = () => {
-    navigation?.canGoBack() && navigation.goBack();
-  };
-
-  return (
-    <View style={{ margin: 50 }}>
-      <OIconButton
-        icon={theme.images.general.arrow_left}
-        iconStyle={{ width: 20, height: 20 }}
-        borderColor={theme.colors.clear}
-        style={{ maxWidth: 40, justifyContent: 'flex-end' }}
-        onClick={() => handleArrowBack()}
-      />
-      <View
-        style={{ width: 100, marginTop: 30 }}>
-        <Button
-          title="Discovery"
-          onPress={_onPressDiscoveryButton}
-        />
-      </View>
-      <FlatList
-        style={{ marginTop: 30 }}
-        data={state.printers}
-        renderItem={({ item }) => <Text>{item.connectionSettings.interfaceType} : {item.connectionSettings.identifier}</Text>}
-        keyExtractor={(item, index) => index.toString()} />
-    </View>
-  );
-};

package/themes/business/src/components/StarPrinter/index.tsx

@@ -1,156 +0,0 @@
-import React, { useState } from 'react';
-import {
-  InterfaceType,
-  StarConnectionSettings,
-  StarXpandCommand,
-  StarPrinter
-} from 'react-native-star-io10';
-import { Picker } from '@react-native-picker/picker';
-import {
-  View,
-  Text,
-  Button,
-  TextInput,
-} from 'react-native';
-
-
-export const HandleStarPrinter = ({ navigation }: any) => {
-
-  const [printState, setPrintState] = useState({
-    interfaceType: InterfaceType.Bluetooth,
-    identifier: '',
-    imageBase64: ''
-  });
-
-  const _onPressPrintButton = async () => {
-
-    let settings = new StarConnectionSettings();
-    settings.interfaceType = printState.interfaceType;
-    settings.identifier = printState.identifier;
-
-    let printer = new StarPrinter(settings);
-
-    try {
-      let builder = new StarXpandCommand.StarXpandCommandBuilder();
-      builder.addDocument(new StarXpandCommand.DocumentBuilder()
-        .addPrinter(new StarXpandCommand.PrinterBuilder()
-          .actionPrintImage(new StarXpandCommand.Printer.ImageParameter("logo_01.png", 406))
-          .styleInternationalCharacter(StarXpandCommand.Printer.InternationalCharacterType.Usa)
-          .styleCharacterSpace(0)
-          .styleAlignment(StarXpandCommand.Printer.Alignment.Center)
-          .actionPrintText("Star Clothing Boutique\n" +
-            "123 Star Road\n" +
-            "City, State 12345\n" +
-            "\n")
-          .styleAlignment(StarXpandCommand.Printer.Alignment.Left)
-          .actionPrintText("Date:MM/DD/YYYY    Time:HH:MM PM\n" +
-            "--------------------------------\n" +
-            "\n")
-          .actionPrintText("SKU         Description    Total\n" +
-            "300678566   PLAIN T-SHIRT  10.99\n" +
-            "300692003   BLACK DENIM    29.99\n" +
-            "300651148   BLUE DENIM     29.99\n" +
-            "300642980   STRIPED DRESS  49.99\n" +
-            "300638471   BLACK BOOTS    35.99\n" +
-            "\n" +
-            "Subtotal                  156.95\n" +
-            "Tax                         0.00\n" +
-            "--------------------------------\n")
-          .actionPrintText("Total     ")
-          .add(new StarXpandCommand.PrinterBuilder()
-            .styleMagnification(new StarXpandCommand.MagnificationParameter(2, 2))
-            .actionPrintText("   $156.95\n")
-          )
-          .actionPrintText("--------------------------------\n" +
-            "\n" +
-            "Charge\n" +
-            "156.95\n" +
-            "Visa XXXX-XXXX-XXXX-0123\n" +
-            "\n")
-          .add(new StarXpandCommand.PrinterBuilder()
-            .styleInvert(true)
-            .actionPrintText("Refunds and Exchanges\n")
-          )
-          .actionPrintText("Within ")
-          .add(new StarXpandCommand.PrinterBuilder()
-            .styleUnderLine(true)
-            .actionPrintText("30 days")
-          )
-          .actionPrintText(" with receipt\n")
-          .actionPrintText("And tags attached\n" +
-            "\n")
-          .styleAlignment(StarXpandCommand.Printer.Alignment.Center)
-          .actionPrintBarcode(new StarXpandCommand.Printer.BarcodeParameter('0123456',
-            StarXpandCommand.Printer.BarcodeSymbology.Jan8)
-            .setBarDots(3)
-            .setBarRatioLevel(StarXpandCommand.Printer.BarcodeBarRatioLevel.Level0)
-            .setHeight(5)
-            .setPrintHri(true))
-          .actionFeedLine(1)
-          .actionPrintQRCode(new StarXpandCommand.Printer.QRCodeParameter('Hello World.\n')
-            .setModel(StarXpandCommand.Printer.QRCodeModel.Model2)
-            .setLevel(StarXpandCommand.Printer.QRCodeLevel.L)
-            .setCellSize(8))
-          .actionCut(StarXpandCommand.Printer.CutType.Partial)
-        )
-      );
-
-      let commands = await builder.getCommands();
-
-      await printer.open();
-      await printer.print(commands);
-
-      console.log(`Success`);
-    }
-    catch (error) {
-      console.log(`Error: ${String(error)}`);
-    }
-    finally {
-      await printer.close();
-      await printer.dispose();
-    }
-  }
-
-  const onSearchPrint = () => {
-    navigation.navigate('SearchStarPrinter')
-  }
-
-  return (
-    <View style={{ margin: 50 }}>
-      <View style={{ flexDirection: 'row' }}>
-        <Text style={{ width: 100 }}>Interface</Text>
-        <Picker
-          style={{ width: 200, marginLeft: 20, justifyContent: 'center' }}
-          selectedValue={printState.interfaceType}
-          onValueChange={(value) => {
-            setPrintState({ interfaceType: value });
-          }}>
-          <Picker.Item label='Bluetooth' value={InterfaceType.Bluetooth} />
-        </Picker>
-      </View>
-      <View style={{ flexDirection: 'row', marginTop: 30 }}>
-        <Text style={{ width: 100 }}>Identifier</Text>
-        <TextInput
-          style={{ width: 200, marginLeft: 20 }}
-          value={printState.identifier}
-          onChangeText={(value) => {
-            setPrintState({ identifier: value });
-          }}
-        />
-      </View>
-      <View style={{ width: 100, marginTop: 20 }}>
-        <Button
-          title="Search Printer"
-          onPress={onSearchPrint}
-        />
-      </View>
-      <View style={{ width: 100, marginTop: 20 }}>
-        <Button
-          title="Print"
-          onPress={_onPressPrintButton}
-        />
-      </View>
-    </View>
-  );
-};
-