ordering-ui-react-native 0.22.34 → 0.22.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.22.34",
+  "version": "0.22.36",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

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

@@ -11,7 +11,8 @@ import {
   useToast,
   useLanguage,
   useUtils,
-  useConfig
+  useConfig,
+  useValidationFields
 } from 'ordering-components/native';
 import {
   CenterView,
@@ -57,7 +58,8 @@ const ProfileUI = (props: ProfileParams) => {
   const [, t] = useLanguage();
   const [, { showToast }] = useToast();
   const [{ optimizeImage }] = useUtils();
-  const [{ configs }] = useConfig()
+  const [{ configs }] = useConfig();
+  const [{ loading }, { loadOriginalValidationFields }] = useValidationFields()
   const { errors } = useForm();
   const theme = useTheme();
 
@@ -262,15 +264,17 @@ const ProfileUI = (props: ProfileParams) => {
 
   return (
     <>
-      {validationFields?.error && (
+      {validationFields?.error && !loading && (
         <NotFoundSource
           content={
-            validationFields?.error[0] ||
-            validationFields?.error[0]?.message ||
+            validationFields?.error?.[0] ||
+            validationFields?.error?.[0]?.message ||
             t('NETWORK_ERROR', 'Network Error')
           }
           image={theme.images.general.notFound}
           conditioned={false}
+          onClickButton={() => loadOriginalValidationFields({ forceLoading: true })}
+          btnTitle={t('REFRESH_PROFILE', 'Refresh profile')}
         />
       )}
 

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

@@ -31,7 +31,8 @@ const CheckoutUI = (props: any) => {
     paymethodSelected,
     handlePaymethodChange,
     handlerClickPlaceOrder,
-    onNavigationRedirect
+    onNavigationRedirect,
+    isKiosk
   } = props
 
   const [errorCash, setErrorCash] = useState(false);
@@ -68,6 +69,7 @@ const CheckoutUI = (props: any) => {
         isLoading={cartState.loading || businessDetails.loading}
         paymethods={businessDetails?.business?.paymethods}
         setErrorCash={setErrorCash}
+        isKiosk={isKiosk}
       />
     </>
   )
@@ -84,7 +86,7 @@ export const Checkout = (props: any) => {
   const [, { showToast }] = useToast();
   const [{ token }] = useSession();
   const [ordering] = useApi();
-  const [,{ confirmCart }] = useOrder();
+  const [, { confirmCart }] = useOrder();
 
   const [cartState, setCartState] = useState<any>({ loading: true, error: [], cart: null });
 
@@ -109,7 +111,7 @@ export const Checkout = (props: any) => {
           const confirmCartRes = await confirmCart(cartUuid)
           if (confirmCartRes.error) {
             showToast(ToastType.Error, confirmCartRes.error.message)
-          }getOrder
+          } getOrder
           getOrder
           if (confirmCartRes.result.order?.uuid) {
             onNavigationRedirect('OrderDetails', { orderId: confirmCartRes.result.order.uuid, isFromCheckout: true })

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

@@ -81,7 +81,7 @@ const CustomerName = (props: Props): React.ReactElement => {
       <OButton
         text={t('SKIP', 'Skip')}
         onClick={onSkip}
-        textStyle={{ color: theme.colors.primary, fontSize: 20 }}
+        textStyle={{ color: theme.colors.primary, fontSize: 18 }}
         parentStyle={{
           height: orientationState?.orientation === PORTRAIT
             ? 50 : 100

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

@@ -24,11 +24,6 @@ import MaterialIcon from 'react-native-vector-icons/MaterialCommunityIcons'
 
 const PaymentOptionsUI = (props: any) => {
   const {
-    cart,
-    onNavigationRedirect,
-    isDisabled,
-    paymethodData,
-    handlePaymethodDataChange,
     errorCash,
     isLoading,
     paymethodsList,
@@ -48,11 +43,11 @@ const PaymentOptionsUI = (props: any) => {
   const [orientationState] = useDeviceOrientation();
   const [userErrors, setUserErrors] = useState<any>([]);
   const [isOpenModal, setIsOpenModal] = useState(false)
-  const paymethodSelected =
-    paySelected || props.paymethodSelected || isOpenMethod.paymethod;
+  const paymethodSelected = paySelected || props.paymethodSelected || isOpenMethod.paymethod;
+  const includePaymethods = ['cash', 'card_delivery'];
 
   useEffect(() => {
-    if (paymethodsList.paymethods.length === 1) {
+    if (paymethodsList?.paymethods?.length === 1) {
       handlePaymethodClick &&
         handlePaymethodClick(paymethodsList.paymethods[0]);
     }
@@ -85,23 +80,11 @@ const PaymentOptionsUI = (props: any) => {
     }
   }, [isOpenMethod.paymethod, placing, isLoading, paySelected]);
 
-  // const includePaymethods = ['cash', 'card_delivery', 'stripe'];
-  const includePaymethods = ['cash', 'card_delivery'];
-
-  const supportedMethods = paymethodsList.paymethods.filter((p: any) =>
+  const supportedMethods = paymethodsList?.paymethods?.filter((p: any) =>
     includePaymethods.includes(p.gateway),
   );
 
-  const cashIndex: number = supportedMethods?.findIndex(
-    (item: any) => item?.gateway === 'cash',
-  );
-  const cardOnDeliveryIndex = supportedMethods?.findIndex(
-    (item: any) => item?.gateway === 'card_delivery',
-  );
-  const stripeIndex = supportedMethods?.findIndex(
-    (item: any) => item?.gateway === 'stripe',
-  );
-  const onSelectPaymethod = (paymethod: any, isPopupMethod: boolean) => {
+  const onSelectPaymethod = (paymethod: any) => {
     handlePaymethodClick(paymethod);
   };
 
@@ -132,57 +115,15 @@ const PaymentOptionsUI = (props: any) => {
         : orientationState?.dimensions?.height * 0.55,
   };
 
-  const propsOfItems = {
-    CASH_ID:
-      cashIndex !== -1
-        ? {
-          style: cardStyle,
-          title: t('CASH', 'Cash'),
-          description: t(
-            'GO_FOR_YOR_RECEIPT_AND_GO_TO_THE_FRONT_COUNTER',
-            'Pay with cash in the front counter',
-          ),
-          bgImage: theme.images.general.cash,
-          callToActionText: t('LETS_GO', 'LETS_GO'),
-          VectorIcon: () => <AntIconDesign name='shoppingcart' size={28} color='white' style={{ marginBottom: 10 }} />,
-          onClick: () =>
-            onSelectPaymethod(supportedMethods[cashIndex], false),
-          ...supportedMethods[cashIndex],
-        }
-        : null,
-
-    CARD_ON_DELIVERY_ID:
-      cardOnDeliveryIndex !== -1
-        ? {
-          style: cardStyle,
-          title: t('CARD', supportedMethods[cardOnDeliveryIndex]?.name),
-          description: t(
-            'WE_ACCEPT_EVERY_DEBIT_OR_CREDIT_CARD',
-            'We accept every debit or credit card',
-          ),
-          bgImage: theme.images.general.carddelivery,
-          callToActionText: t("LETS_GO", "Let's go"),
-          VectorIcon: () => <MaterialIcon name='pin-outline' size={28} color='white' style={{ marginBottom: 10 }} />,
-          onClick: () => onSelectPaymethod(supportedMethods[cardOnDeliveryIndex], false),
-          ...supportedMethods[cardOnDeliveryIndex],
-        }
-        : null,
-    STRIPE:
-      stripeIndex !== -1
-        ? {
-          style: cardStyle,
-          title: t('STRIPE', supportedMethods[stripeIndex]?.name),
-          description: t('STRIPE', 'Stripe'),
-          bgImage: theme.images.general.carddelivery,
-          callToActionText: t('INSERT_INFO', 'Test info'),
-          VectorIcon: () => <MaterialIcon name='pin-outline' size={28} color='white' style={{ marginBottom: 10 }} />,
-          onClick: () => {
-            onSelectPaymethod(supportedMethods[stripeIndex], false);
-            setIsOpenModal(true)
-          },
-          ...supportedMethods[stripeIndex],
-        }
-        : null,
+  const description = {
+    cash: t(
+      'GO_FOR_YOR_RECEIPT_AND_GO_TO_THE_FRONT_COUNTER',
+      'Pay with cash in the front counter',
+    ),
+    card_delivery: t(
+      'WE_ACCEPT_EVERY_DEBIT_OR_CREDIT_CARD',
+      'We accept every debit or credit card',
+    ),
   };
 
   const goToBack = () => navigation?.goBack();
@@ -192,47 +133,40 @@ const PaymentOptionsUI = (props: any) => {
       <Spinner visible={isLoading || placing || paymethodsList?.loading} />
 
       <Container nestedScrollEnabled>
-        {supportedMethods?.length > 0 && (
-          <>
-            <NavBar
-              title={t('PAYMENT_METHODS', 'Payment methods')}
-              onActionLeft={goToBack}
-              btnStyle={{ paddingLeft: 0 }}
-            />
-
-            <View
-              style={{ marginVertical: orientationState?.dimensions?.height * 0.03 }}>
-              <OText size={orientationState?.dimensions?.width * 0.048}>
-                {t('HOW_WOULD_YOU', 'How would you')} {'\n'}
-                <OText
-                  size={orientationState?.dimensions?.width * 0.048}
-                  weight={'700'}>
-                  {`${t('LIKE_TO_PAY', 'like to pay')}?`}
-                </OText>
-              </OText>
-            </View>
-
-            <GridContainer style={{ justifyContent: 'space-between' }}>
-              {propsOfItems.CARD_ON_DELIVERY_ID && (
-                <View style={{ marginBottom: orientationState?.orientation === LANDSCAPE ? 20 : 0 }}>
-                  <OptionCard {...propsOfItems?.CARD_ON_DELIVERY_ID} styke />
-                </View>
-              )}
-
-              <View
-                style={{
-                  width:
-                    orientationState?.orientation === LANDSCAPE
-                      ? orientationState?.dimensions?.width * 0.0016
-                      : 1,
-                  height:
-                    orientationState?.orientation === PORTRAIT
-                      ? orientationState?.dimensions?.height * 0.018
-                      : 1,
-                }}
-              />
-
-              {propsOfItems?.CASH_ID && <OptionCard {...propsOfItems?.CASH_ID} />}
+        <NavBar
+          title={t('PAYMENT_METHODS', 'Payment methods')}
+          onActionLeft={goToBack}
+          btnStyle={{ paddingLeft: 0 }}
+        />
+
+        <View
+          style={{ marginVertical: orientationState?.dimensions?.height * 0.03 }}>
+          <OText size={orientationState?.dimensions?.width * 0.048}>
+            {t('HOW_WOULD_YOU', 'How would you')} {'\n'}
+            <OText
+              size={orientationState?.dimensions?.width * 0.048}
+              weight={'700'}>
+              {`${t('LIKE_TO_PAY', 'like to pay')}?`}
+            </OText>
+          </OText>
+        </View>
+
+        <GridContainer style={{ justifyContent: 'space-between' }}>
+          {supportedMethods?.length > 0 ? (supportedMethods?.map((paymethod: any, i: number) => (
+            <>
+              <View style={{ marginBottom: orientationState?.orientation === LANDSCAPE ? 20 : 0 }}>
+                <OptionCard
+                  {...{
+                    style: cardStyle,
+                    title: t(`${paymethod.gateway.toUpperCase().replace(/\s/g, '_')}`, paymethod.name),
+                    description: description[paymethod.gateway] ?? t(`${paymethod.gateway.toUpperCase().replace(/\s/g, '_')}`, paymethod.name),
+                    bgImage: paymethod.name === 'Cash' ? theme.images.general.cash : theme.images.general.carddelivery,
+                    callToActionText: paymethod.name === 'Cash' ? t('LETS_GO', 'LETS_GO') : t('INSERT_INFO', 'Test info'),
+                    VectorIcon: () => paymethod.name === 'Cash' ? <AntIconDesign name='shoppingcart' size={28} color='white' style={{ marginBottom: 10 }} /> : <MaterialIcon name='pin-outline' size={28} color='white' style={{ marginBottom: 10 }} />,
+                    onClick: () => onSelectPaymethod(paymethod, false),
+                  }}
+                />
+              </View>
 
               <View
                 style={{
@@ -246,13 +180,15 @@ const PaymentOptionsUI = (props: any) => {
                       : 1,
                 }}
               />
-
-              {propsOfItems.STRIPE && (
-                <OptionCard {...propsOfItems?.STRIPE} />
-              )}
-            </GridContainer>
-          </>
-        )}
+            </>
+          ))) : (
+            <OText
+              size={orientationState?.dimensions?.width * 0.048}
+              weight={'700'}>
+              {`${t('NO_PAYMETHODS_AVAILABLES', 'No paymethods availables')}`}
+            </OText>
+          )}
+        </GridContainer>
         <View style={{ height: orientationState?.dimensions?.height * 0.05 }} />
         <OModal
           open={isOpenModal}