ordering-ui-react-native 0.21.39-test → 0.21.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.21.39-test",
+  "version": "0.21.39",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",
@@ -45,7 +45,6 @@
     "@react-native-firebase/analytics": "^12.9.3",
     "@react-native-firebase/app": "^12.9.3",
     "@react-native-google-signin/google-signin": "^7.0.1",
-    "@react-native-picker/picker": "^2.4.10",
     "@react-navigation/drawer": "^5.10.2",
     "@react-navigation/material-bottom-tabs": "^5.3.14",
     "@react-navigation/native": "^5.7.6",
@@ -111,7 +110,6 @@
     "react-native-signature-canvas": "^4.3.0",
     "react-native-snap-carousel": "^3.9.1",
     "react-native-sound": "^0.11.1",
-    "react-native-star-io10": "^1.3.0",
     "react-native-swipe-gestures": "^1.0.5",
     "react-native-swiper": "^1.6.0",
     "react-native-tracking-transparency": "^0.1.1",

package/themes/business/index.tsx

@@ -42,8 +42,6 @@ import { NewOrderNotification } from './src/components/NewOrderNotification';
 import { DriverSchedule } from './src/components/DriverSchedule';
 import { ScheduleBlocked } from './src/components/ScheduleBlocked';
 import { OrderDetailsLogistic } from './src/components/OrderDetailsLogistic'
-import { HandleStarPrinter } from './src/components/StarPrinter';
-import { SearchStarPrinter } from './src/components/StarPrinter/SearchPrinter';
 //OComponents
 import {
   OText,
@@ -132,7 +130,4 @@ export {
   useLocation,
   // providers
   StoreMethods,
-  //printer
-  HandleStarPrinter,
-  SearchStarPrinter,
 };

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

@@ -1,8 +1,6 @@
 import React, { useState } from 'react';
 import { OText, OIconButton } from '../shared';
-import {
-  StyleSheet, View, Platform, Alert
-} from 'react-native';
+import { StyleSheet, View, Platform, Alert } from 'react-native';
 import {
   Content,
   OrderCustomer,
@@ -22,8 +20,8 @@ import { FloatingButton } from '../FloatingButton';
 import RNHTMLtoPDF from 'react-native-html-to-pdf';
 import RNPrint from 'react-native-print';
 import { useTheme } from 'styled-components/native';
-import { ProductItemAccordion } from '../ProductItemAccordion';
 
+import { ProductItemAccordion } from '../ProductItemAccordion';
 
 export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermission, getPermissions, isGrantedPermissions, checkBluetoothPermission }: any) => {
   const handleArrowBack: any = () => {
@@ -36,7 +34,6 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
     selectedPrinter: { url: undefined },
   });
 
-
   const getFormattedSubOptionName = ({ quantity, name, position, price }: any) => {
     if (name !== 'No') {
       const pos = position && position !== 'whole' ? `(${t(position.toUpperCase(), position)})` : '';
@@ -343,10 +340,6 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
     }
   };
 
-  const openPrint = () => {
-    navigation.navigate('HandleStarPrinter')
-  }
-
   return (
     <>
       <Content>
@@ -686,7 +679,7 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
 
       <View style={{ marginBottom: 0 }}>
         <FloatingButton
-          firstButtonClick={() => openPrint()}
+          firstButtonClick={() => handlePrint()}
           btnText={t('PRINT', 'Print')}
           color={theme.colors.green}
           widthButton={'100%'}

package/themes/kiosk/src/components/LoginForm/index.tsx

@@ -52,7 +52,7 @@ const LoginFormUI = (props: LoginParams) => {
   } = props;
 
   const theme = useTheme()
-  const [{ configs }] = useConfig()
+  const [{ configs }, { refreshConfigs }] = useConfig()
   const [ordering, { setOrdering }] = useApi();
   const [, { showToast }] = useToast();
   const [, t] = useLanguage();
@@ -347,13 +347,16 @@ const LoginFormUI = (props: LoginParams) => {
           project: projectName
         })
       }
