ordering-ui-react-native 0.22.75 → 0.22.76-release

package/themes/original/index.tsx

@@ -19,6 +19,7 @@ import { Favorite } from './src/components/Favorite';
 import { FavoriteList } from './src/components/FavoriteList';
 import { FloatingButton } from './src/components/FloatingButton';
 import { ForgotPasswordForm } from './src/components/ForgotPasswordForm';
+import { GPSButton } from './src/components/GPSButton';
 import { MomentOption } from './src/components/MomentOption';
 import { OrdersOption } from './src/components/OrdersOption';
 import { OrderDetails } from './src/components/OrderDetails';
@@ -34,9 +35,7 @@ import { MessageListing } from './src/components/MessageListing';
 import { Messages } from './src/components/Messages';
 import { MyOrders } from './src/components/MyOrders';
 import { Help } from './src/components/Help';
-import { HelpAccountAndPayment } from './src/components/HelpAccountAndPayment';
-import { HelpGuide } from './src/components/HelpGuide';
-import { HelpOrder } from './src/components/HelpOrder';
+import { HelpOptions } from './src/components/HelpOptions';
 import { NetworkError } from './src/components/NetworkError';
 import { NotFoundSource } from './src/components/NotFoundSource';
 import { OrderTypeSelector } from './src/components/OrderTypeSelector';
@@ -85,6 +84,7 @@ import { VerifyPhone } from './src/components/VerifyPhone';
 import { GoogleLogin } from './src/components/GoogleLogin';
 import { PreviousOrders } from './src/components/PreviousOrders';
 import { PaymentOptionCash } from './src/components/PaymentOptionCash';
+import { SendGiftCard } from './src/components/GiftCard/SendGiftCard';
 import { StripeElementsForm } from './src/components/StripeElementsForm';
 import { StripeCardsList } from './src/components/StripeCardsList';
 import { ProductIngredient } from './src/components/ProductIngredient';
@@ -106,54 +106,54 @@ import { OSBill, OSTable, OSCoupon, OSTotal, OSRow } from './src/components/Orde
 import { FormInput, FormSide, ButtonsWrapper, LoginWith, OTab, OTabs } from './src/components/LoginForm/styles';
 import { OSItem, OSItemContent, OSItemActions } from './src/components/PaymentOptionStripe/styles';
 
-import { orderTypeList } from './src/utils'
+import { orderTypeList, getTraduction, verifyDecimals, getOrderStatus, getOrderStatuPickUp } from './src/utils'
 
 import Alert from './src/providers/AlertProvider'
 
 import {
-	LoginParams,
-	ProfileParams,
-	AddressListParams,
-	AddressFormParams,
-	SignupParams,
-	PhoneInputParams,
-	LanguageSelectorParams,
-	BusinessesListingParams,
-	HighestRatedBusinessesParams,
-	BusinessTypeFilterParams,
-	BusinessControllerParams,
-	BusinessProductsListingParams,
-	BusinessBasicInformationParams,
-	BusinessProductsCategoriesParams,
-	BusinessProductsListParams,
-	SingleProductCardParams,
-	BusinessInformationParams,
-	BusinessReviewsParams,
-	SearchBarParams,
-	NotFoundSourceParams,
-	OrdersOptionParams,
-	ActiveOrdersParams,
-	PreviousOrdersParams,
-	OrderDetailsParams,
-	ReviewDriverParams
+  LoginParams,
+  ProfileParams,
+  AddressListParams,
+  AddressFormParams,
+  SignupParams,
+  PhoneInputParams,
+  LanguageSelectorParams,
+  BusinessesListingParams,
+  HighestRatedBusinessesParams,
+  BusinessTypeFilterParams,
+  BusinessControllerParams,
+  BusinessProductsListingParams,
+  BusinessBasicInformationParams,
+  BusinessProductsCategoriesParams,
+  BusinessProductsListParams,
+  SingleProductCardParams,
+  BusinessInformationParams,
+  BusinessReviewsParams,
+  SearchBarParams,
+  NotFoundSourceParams,
+  OrdersOptionParams,
+  ActiveOrdersParams,
+  PreviousOrdersParams,
+  OrderDetailsParams,
+  ReviewDriverParams
 } from './src/types';
 
 import { Toast } from './src/components/shared/OToast';
 import {
-	OText,
-	OButton,
-	OInput,
-	ODropDown,
-	OIcon,
-	OIconText,
-	OIconButton,
-	OTextarea,
-	OToggle,
-	OKeyButton,
-	OAlert,
-	OModal,
-	OBottomPopup,
-	HeaderTitle
+  OText,
+  OButton,
+  OInput,
+  ODropDown,
+  OIcon,
+  OIconText,
+  OIconButton,
+  OTextarea,
+  OToggle,
+  OKeyButton,
+  OAlert,
+  OModal,
+  OBottomPopup,
+  HeaderTitle
 } from './src/components/shared';
 
 import { Container } from './src/layouts/Container';
