ordering-ui-react-native 0.22.71 → 0.22.73

package/package.json

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

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

@@ -545,18 +545,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             ))}
           </View>
         )}
-
-      {(!!props.order?.error || props.order?.error?.length > 0) && (
-        <NotFoundSource
-          btnTitle={t('GO_TO_MY_ORDERS', 'Go to my orders')}
-          content={
-            props.order.error[0] ||
-            props.order.error ||
-            t('NETWORK_ERROR', 'Network Error')
-          }
-          onClickButton={() => navigation.navigate('Orders')}
-        />
-      )}
       {!((!order || Object.keys(order).length === 0) &&
         (props.order?.error?.length < 1 || !props.order?.error)) && (
           <View style={{ flex: 1 }}>
@@ -704,6 +692,18 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             )}
           </View>
         )}
+
+      {(!!props.order?.error || props.order?.error?.length > 0) && (
+        <NotFoundSource
+          btnTitle={t('GO_TO_MY_ORDERS', 'Go to my orders')}
+          content={
+            props.order.error[0] ||
+            props.order.error ||
+            t('NETWORK_ERROR', 'Network Error')
+          }
+          onClickButton={() => navigation.navigate('Orders')}
+        />
+      )}
       {alertState?.open && (
         <Alert
           open={alertState.open}

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

@@ -55,6 +55,8 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     navigation,
     setCurrentFilters,
     tabs,
+    combineTabs,
+    setCombineTabsState,
     isNetConnected,
     currentTabSelected,
     setCurrentTabSelected,
@@ -127,7 +129,6 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
       backColor: '#E63757'
     }
   ]
-  const combineTabs = configState?.configs?.combine_pending_and_progress_orders?.value === '1'
   const [selectedTabStatus, setSelectedTabStatus] = useState<any>(deliveryStatus)
   const [openedSelect, setOpenedSelect] = useState('')
   const [lastDateConnection, setLastDateConnection] = useState(null)
@@ -405,11 +406,17 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     const manageStoragedOrders = async () => {
       setInternetLoading(true)
       let lastConnection = await _retrieveStoreData('last_date_connection');
+      let _combineTabs = await _retrieveStoreData('combine_pending_and_progress_orders')
       let ordersStoraged: any = {}
       for (const status of orderStatuses) {
         ordersStoraged[status] = await _retrieveStoreData(`${status}_orders`) ?? []
       }
 
+      if (!_combineTabs && combineTabs) {
+        setCombineTabsState(combineTabs)
+        _setStoreData('combine_pending_and_progress_orders', combineTabs);
+      }
+
       if (!lastConnection) {
         const formattedDate = parseDate(new Date())
         lastConnection = formattedDate
@@ -443,12 +450,17 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 
     if (isNetConnected) {
       _setStoreData('last_date_connection', null);
+      _setStoreData('combine_pending_and_progress_orders', null);
       orderStatuses.forEach((key: any) => _setStoreData(`${key}_orders`, null))
     } else if (isNetConnected === false) {
       manageStoragedOrders()
     }
   }, [isNetConnected]);
 
