ordering-ui-react-native 0.12.39 → 0.12.43

package/package.json

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

package/src/components/Cart/index.tsx

@@ -214,15 +214,15 @@ const CartUI = (props: any) => {
         {cart?.valid_products && (
           <CheckoutAction>
             <OButton
-              text={(cart?.subtotal_to_calculate >= cart?.minimum || !cart?.minimum) && cart?.valid_address ? (
-                !openUpselling !== canOpenUpselling ? t('CHECKOUT', 'Checkout') : t('LOADING', 'Loading')
-              ) : !cart?.valid_address ? (
-                `${t('OUT_OF_COVERAGE', 'Out of Coverage')}`
-              ) : (
+              text={!cart?.valid_address ? (
+                t('OUT_OF_COVERAGE', 'Out of Coverage')
+              ) : !cart?.valid_maximum ? (
+                `${t('MAXIMUM_SUBTOTAL_ORDER', 'Maximum subtotal order')}: ${parsePrice(cart?.maximum)}`
+              ) : (!cart?.valid_minimum && !(cart?.discount_type === 1 && cart?.discount_rate === 100)) ? (
                 `${t('MINIMUN_SUBTOTAL_ORDER', 'Minimum subtotal order:')} ${parsePrice(cart?.minimum)}`
-              )}
-              bgColor={(cart?.subtotal_to_calculate < cart?.minimum || !cart?.valid_address) ? theme.colors.secundary : theme.colors.primary}
-              isDisabled={(openUpselling && !canOpenUpselling) || cart?.subtotal_to_calculate < cart?.minimum || !cart?.valid_address}
+              ) : !openUpselling !== canOpenUpselling ? t('CHECKOUT', 'Checkout') : t('LOADING', 'Loading')}
+              bgColor={(!cart?.valid_maximum || (!cart?.valid_minimum && !(cart?.discount_type === 1 && cart?.discount_rate === 100)) || !cart?.valid_address) ? theme.colors.secundary : theme.colors.primary}
+              isDisabled={(openUpselling && !canOpenUpselling) || !cart?.valid_maximum || (!cart?.valid_minimum && !(cart?.discount_type === 1 && cart?.discount_rate === 100)) || !cart?.valid_address}
               borderColor={theme.colors.primary}
               imgRightSrc={null}
               textStyle={{ color: 'white', textAlign: 'center', flex: 1 }}

package/themes/business/src/components/OrderDetails/OrderContentComponent.tsx

@@ -250,7 +250,7 @@ export const OrderContentComponent = (props: OrderContent) => {
             {order?.customer?.zipcode}
           </OText>
         )}
-        {!order?.user_review && pastOrderStatuses.includes(order?.status) && !isCustomerReviewed && (
+        {/* {!order?.user_review && pastOrderStatuses.includes(order?.status) && !isCustomerReviewed && (
           <OButton
             style={styles.btnReview}
             textStyle={{ color: theme.colors.white }}
@@ -258,7 +258,7 @@ export const OrderContentComponent = (props: OrderContent) => {
             imgRightSrc={false}
             onClick={() => setOpenReviewModal(true)}
           />
-        )}
+        )} */}
       </OrderCustomer>
 
       <OrderProducts>

package/themes/single-business/src/components/ProductForm/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useRef } from 'react';
 import {
   ProductForm as ProductOptions,
   useSession,
@@ -9,7 +9,7 @@ import {
 import { useTheme } from 'styled-components/native';
 import { ProductIngredient } from '../ProductIngredient';
 import { ProductOption } from '../ProductOption';
-import { View, TouchableOpacity, StyleSheet, Dimensions, Platform, useWindowDimensions, Keyboard } from 'react-native';
+import { View, TouchableOpacity, StyleSheet, Dimensions, Platform, useWindowDimensions, Keyboard, KeyboardAvoidingView } from 'react-native';
 
 import {
   ProductHeader,
@@ -120,7 +120,7 @@ export const ProductOptionsUI = (props: any) => {
   const { top, bottom } = useSafeAreaInsets();
   const { height } = useWindowDimensions();
   const [selOpt, setSelectedOpt] = useState(0);
-
+  const scrollViewRef = useRef<any>()
   const isError = (id: number) => {
     let bgColor = theme.colors.white;
     if (errors[`id:${id}`]) {
@@ -241,6 +241,7 @@ export const ProductOptionsUI = (props: any) => {
     const keyboardDidShowListener = Keyboard.addListener(
       'keyboardDidShow',
       () => {
+        scrollViewRef?.current && scrollViewRef?.current?.scrollToEnd()
         setIsKeyboardShow(true);
       }
     );
@@ -259,7 +260,7 @@ export const ProductOptionsUI = (props: any) => {
 
   return (
     <>
-      <ScrollView style={{ height: windowHeight * 0.85 }}>
+      <ScrollView ref={scrollViewRef}>
         {!error && (
           <>
             <WrapHeader>
@@ -560,7 +561,7 @@ export const ProductOptionsUI = (props: any) => {
                       )}
                     </>
                   )}
-                  <ProductComment style={{ paddingBottom: isKeyboardShow ? 200 : 0 }}>
+                  <ProductComment>
                     <SectionTitle>
                       <OText size={16} weight={'600'} lineHeight={24}>
                         {t('SPECIAL_COMMENT', 'Special comment')}
@@ -597,7 +598,7 @@ export const ProductOptionsUI = (props: any) => {
         )}
       </ScrollView>
       {!loading && !error && product && (
-        <ProductActions style={{ maxHeight: windowHeight * 0.15 }}>
+        <ProductActions>
           <OText size={16} lineHeight={24} weight={'600'}>
             {productCart.total ? parsePrice(productCart?.total) : ''}
           </OText>

package/themes/single-business/src/components/ProductForm/styles.tsx

@@ -59,9 +59,12 @@ export const WrapperSubOption = styled.View`
 `
 
 export const ProductComment = styled.View`
+  padding-bottom: 40px
 `
 
 export const ProductActions = styled.View`
+  position: absolute;
+  bottom: 0px;
 	min-height: 70px;
   padding: 12px 40px;
   width: 100%;
@@ -72,7 +75,10 @@ export const ProductActions = styled.View`
   justify-content: space-between;
   border-top-width: 1px;
   border-top-color: ${(props: any) => props.theme.colors.border};
+  flex: 1;
+  flex-direction: row;
 `
+
 export const ExtraOptionWrap = styled.ScrollView`
 	margin-horizontal: -40px;
 `;

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

@@ -114,8 +114,9 @@ const ProfileUI = (props: ProfileParams) => {
 					console.log('ImagePicker Error: ', response.errorMessage);
 					showToast(ToastType.Error, response.errorMessage);
 				} else {
-					if (response.uri) {
-						const url = `data:${response.type};base64,${response.base64}`;
+					if (response?.assets?.[0]?.uri) {
+						const image = response?.assets?.[0]
+						const url = `data:${image?.type};base64,${image?.base64}`;
 						handleButtonUpdateClick(null, true, url);
 					} else {
 						showToast(ToastType.Error, t('IMAGE_NOT_FOUND', 'Image not found'));