@@ -161,192 +161,196 @@ import { SafeAreaContainer } from './src/layouts/SafeAreaContainer';
 import { FloatingBottomContainer } from './src/layouts/FloatingBottomContainer';
 
 import {
-	_retrieveStoreData,
-	_setStoreData,
-	_removeStoreData,
-	_clearStoreData
+  _retrieveStoreData,
+  _setStoreData,
+  _removeStoreData,
+  _clearStoreData
 } from './src/providers/StoreUtil';
 
 export {
-	AddressForm,
-	AddressDetails,
-	AnalyticsSegment,
-	Home as HomeView,
-	SignupForm,
-	LoginForm,
-	ActiveOrders,
-	AddressList,
-	AppleLogin,
-	BusinessesListing,
-	BusinessProductsListing,
-	CartContent,
-	BusinessCart,
-	Checkout,
-	Favorite,
-	FavoriteList,
-	ForgotPasswordForm,
-	MomentOption,
-	OrdersOption,
-	OrderDetails,
-	OrderProgress,
-	BusinessPreorder,
-	NotificationsList,
-	UserProfileForm,
-	ReviewOrder,
-	ReviewProducts,
-	ReviewDriver,
-	BusinessMenuList,
-	UserProfile,
-	MessageListing,
-	Messages,
-	Help,
-	HelpAccountAndPayment,
-	HelpGuide,
-	HelpOrder,
-	MultiCheckout,
-	MultiOrdersDetails,
-	NetworkError,
-	NotFoundSource,
-	OrderTypeSelector,
-	Wallets,
-	PaymentOptionWallet,
-	ProductForm,
-	UpsellingProducts,
-	UserVerification,
-	BusinessListingSearch,
-	BusinessBasicInformation,
-	BusinessProductsCategories,
-	BusinessProductsList,
-	FloatingButton,
-	SearchBar,
-	LastOrders,
-	BusinessTypeFilter,
-	BusinessController,
-	BusinessFeaturedController,
-	HighestRatedBusinesses,
-	PaymentOptions,
-	DriverTips,
-	UserDetails,
-	OrderSummary,
-	OrderItAgain,
-	CartStoresListing,
-	PaymentOptionsWebView,
-	GoogleMap,
-	SingleProductCard,
-	SingleOrderCard,
-	UpsellingRedirect,
-	ProductItemAccordion,
-	ScheduleAccordion,
-	BusinessItemAccordion,
-	CouponControl,
-	TaxInformation,
-	PlaceSpot,
-	ProfessionalFilter,
-	ServiceForm,
-	ProfessionalProfile,
-	MomentSelector,
-	Cart,
-	LanguageSelector,
-	PhoneInputNumber,
-	FacebookLogin,
-	VerifyPhone,
-	GoogleLogin,
-	PreviousOrders,
-	PaymentOptionCash,
-	StripeElementsForm,
-	StripeCardsList,
-	ProductIngredient,
-	ProductOption,
-	ProductOptionSubOption,
-	Sessions,
-	SingleProductReview,
-	LogoutButton,
-	UserFormDetailsUI,
-	WalletTransactionItem,
-	Promotions,
-	PageBanner,
-	MyOrders,
-	MultiCart,
-	WebsocketStatus,
-	ORDER_TYPES,
-	USER_TYPE,
+  AddressForm,
+  AddressDetails,
+  AnalyticsSegment,
+  Home as HomeView,
+  SignupForm,
+  LoginForm,
+  ActiveOrders,
+  AddressList,
+  AppleLogin,
+  BusinessesListing,
+  BusinessProductsListing,
+  CartContent,
+  BusinessCart,
+  Checkout,
+  Favorite,
+  FavoriteList,
+  GPSButton,
+  ForgotPasswordForm,
+  MomentOption,
+  OrdersOption,
+  OrderDetails,
+  OrderProgress,
+  BusinessPreorder,
+  NotificationsList,
+  UserProfileForm,
+  ReviewOrder,
+  ReviewProducts,
+  ReviewDriver,
+  BusinessMenuList,
+  UserProfile,
+  MessageListing,
+  Messages,
+  Help,
+  HelpOptions,
+  MultiCheckout,
+  MultiOrdersDetails,
+  NetworkError,
+  NotFoundSource,
+  OrderTypeSelector,
+  Wallets,
+  PaymentOptionWallet,
+  ProductForm,
+  UpsellingProducts,
+  UserVerification,
+  BusinessListingSearch,
+  BusinessBasicInformation,
+  BusinessProductsCategories,
+  BusinessProductsList,
+  FloatingButton,
+  SearchBar,
+  LastOrders,
+  BusinessTypeFilter,
+  BusinessController,
+  BusinessFeaturedController,
+  HighestRatedBusinesses,
+  PaymentOptions,
+  DriverTips,
+  UserDetails,
+  OrderSummary,
+  OrderItAgain,
+  CartStoresListing,
+  PaymentOptionsWebView,
+  GoogleMap,
+  SingleProductCard,
+  SingleOrderCard,
+  UpsellingRedirect,
+  ProductItemAccordion,
+  ScheduleAccordion,
+  BusinessItemAccordion,
+  CouponControl,
+  TaxInformation,
+  PlaceSpot,
+  ProfessionalFilter,
+  ServiceForm,
+  ProfessionalProfile,
+  MomentSelector,
+  Cart,
+  LanguageSelector,
+  PhoneInputNumber,
+  FacebookLogin,
+  VerifyPhone,
+  GoogleLogin,
+  PreviousOrders,
+  PaymentOptionCash,
+  StripeElementsForm,
+  StripeCardsList,
+  ProductIngredient,
+  ProductOption,
+  ProductOptionSubOption,
+  SendGiftCard,
+  Sessions,
+  SingleProductReview,
+  LogoutButton,
+  UserFormDetailsUI,
+  WalletTransactionItem,
+  Promotions,
+  PageBanner,
+  MyOrders,
+  MultiCart,
+  WebsocketStatus,
+  ORDER_TYPES,
+  USER_TYPE,
 
-	OSBill,
-	OSTable,
-	OSCoupon,
-	OSTotal,
-	OSRow,
+  OSBill,
+  OSTable,
+  OSCoupon,
+  OSTotal,
+  OSRow,
 
-	FormInput,
-	FormSide,
-	ButtonsWrapper,
-	LoginWith,
-	OTab,
-	OTabs,
+  FormInput,
+  FormSide,
+  ButtonsWrapper,
+  LoginWith,
+  OTab,
+  OTabs,
 
-	OSItem,
-	OSItemContent,
-	OSItemActions,
+  OSItem,
+  OSItemContent,
+  OSItemActions,
 
-	Alert,
+  Alert,
 
-	//Types
-	LoginParams,
-	ProfileParams,
-	AddressListParams,
-	AddressFormParams,
-	SignupParams,
-	PhoneInputParams,
-	LanguageSelectorParams,
-	BusinessesListingParams,
-	HighestRatedBusinessesParams,
-	BusinessTypeFilterParams,
-	BusinessControllerParams,
-	BusinessProductsListingParams,
-	BusinessBasicInformationParams,
-	BusinessProductsCategoriesParams,
-	BusinessProductsListParams,
-	SingleProductCardParams,
-	BusinessInformationParams,
-	BusinessReviewsParams,
-	SearchBarParams,
-	NotFoundSourceParams,
-	OrdersOptionParams,
-	ActiveOrdersParams,
-	PreviousOrdersParams,
-	OrderDetailsParams,
-	ReviewDriverParams,
+  //Types
+  LoginParams,
+  ProfileParams,
+  AddressListParams,
+  AddressFormParams,
+  SignupParams,
+  PhoneInputParams,
+  LanguageSelectorParams,
+  BusinessesListingParams,
+  HighestRatedBusinessesParams,
+  BusinessTypeFilterParams,
+  BusinessControllerParams,
+  BusinessProductsListingParams,
+  BusinessBasicInformationParams,
+  BusinessProductsCategoriesParams,
+  BusinessProductsListParams,
+  SingleProductCardParams,
+  BusinessInformationParams,
+  BusinessReviewsParams,
+  SearchBarParams,
+  NotFoundSourceParams,
+  OrdersOptionParams,
+  ActiveOrdersParams,
+  PreviousOrdersParams,
+  OrderDetailsParams,
+  ReviewDriverParams,
 
-	// OComponents
-	Toast,
-	OText,
-	OButton,
-	OInput,
-	ODropDown,
-	OIcon,
-	OIconText,
-	OIconButton,
-	OTextarea,
-	OToggle,
-	OKeyButton,
-	OAlert,
-	OModal,
-	OBottomPopup,
-	HeaderTitle,
+  // OComponents
+  Toast,
+  OText,
+  OButton,
+  OInput,
+  ODropDown,
+  OIcon,
+  OIconText,
+  OIconButton,
+  OTextarea,
+  OToggle,
+  OKeyButton,
+  OAlert,
+  OModal,
+  OBottomPopup,
+  HeaderTitle,
 
-	// layout
-	Container,
-	SafeAreaContainer,
-	FloatingBottomContainer,
-	NavBar,
+  // layout
+  Container,
+  SafeAreaContainer,
+  FloatingBottomContainer,
+  NavBar,
 
-	// utils
-	_retrieveStoreData,
-	_setStoreData,
-	_removeStoreData,
-	_clearStoreData,
-	orderTypeList,
+  // utils
+  _retrieveStoreData,
+  _setStoreData,
+  _removeStoreData,
+  _clearStoreData,
+  orderTypeList,
+  getTraduction,
+  verifyDecimals,
+  getOrderStatus,
+  getOrderStatuPickUp,
 
-	// Date Picker
-	DatePickerUI
+  // Date Picker
+  DatePickerUI
 }

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