+  useEffect(() => {
+    setCombineTabsState(combineTabs)
+  }, [combineTabs])
+
   return (
     <>
       <View style={styles.header}>
@@ -1026,6 +1038,7 @@ export const OrdersOption = (props: OrdersOptionParams) => {
     UIComponent: OrdersOptionUI,
     useDefualtSessionManager: true,
     asDashboard: true,
+    combineTabs,
     isIos: Platform.OS === 'ios',
     orderStatus: [
       { key: 0, text: t('PENDING', 'Pending') },

package/themes/business/src/types/index.tsx

@@ -323,6 +323,8 @@ export interface OrdersOptionParams {
   orderDetailsProps?: any;
   isNetConnected?: boolean;
   isDriverApp?: boolean;
+  combineTabs?: boolean;
+  setCombineTabsState?: any;
 }
 export interface ActiveOrdersParams {
   orders?: any;

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

@@ -872,7 +872,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 								text={t('CANCEL', 'Cancel')}
 								bgColor={theme.colors.secundary}
 								borderColor={theme.colors.secundary}
-								textStyle={{ color: theme.colors.black }}
+								textStyle={{ color: theme.colors.textNormal }}
 								style={{ borderRadius: 7.6, borderWidth: 1, shadowOpacity: 0 }}
 								onClick={() => navigation?.canGoBack() && navigation.goBack()}
 							/>

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

@@ -58,6 +58,7 @@ export const BusinessItemAccordion = (props: any) => {
 	}, cart?.subtotal)
 
 	const bgStyle = (subtotalWithTaxes < cart?.minimum || !cart?.valid_address) ? theme.colors.secundary : theme.colors.primary
+	const textStyles = (subtotalWithTaxes < cart?.minimum || !cart?.valid_address) ? theme.colors.black : theme.colors.white
 
 	useEffect(() => {
 		if (isActive && !isFromUpselling) {
@@ -155,7 +156,7 @@ export const BusinessItemAccordion = (props: any) => {
 					{cart?.valid_products && (
 						<OButton
 							onClick={handleClickCheckout}
-							textStyle={{ color: 'white', textAlign: 'center', flex: 1 }}
+							textStyle={{ color: textStyles, textAlign: 'center', flex: 1 }}
 							style={{ width: 180, flexDirection: 'row', justifyContent: 'center', borderRadius: 7.6, shadowOpacity: 0 }}
 							text={t('CHECKOUT', 'Checkout')}
 							bgColor={bgStyle}

package/themes/original/src/components/BusinessListingSearch/BusinessSearchFooter.tsx

@@ -243,7 +243,7 @@ export const BusinessSearchFooter = (props: any) => {
                                     onClick={() => handleChangePriceRange(price?.level)}
                                     text={`${price.content} ${(filters?.price_level === price?.level) ? ' X' : ''}`}
                                     style={styles.priceItem}
-                                    textStyle={{ fontSize: 10, color: (filters?.price_level === price?.level) ? theme.colors.backgroundLight : theme.colors.textNormal }}
+                                    textStyle={{ fontSize: 10, color: (filters?.price_level === price?.level) ? theme.colors.white : theme.colors.textNormal }}
                                 />
                             ))}
                         </View>
@@ -284,7 +284,7 @@ export const BusinessSearchFooter = (props: any) => {
                                         onClick={() => handleChangeActiveBusinessType(type)}
                                         text={`${t(`BUSINESS_TYPE_${type.name.replace(/\s/g, '_').toUpperCase()}`, type.name)} ${filters?.business_types?.includes(type?.id) ? 'X' : ''}`}
                                         style={styles.categoryStyle}
-                                        textStyle={{ fontSize: 10, color: (filters?.business_types?.includes(type?.id) || (type?.id === null && filters?.business_types?.length === 0)) ? '#fff' : theme.colors.textNormal }}
+                                        textStyle={{ fontSize: 10, color: (filters?.business_types?.includes(type?.id) || (type?.id === null && filters?.business_types?.length === 0)) ? theme.colors.white : theme.colors.textNormal }}
                                     />
                                 ))}
                             </View>
@@ -296,7 +296,6 @@ export const BusinessSearchFooter = (props: any) => {
                         <OButton
                             text={t('APPLY', 'Apply')}
                             parentStyle={styles.applyButton}
-                            textStyle={{ color: '#fff' }}
                             onClick={() => handleApplyFilters()}
                         />
                     </View>

package/themes/original/src/components/BusinessProductsList/SubcategoriesComponent/index.tsx

@@ -16,7 +16,7 @@ interface SubcategoriesComponentParams {
     onClickSubcategory: any
 }
 
-const SubcategoriesComponent = (props : SubcategoriesComponentParams) => {
+const SubcategoriesComponent = (props: SubcategoriesComponentParams) => {
     const {
         subcategoriesSelected,
         category,
@@ -56,10 +56,10 @@ const SubcategoriesComponent = (props : SubcategoriesComponentParams) => {
             >
                 <OButton
                     onClick={() => onClickSubcategory(null, category)}
-                    bgColor={allsubcategorySelected ? theme.colors.primary : theme.colors.backgroundGray}
                     text={`${t('ALL', 'All')} ${allsubcategorySelected ? 'X' : ''}`}
                     style={bpStyles.categoryButtonStyle}
-                    textStyle={{ color: allsubcategorySelected ? theme.colors.white : theme.colors.textNormal, fontSize: 12 }}
+                    textStyle={{ fontSize: 12 }}
+                    isDisabled={!allsubcategorySelected}
                 />
             </ContainerButton>
             {category?.subcategories?.map((subcategory: any) => {
@@ -71,10 +71,10 @@ const SubcategoriesComponent = (props : SubcategoriesComponentParams) => {
                     >
                         <OButton
                             onClick={() => onClickSubcategory(subcategory, category)}
-                            bgColor={isSubcategorySelected ? theme.colors.primary : theme.colors.backgroundGray}
                             text={`${subcategory?.name} ${isSubcategorySelected ? 'X' : ''}`}
                             style={bpStyles.categoryButtonStyle}
-                            textStyle={{ color: isSubcategorySelected ? theme.colors.white : theme.colors.textNormal, fontSize: 12 }}
+                            textStyle={{ fontSize: 12 }}
+                            isDisabled={!allsubcategorySelected}
                         />
                     </ContainerButton>
                 )

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

@@ -214,11 +214,11 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
                           text={t('VIEW_MORE', 'View more')}
                           parentStyle={{ padding: 0 }}
                           onClick={() => setOpenDescription(category)}
-                          bgColor='transparent'
+                          bgColor={theme.colors.white}
+                          borderColor={theme.colors.primary}
                           textStyle={{
                             fontSize: 12,
                             borderBottomWidth: 1,
-                            borderBottomColor: theme.colors.primary,
                             color: theme.colors.primary
                           }}
                         />

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

@@ -26,9 +26,9 @@ import { BusinessTypeFilterParams } from '../../types';
 const windowWidth = Dimensions.get('window').width;
 
 export const BusinessTypeFilterUI = (props: BusinessTypeFilterParams) => {
-	const { 
-		typesState, 
-		currentTypeSelected, 
+	const {
+		typesState,
+		currentTypeSelected,
 		handleChangeBusinessType,
 		setBusinessTypes,
 		isAppoint
@@ -38,13 +38,13 @@ export const BusinessTypeFilterUI = (props: BusinessTypeFilterParams) => {
 
 	const theme = useTheme();
 	const [isOpenAllCategories, setIsOpenAllCategories] = useState(false)
-	const defaultImage = (name : string) => theme.images?.categories?.[name.toLowerCase().replace(' ', '')]
+	const defaultImage = (name: string) => theme.images?.categories?.[name.toLowerCase().replace(' ', '')]
 
 	useEffect(() => {
-		if(typesState?.types?.length > 0){
-		  setBusinessTypes && setBusinessTypes(typesState?.types)
+		if (typesState?.types?.length > 0) {
+			setBusinessTypes && setBusinessTypes(typesState?.types)
 		}
-	  }, [typesState])
+	}, [typesState])
 
 	const handleChangeServiceType = (serviceId: any) => {
 		if (serviceId === currentTypeSelected) {
@@ -119,10 +119,11 @@ export const BusinessTypeFilterUI = (props: BusinessTypeFilterParams) => {
 									<OButton
 										key={i}
 										bgColor={(currentTypeSelected === businessType?.id) ? theme.colors.primary : theme.colors.backgroundGray200}
+										borderColor={(currentTypeSelected === businessType?.id) ? theme.colors.primary : theme.colors.backgroundGray200}
 										onClick={() => handleChangeServiceType(businessType?.id)}
 										text={`${businessType?.name} ${(currentTypeSelected === businessType?.id) ? ' X' : ''}`}
 										style={styles.businessType}
-										textStyle={{ fontSize: 10, color: (currentTypeSelected === businessType?.id) ? theme.colors.backgroundLight : theme.colors.textNormal }}
+										textStyle={{ fontSize: 10, color: (currentTypeSelected === businessType?.id) ? theme.colors.white : theme.colors.textNormal }}
 									/>
 								))}
 							</ServiceWrapper>

package/themes/original/src/components/BusinessesListing/Layout/Appointment/index.tsx

@@ -392,10 +392,11 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 							<OButton
 								key={i}
 								bgColor={(priceLevelSelected === price?.level) ? theme.colors.primary : theme.colors.backgroundGray200}
+								borderColor={(priceLevelSelected === price?.level) ? theme.colors.primary : theme.colors.backgroundGray200}
 								onClick={() => handleChangePriceLevel(price?.level)}
 								text={`${price.content} ${(priceLevelSelected === price?.level) ? ' X' : ''}`}
 								style={styles.priceLevel}
-								textStyle={{ fontSize: 10, color: (priceLevelSelected === price?.level) ? theme.colors.backgroundLight : theme.colors.textNormal }}
+								textStyle={{ fontSize: 10, color: (priceLevelSelected === price?.level) ? theme.colors.backgroundLight : theme.colors.black }}
 							/>
 						))}
 					</ScrollView>

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

@@ -561,6 +561,7 @@ const CartUI = (props: any) => {
                     `${t('MINIMUN_SUBTOTAL_ORDER', 'Minimum subtotal order:')} ${parsePrice(cart?.minimum)}`
                   )}
                   bgColor={(subtotalWithTaxes < cart?.minimum || !cart?.valid_address) ? theme.colors.secundary : theme.colors.primary}
+                  borderColor={(subtotalWithTaxes < cart?.minimum || !cart?.valid_address) ? theme.colors.secundary : theme.colors.primary}
                   isDisabled={(openUpselling && !canOpenUpselling) || subtotalWithTaxes < cart?.minimum || !cart?.valid_address}
                   imgRightSrc={null}
                   textStyle={{ textAlign: 'center', flex: 1 }}

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

@@ -174,9 +174,7 @@ export const CartContent = (props: any) => {
 									<CheckoutAction style={{ marginTop: 0 }}>
 										<OButton
 											text={t('CHECKOUT', 'Checkout')}
-											bgColor={!cartsAvailable.length ? theme.colors.secundary : theme.colors.primary}
 											isDisabled={!cartsAvailable.length}
-											borderColor={!cartsAvailable.length ? theme.colors.secundary : theme.colors.primary}
 											imgRightSrc={null}
 											onClick={() => handleCheckoutRedirect()}
 											style={{ width: '100%', flexDirection: 'row', justifyContent: 'center', borderRadius: 7.6, shadowOpacity: 0 }}

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

@@ -208,8 +208,7 @@ const ForgotPasswordUI = (props: any) => {
 
 					<OButton
 						text={emailSent && !formState.result?.error ? t('LINK_SEND_FORGOT_PASSWORD', 'Link Sent') : t('FRONT_RECOVER_PASSWORD', 'Recover Password')}
-						bgColor={emailSent && !formState.result?.error ? theme.colors.disabled : theme.colors.primary}
-						borderColor={emailSent && !formState.result?.error ? theme.colors.disabled : theme.colors.primary}
+						isDisabled={formState.loading || emailSent && !formState.result?.error}
 						isLoading={formState.loading}
 						imgRightSrc={null}
 						onClick={emailSent && !formState.result?.error ? () => { } : handleSubmit(onSubmit)}

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

@@ -399,9 +399,6 @@ const MultiCheckoutUI = (props: any) => {
                   />
                   <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 })}
                   />

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

@@ -832,8 +832,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   <OButton
                     text={t('YOUR_ORDERS', 'Your Orders')}
                     textStyle={{ fontSize: 14, color: theme.colors.primary }}
+                    bgColor={theme.colors.white}
                     imgRightSrc={null}
-                    bgColor={theme.colors.clear}
                     style={{ borderRadius: 7.6, borderWidth: 1, height: 44, shadowOpacity: 0 }}
                     parentStyle={{ marginTop: 29, marginEnd: 15 }}
                     onClick={() => navigation.navigate('BottomTab', { screen: 'MyOrders' })}

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

@@ -43,9 +43,9 @@ export const ActionButton = (props: any) => {
             style={{
                 width: isHaveWeight ? '100%' : ((isSoldOut || maxProductQuantity <= 0) ? '60%' : '40%'),
             }}>
-            {((productCart &&
+            {(productCart &&
                 auth &&
-                (orderState.options?.address_id || isAllowUnaddressOrderType)) || (isSoldOut || maxProductQuantity <= 0)) && (
+                ((orderState.options?.address_id || isAllowUnaddressOrderType) || (isSoldOut || maxProductQuantity <= 0))) && (
                     <OButton
                         onClick={() => handleSaveProduct()}
                         imgRightSrc=""
@@ -57,15 +57,11 @@ export const ActionButton = (props: any) => {
                                     ? t('UPDATE', 'Update')
                                     : t('ADD', 'Add')
                             }`}
-                        isDisabled={isSoldOut || maxProductQuantity <= 0 || (product?.minimum_per_order && ((productCart?.quantity + productAddedToCartLength) < product?.minimum_per_order)) || (product?.maximum_per_order && ((productCart?.quantity + productAddedToCartLength) > product?.maximum_per_order))}
+                        isDisabled={buttonColor}
                         textStyle={{
-                            color: theme.colors.white,
                             fontSize: orderState.loading || editMode ? 10 : 14
                         }}
-                        bgColor={buttonColor ? theme.colors.lightGray : theme.colors.primary}
-                        borderColor={buttonColor ? theme.colors.lightGray : theme.colors.primary}
                         style={{
-                            opacity: saveErrors || isSoldOut || maxProductQuantity <= 0 ? 0.3 : 1,
                             borderRadius: 7.6,
                             height: 44,
                             shadowOpacity: 0,
@@ -96,12 +92,12 @@ export const ActionButton = (props: any) => {
                             : t('LOGIN_SIGNUP', 'Login / Sign Up')
                     }
                     imgRightSrc=""
-                    textStyle={{ fontSize: 13, textAlign: 'center', color: theme.colors.primary }}
+                    textStyle={{ fontSize: 13, textAlign: 'center' }}
                     style={{
                         height: 42,
-                        backgroundColor: theme.colors.white,
                         paddingLeft: 0,
-                        paddingRight: 0
+                        paddingRight: 0,
+                        borderRadius: 7.6
                     }}
                 />
             )}

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

@@ -314,9 +314,7 @@ const SingleProductCardUI = React.memo((props: SingleProductCardParams) => {
 								height: 40
 
 							}}
-							bgColor={isSoldOut ? '#B8B8B8' : theme?.colors?.white}
-							borderColor={isSoldOut ? '#B8B8B8' : theme?.colors?.white}
-							textStyle={{ color: isSoldOut ? theme?.colors?.white : theme?.colors?.primary }}
+							isDisabled={isSoldOut}
 							text={t('ADD', 'Add')}
 						/>
 					)}

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

@@ -26,7 +26,6 @@ export const StripeCardsListUI = (props: any) => {
 	const {
 		onSelectCard,
 		deleteCard,
-		cardSelected,
 		cardsList,
 		handleCardClick,
 		onOpen,
@@ -58,7 +57,7 @@ export const StripeCardsListUI = (props: any) => {
 	}, [cardsList?.loading])
 
 	useEffect(() => {
-		if (newCardAdded && addNewCardAsDefault){	
+		if (newCardAdded && addNewCardAsDefault) {
 			handleCardSelected(newCardAdded)
 		}
 	}, [JSON.stringify(newCardAdded)])
@@ -104,7 +103,7 @@ export const StripeCardsListUI = (props: any) => {
 						<OSItem key={card.id} isUnique={cardsList.cards.length} isInvalid={!card?.zipcode && validateZipcodeCard}>
 							<OSItemContent onPress={() => handleCardSelected(card)}>
 								<View style={styles.viewStyle}>
-									{(card.id === cardSelected?.id || card.id === paySelected?.data?.id) ? (
+									{(card.id === paySelected?.data?.id) ? (
 										<OIcon
 											src={theme.images.general.radio_act}
 											width={16}

package/themes/original/src/components/shared/OButton.tsx

@@ -95,8 +95,8 @@ const OButton = (props: Props): React.ReactElement => {
 	if (props.isDisabled) {
 		return (
 			<View style={props.parentStyle}>
-				<StyledButtonDisabled style={props.style}>
-					<StyledTextDisabled style={props.textStyle}>
+				<StyledButtonDisabled style={{ ...props.style, backgroundColor: theme.colors.disabled }}>
+					<StyledTextDisabled style={{ ...props.textStyle, color: theme.colors.backgroundGray200 }}>
 						{props.text}
 					</StyledTextDisabled>
 				</StyledButtonDisabled>