ordering-ui-react-native 0.17.54 → 0.17.56

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

@@ -1,5 +1,18 @@
 import styled from 'styled-components/native';
 
+export const LoginWith = styled.View`
+  display: flex;
+  width: 100%;
+  margin-bottom: 30px;
+`;
+
+export const TabsContainer = styled.View`
+  min-width: ${({ width }: { width: number }) => `${width}px`};
+  width: auto;
+  display: flex;
+  flex-direction: row;
+`;
+
 export const LogoWrapper = styled.View`
   align-items: center;
 `;
@@ -11,4 +24,4 @@ export const RecaptchaButton = styled.View`
   flex-direction: row;
   align-items: center;
   margin-bottom: 10px;
-`
+`

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

@@ -86,6 +86,7 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
   return (
     <Wrapper>
       <PhoneInput
+        containerStyle={{ width: '100%' }}
         ref={phoneInput}
         defaultValue={userphoneNumber || defaultValue}
         defaultCode={defaultCode ? transformCountryCode(defaultCode) : configs?.default_country_code?.value}

package/themes/kiosk/src/components/PhoneInputNumber/styles.tsx

@@ -1,5 +1,3 @@
 import styled from 'styled-components/native';
 
-export const Wrapper = styled.View`
-    flex: 1
-`
+export const Wrapper = styled.View``;

package/themes/kiosk/src/components/shared/OModal.tsx

@@ -95,14 +95,14 @@ const styles = StyleSheet.create({
     position: 'relative',
     width: '100%',
   },
-  titleSection: {
-    width: '100%',
-    height: 30,
-    display: 'flex',
-    justifyContent: 'space-between',
-    alignItems: 'center',
-    marginBottom: 20,
-  },
+	titleSection: {
+		width: '100%',
+		justifyContent: 'space-between',
+		alignItems: 'flex-start',
+		paddingLeft: 40,
+		paddingRight: 40,
+		marginBottom: 40,
+	},
   cancelBtn: {
     position: 'absolute',
     left: 0,
@@ -111,9 +111,12 @@ const styles = StyleSheet.create({
   },
   modalText: {
     marginTop: 15,
-    fontSize: 25,
-    textAlign: "center",
-    zIndex: 10
+		fontSize: 20,
+		lineHeight: 30,
+		fontWeight: '600',
+		textAlign: "center",
+		zIndex: 10,
+    width: '100%'
   },
   wrapperIcon: {
     overflow: 'hidden',

package/themes/kiosk/src/layouts/Container.tsx

@@ -22,7 +22,13 @@ export const Container = (props: Props) => {
     <SafeAreStyled
       nestedScrollEnabled={props.nestedScrollEnabled}
     >
-      <ContainerStyled {...props} ref={props?.forwardRef}>{props.children}</ContainerStyled>
+      <ContainerStyled
+        {...props}
+        keyboardShouldPersistTaps="handled"
+        ref={props?.forwardRef}
+      >
+        {props.children}
+      </ContainerStyled>
     </SafeAreStyled>
   );
 };

package/themes/kiosk/src/types/index.d.ts

@@ -84,6 +84,12 @@ export interface LoginParams {
   useRootPoint?: any;
   enableReCaptcha?: boolean;
   handleReCaptcha?: (vlaue: any) => void;
+  useLoginOtp?: any;
+  otpType?: any;
+  setOtpType?: any;
+  generateOtpCode?: any;
+  useLoginOtpEmail?: any;
+  useLoginOtpCellphone?: any;
 }
 
 export interface ProductItemAccordionParams {
@@ -482,3 +488,10 @@ export interface Cart {
 export interface NoNetworkParams {
   image?: any;
 }
+export interface otpParams {
+	willVerifyOtpState: boolean,
+	setWillVerifyOtpState: (val : boolean) => void,
+	onSubmit: any,
+	handleLoginOtp: (code : string) => void,
+	setAlertState: any
+}

package/themes/kiosk/src/utils/index.tsx

@@ -0,0 +1,15 @@
+export const formatSeconds = (seconds : number) => {
+  // Hours, minutes and seconds
+  const hrs = Math.floor(seconds / 3600)
+  const mins = Math.floor((seconds % 3600) / 60)
+  const secs = Math.floor(seconds % 60)
+
+  // Output like '1:01' or '4:03:59' or '123:03:59'
+  let ret = ''
+  if (hrs > 0) {
+    ret += '' + hrs + ':' + (mins < 10 ? '0' : '')
+  }
+  ret += '' + mins + ':' + (secs < 10 ? '0' : '')
+  ret += '' + secs
+  return ret
+}

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

@@ -75,7 +75,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const theme = useTheme();
 	const [, t] = useLanguage()
 	const [{ auth }] = useSession()
-	const [orderState, { clearCart }] = useOrder()
+	const [orderState, { addProduct, updateProduct }] = useOrder()
 	const [{ parsePrice }] = useUtils()
 	const [, { showToast }] = useToast()
 	const [{ configs }] = useConfig()
@@ -134,6 +134,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const [searchBarHeight, setSearchBarHeight] = useState(60)
 
 	const isCheckoutMultiBusinessEnabled: Boolean = configs?.checkout_multi_business_enabled?.value === '1'
+	const isQuickAddProduct = configs?.add_product_with_one_click?.value === '1'
 	const openCarts = (Object.values(orderState?.carts)?.filter((cart: any) => cart?.products && cart?.products?.length && cart?.status !== 2 && cart?.valid_schedule && cart?.valid_products && cart?.valid_address && cart?.valid_maximum && cart?.valid_minimum && !cart?.wallets) || null) || []
 
 	const currentCart: any = Object.values(orderState.carts).find((cart: any) => cart?.business?.slug === business?.slug) ?? {}
@@ -142,20 +143,39 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const onRedirect = (route: string, params?: any) => {
 		navigation.navigate(route, params)
 	}
-
-	const onProductClick = (product: any) => {
-		const productAddedToCartLength = currentCart?.products?.reduce((productsLength: number, Cproduct: any) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0) || 0
-		if (product?.type === 'service' && business?.professionals?.length > 0) {
-			setCurrentProduct(product)
-			setOpenService(true)
-			return
+	const onProductClick = async (product: any) => {
+		if (product.extras.length === 0 && !product.inventoried && auth && isQuickAddProduct) {
+			const isProductAddedToCart = currentCart?.products?.find((Cproduct: any) => Cproduct.id === product.id)
+			const productQuantity = isProductAddedToCart?.quantity
+			const addCurrentProduct = {
+				...product,
+				quantity: 1
+			}
+			const updateCurrentProduct = {
+				id: product.id,
+				code: isProductAddedToCart?.code,
+				quantity: productQuantity + 1
+			}
+			const cartData = currentCart?.business_id ? currentCart : { business_id: business.id }
+			if (isProductAddedToCart) {
+				await updateProduct(updateCurrentProduct, cartData, isQuickAddProduct)
+			} else {
+				await addProduct(addCurrentProduct, cartData, isQuickAddProduct)
+			}
+		} else {
+			const productAddedToCartLength = currentCart?.products?.reduce((productsLength: number, Cproduct: any) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0) || 0
+			if (product?.type === 'service' && business?.professionals?.length > 0) {
+				setCurrentProduct(product)
+				setOpenService(true)
+				return
+			}
+			onRedirect('ProductDetails', {
+				product: product,
+				businessSlug: business.slug,
+				businessId: business.id,
+				productAddedToCartLength
+			})
 		}
-		onRedirect('ProductDetails', {
-			product: product,
-			businessSlug: business.slug,
-			businessId: business.id,
-			productAddedToCartLength
-		})
 	}
 
 	const handleCancel = () => {