-      if (isDeviceLoginEnabled) {
-        props.handleChangeTab('device_code')
-      }
     }, 1500)
     return () => clearTimeout(projectInputTimeout);
   }, [projectName, isDeviceLoginEnabled])
 
+  useEffect(() => {
+    if (ordering?.project) {
+      refreshConfigs()
+    }
+  }, [ordering?.project])
+
   const logo = (
     <LogoWrapper>
       <OIcon src={theme.images.logos.logotype} style={styles.logo} />

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

@@ -106,7 +106,6 @@ const BusinessInformationUI = (props: BusinessInformationParams) => {
 										location={businessLocation.location}
 										markerTitle={businessState?.business?.name}
 										businessZones={businessState?.business?.zones}
-										delta={30}
 									/>
 								</WrapBusinessMap>
 							)}

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

@@ -192,7 +192,11 @@ const CheckoutUI = (props: any) => {
 	}, cart?.subtotal)
 
 	const validateCommentsCartField = validationFields?.fields?.checkout?.comments?.enabled && validationFields?.fields?.checkout?.comments?.required && (cart?.comment === null || cart?.comment?.trim().length === 0)
-	const validateZipcodeCard = validationFields?.fields?.card?.zipcode?.enabled && validationFields?.fields?.card?.zipcode?.required && !paymethodSelected?.data?.card?.zipcode
+	const validateZipcodeCard = validationFields?.fields?.card?.zipcode?.enabled &&
+		validationFields?.fields?.card?.zipcode?.required &&
+		paymethodSelected?.data?.card &&
+		!paymethodSelected?.data?.card?.zipcode &&
+		paymethodSelected?.gateway === 'stripe'
 
 	const isDisabledButtonPlace = loading || !cart?.valid || (!paymethodSelected && cart?.balance > 0) ||
 		placing || errorCash || subtotalWithTaxes < cart?.minimum ||

package/themes/original/src/components/GiftCard/RedeemGiftCard/index.tsx

@@ -106,7 +106,7 @@ const RedeemGiftCardUI = (props: any) => {
                   onChange(val)
                   handleChangeCode(val)
                 }}
-                autoCapitalize='none'
+                autoCapitalize='characters'
                 autoCorrect={false}
                 blurOnSubmit={false}
                 style={style.inputStyle}

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

@@ -129,7 +129,8 @@ export const LastOrder = (props: OrdersOptionParams) => {
 			initialPage: 1,
 			pageSize: 3,
 			controlType: 'infinity'
-		}
+		},
+		noGiftCardOrders: true
 	}
 
 	return <OrderList {...MyOrdersProps} />

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

@@ -117,7 +117,8 @@ export const LastOrders = (props: any) => {
       initialPage: 1,
       pageSize: 3,
       controlType: 'infinity'
-    }
+    },
+    noGiftCardOrders: true
   }
   return <OrderListController {...helpProps} />
 }

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,80 +0,0 @@
-import React, { useState } from 'react';
-import {
-  View,
-  Text,
-  Button,
-  FlatList,
-} from 'react-native';
-
-import {
-  InterfaceType,
-  StarDeviceDiscoveryManager,
-  StarDeviceDiscoveryManagerFactory,
-  StarPrinter
-} from 'react-native-star-io10';
-
-export const SearchStarPrinter = () => {
-
-  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)}`);
-    }
-  }
-
-  return (
-    <View style={{ margin: 50 }}>
-      <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('HandleStarPrinter')
-  }
-
-  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 style={{ width: 100, marginTop: 20 }}>
-          <Button
-            title="Search Printer"
-            onPress={onSearchPrint}
-          />
-        </View>
-      </View>
-      <View style={{ width: 100, marginTop: 20 }}>
-        <Button
-          title="Print"
-          onPress={_onPressPrintButton}
-        />
-      </View>
-    </View>
-  );
-};
-