ordering-ui-react-native 0.15.25 → 0.15.28

package/package.json

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

package/src/components/StripeMethodForm/index.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react'
 import { useLanguage } from 'ordering-components/native'
 import { useGooglePay, ApplePayButton, useApplePay } from '@stripe/stripe-react-native'
-import { OButton } from '../shared';
+import { OButton, OText } from '../shared';
 import { Platform, View } from 'react-native';
 import { StripeMethodFormParams } from '../../types';
 import Spinner from 'react-native-loading-spinner-overlay';
@@ -146,17 +146,22 @@ export const StripeMethodForm = (props: StripeMethodFormParams) => {
         </View>
       ) : (
         <View>
-          {isApplePaySupported && (
-            <ApplePayButton
-              onPress={pay}
-              type="plain"
-              buttonStyle="black"
-              borderRadius={4}
-              style={{
-                width: '100%',
-                height: 50,
-              }}
-            />
+          {isApplePaySupported ? (
+            <>
+              <OText>{t('APPLE_PAY_PAYMENT', 'Apple pay payment')}</OText>
+              <ApplePayButton
+                onPress={pay}
+                type="plain"
+                buttonStyle="black"
+                borderRadius={4}
+                style={{
+                  width: '100%',
+                  height: 50,
+                }}
+              />
+            </>
+          ) : (
+            <OText>{t('APPLE_PAY_NOT_SUPPORTED', 'Apple pay not supported')}</OText>
           )}
         </View>
       )}

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

@@ -85,7 +85,8 @@ const CheckoutUI = (props: any) => {
 		deliveryOptionSelected,
 		instructionsOptions,
 		handleChangeDeliveryOption,
-		currency
+		currency,
+		merchantId
 	} = props
 
 	const theme = useTheme();
@@ -547,6 +548,7 @@ const CheckoutUI = (props: any) => {
 									paySelected={paymethodSelected}
 									handlePaymentMethodClickCustom={handlePaymentMethodClick}
 									handlePlaceOrder={handlePlaceOrder}
+									merchantId={merchantId}
 								/>
 							</ChPaymethods>
 						</ChSection>

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

@@ -57,7 +57,8 @@ const PaymentOptionsUI = (props: any) => {
 		handlePaymethodDataChange,
 		isOpenMethod,
 		handlePaymentMethodClickCustom,
-		handlePlaceOrder
+		handlePlaceOrder,
+		merchantId
 	} = props
 
 	const theme = useTheme();
@@ -316,6 +317,7 @@ const PaymentOptionsUI = (props: any) => {
 						publicKey={isOpenMethod?.paymethod?.credentials?.publishable || isOpenMethod?.paymethod?.credentials?.publishable_key}
 						handleSource={handlePaymethodDataChange}
 						onCancel={() => handlePaymethodClick(null)}
+						merchantId={merchantId}
 					/>
 				</KeyboardAvoidingView>
 			</OModal>

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

@@ -86,6 +86,10 @@ export const PreviousOrders = (props: PreviousOrdersParams) => {
 					id: order?.id,
 					business_id: order?.business_id,
 					logo: order.business?.logo,
+					driver: order?.driver,
+					products: order?.products,
+					review: order?.review,
+					user_review: order?.user_review
 				},
 			});
 	};

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

@@ -27,6 +27,7 @@ const StripeElementsFormUI = (props: any) => {
 		paymethod,
 		onCancel,
 		cart,
+		merchantId
 	} = props;
 
 	const theme = useTheme();
@@ -160,7 +161,7 @@ const StripeElementsFormUI = (props: any) => {
 				<View style={{ flex: 1 }}>
 					<StripeProvider
 						publishableKey={publicKey}
-						merchantIdentifier={`merchant.${configs.apple_app_id}`}
+						merchantIdentifier={`merchant.${merchantId}`}
 					>
 						{methodsPay?.includes(paymethod) ? (
 							<StripeMethodForm

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

@@ -157,6 +157,12 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
           </TopActions>
         </TopBar>
         <ScrollView style={{ marginBottom: props.isPage ? 40 : bottom + (Platform.OS == 'ios' ? 96 : 130) }} showsVerticalScrollIndicator={false}>
+					{productsList.length > 0 &&
+            <View style={{ paddingHorizontal: 40, overflow: 'visible' }}>
+              <OText size={16} lineHeight={24} weight={'500'}>{t('WANT_SOMETHING_ELSE', 'Do you want something else?')}</OText>
+              <UpsellingLayout />
+            </View>
+          }
           <View style={{ paddingHorizontal: 40 }}>
             <OText size={20} lineHeight={30} weight={600} style={{ marginTop: 10, marginBottom: 17 }}>{t('YOUR_CART', 'Your cart')}</OText>
             <OrderSummary
@@ -165,12 +171,6 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
               onNavigationRedirect={onNavigationRedirect}
             />
           </View>
-		  {productsList.length > 0 &&
-            <View style={{ paddingHorizontal: 40, overflow: 'visible' }}>
-              <OText size={16} lineHeight={24} weight={'500'}>{t('WANT_SOMETHING_ELSE', 'Do you want something else?')}</OText>
-              <UpsellingLayout />
-            </View>
-          }
         </ScrollView>
         <View
           style={{