@@ -76,6 +76,8 @@ const AddressFormUI = (props: AddressFormParams) => {
 
 	const [autoCompleteInputFocused, setAutoCompleteInputFocused] = useState(false)
 
+	const isEmptyField = (key: any, str: any) => isRequiredField && isRequiredField(key) && (!str || str.trim().length === 0)
+
 	const tagsName = [
 		{ icon: theme.images.general.tag_home, value: 'home' },
 		{ icon: theme.images.general.tag_building, value: 'office' },
@@ -349,12 +351,47 @@ const AddressFormUI = (props: AddressFormParams) => {
 	};
 
 	const handleChangeAddress = (data: any, details: any) => {
+		const addressObj: any = {}
+		if (details?.address_components) {
+			details.address_components.map((component: any) => {
+				const addressType = component.types[0]
+				if (addressType === 'postal_code') {
+					addressObj.zipcode = component.short_name
+				}
+				if (addressType === 'street_number') {
+					addressObj.street_number = component.long_name
+				}
+				if (addressType === 'neighborhood') {
+					addressObj.neighborhood = component.long_name
+				}
+				if (addressType === 'route') {
+					addressObj.route = component.short_name
+				}
+				if (addressType === 'locality') {
+					addressObj.locality = component.long_name
+				}
+				if (component.types?.includes('sublocality')) {
+					addressObj.sublocality = component.long_name
+				}
+				if (addressType === 'country') {
+					addressObj.country = component.long_name
+					addressObj.country_code = component.short_name
+				}
+				if (addressType === 'administrative_area_level_1') {
+					addressObj.state = component.long_name
+				}
+				if (addressType === 'administrative_area_level_2') {
+					addressObj.city = component.long_name
+				}
+			})
+		}
 		const addressSelected = {
 			address: data?.description || data?.address,
 			location: details?.geometry?.location,
 			utc_offset: details?.utc_offset || null,
 			map_data: { library: 'google', place_id: data.place_id },
-			zip_code: data?.zip_code || null,
+			zipcode: data?.zipcode || null,
+			...addressObj
 		};
 		updateChanges(addressSelected);
 	};
@@ -462,9 +499,9 @@ const AddressFormUI = (props: AddressFormParams) => {
 	}, [formState]);
 
 	useEffect(() => {
-		if (formState?.result?.result && !formState?.loading) {
-			if (formState.result?.error) {
-				showToast(ToastType.Error, formState.result.result);
+		if (formState?.result && !formState?.loading) {
+			if (formState?.error) {
+				showToast(ToastType.Error, formState.error[0]);
 			} else {
 				showToast(
 					ToastType.Success,
@@ -610,7 +647,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 											onFail={(error) =>
 												setAlertState({
 													open: true,
-													content: getTraduction(error),
+													content: getTraduction(error, t),
 												})
 											}
 											styles={{
@@ -690,7 +727,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 							)}
 
 							<View style={{ flexDirection: 'row', flexBasis: '50%' }}>
-								{((isRequiredField && isRequiredField('internal_number')) || showFieldWithTheme('internal_number')) && (
+								{showField?.('internal_number') && ((isRequiredField && isRequiredField('internal_number')) || showFieldWithTheme('internal_number')) && (
 									<Controller
 										control={control}
 										name="internal_number"
@@ -713,9 +750,9 @@ const AddressFormUI = (props: AddressFormParams) => {
 											<OInput
 												name="internal_number"
 												placeholder={t('INTERNAL_NUMBER', 'Internal number')}
-												onChange={(text: string) => {
-													handleChangeInput(text);
-													setValue('internal_number', text);
+												onChange={(data: any) => {
+													handleChangeInput(data);
+													setValue('internal_number', isEmptyField('internal_number', data?.target?.value) ? null : data);
 												}}
 												value={
 													address?.internal_number ||
@@ -737,7 +774,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 									/>
 								)}
 
-								{((isRequiredField && isRequiredField('zipcode')) || showFieldWithTheme('zipcode')) && (
+								{showField?.('zipcode') && ((isRequiredField && isRequiredField('zipcode')) || showFieldWithTheme('zipcode')) && (
 									<Controller
 										control={control}
 										name="zipcode"
@@ -760,9 +797,9 @@ const AddressFormUI = (props: AddressFormParams) => {
 											<OInput
 												name="zipcode"
 												placeholder={t('ZIP_CODE', 'Zip code')}
-												onChange={(text: string) => {
-													handleChangeInput(text);
-													setValue('zipcode', text);
+												onChange={(data: any) => {
+													handleChangeInput(data);
+													setValue('zipcode', isEmptyField('zipcode', data?.target?.value) ? null : data);
 												}}
 												value={
 													address?.zipcode ||
@@ -782,7 +819,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 								)}
 							</View>
 
-							{((isRequiredField && isRequiredField('address_notes')) || showFieldWithTheme('address_notes')) && (
+							{showField?.('address_notes') && ((isRequiredField && isRequiredField('address_notes')) || showFieldWithTheme('address_notes')) && (
 								<Controller
 									control={control}
 									name="address_notes"
@@ -884,14 +921,13 @@ const AddressFormUI = (props: AddressFormParams) => {
 						entireModal
 						customClose>
 						{(locationChange || formState.changes?.location) && (
-							<GoogleMapContainer>
+							<GoogleMapContainer style={{ minHeight: HEIGHT_SCREEN - 50 }}>
 								<GoogleMap
 									location={locationChange || formState.changes?.location}
 									handleChangeAddressMap={handleChangeAddress}
 									maxLimitLocation={maxLimitLocation}
 									saveLocation={saveMapLocation}
 									setSaveLocation={setSaveMapLocation}
-									handleToggleMap={handleToggleMap}
 									isIntGeoCoder
 								/>
 							</GoogleMapContainer>
@@ -900,7 +936,10 @@ const AddressFormUI = (props: AddressFormParams) => {
 							text={t('SAVE', 'Save')}
 							imgRightSrc={null}
 							style={{ marginHorizontal: 30, marginBottom: 10 }}
-							onClick={() => setSaveMapLocation(true)}
+							onClick={() => {
+								setSaveMapLocation(true)
+								handleToggleMap && handleToggleMap()
+							}}
 						/>
 					</OModal>
 					<Spinner visible={saveMapLocation} />