ordering-ui-react-native 0.18.14-test → 0.18.15

package/package.json

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

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

@@ -161,7 +161,7 @@ export const DriverMap = (props: GoogleMapsParams) => {
     if (driverUpdateLocation.error) return;
 
     calculateDistance(
-      { lat: userLocation?.latitude, lng: userLocation?.longitude },
+      { lat: userLocation.latitude, lng: userLocation.longitude },
       destination,
     );
     // geocodePosition(userLocation);
@@ -241,8 +241,8 @@ export const DriverMap = (props: GoogleMapsParams) => {
         [
           { latitude: location.lat, longitude: location.lng },
           {
-            latitude: initialPosition?.latitude,
-            longitude: initialPosition?.longitude,
+            latitude: initialPosition.latitude,
+            longitude: initialPosition.longitude,
           },
         ],
         {
@@ -255,7 +255,7 @@ export const DriverMap = (props: GoogleMapsParams) => {
 
   useEffect(() => {
     const interval = setInterval(() => {
-      if (initialPosition?.latitude !== 0 && autoFit.current) {
+      if (initialPosition.latitude !== 0 && autoFit.current) {
         if (mapRef.current) {
           fitCoordinates();
           autoFit.current = false;
@@ -346,8 +346,8 @@ export const DriverMap = (props: GoogleMapsParams) => {
             ref={mapRef}
             provider={PROVIDER_GOOGLE}
             initialRegion={{
-              latitude: initialPosition?.latitude,
-              longitude: initialPosition?.longitude,
+              latitude: initialPosition.latitude,
+              longitude: initialPosition.longitude,
               latitudeDelta: 0.001,
               longitudeDelta: 0.001 * ASPECT_RATIO,
             }}
@@ -401,8 +401,8 @@ export const DriverMap = (props: GoogleMapsParams) => {
             ) : (
               <Marker
                 coordinate={{
-                  latitude: userLocation?.latitude,
-                  longitude: userLocation?.longitude,
+                  latitude: userLocation.latitude,
+                  longitude: userLocation.longitude,
                 }}
                 title={markerTitle || t('YOUR_LOCATION', 'Your Location')}
               />
@@ -514,9 +514,9 @@ export const DriverMap = (props: GoogleMapsParams) => {
               animationIn: 'slideInUp'
             }}
             options={{
-              latitude: destination?.latitude,
+              latitude: destination.latitude,
               longitude: destination.longitude,
-              sourceLatitude: userLocation?.latitude,
+              sourceLatitude: userLocation.latitude,
               sourceLongitude: userLocation.longitude,
               naverCallerName: 'com.deliveryapp',
               dialogTitle: t('SHOW_IN_OTHER_MAPS', 'Show in other maps'),

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

@@ -92,8 +92,8 @@ export const GoogleMap = (props: GoogleMapsParams) => {
 
   const geocodePosition = (pos: { latitude: number; longitude: number }) => {
     Geocoder.from({
-      latitude: pos?.latitude,
-      longitude: pos?.longitude,
+      latitude: pos.latitude,
+      longitude: pos.longitude,
     })
       .then(({ results }) => {
         let zipcode = null;
@@ -139,8 +139,8 @@ export const GoogleMap = (props: GoogleMapsParams) => {
       setMarkerPosition(curPos);
       setRegion({
         ...region,
-        longitude: curPos?.longitude,
-        latitude: curPos?.latitude,
+        longitude: curPos.longitude,
+        latitude: curPos.latitude,
       });
       return;
     }
@@ -149,8 +149,8 @@ export const GoogleMap = (props: GoogleMapsParams) => {
       setMarkerPosition(curPos);
       setRegion({
         ...region,
-        longitude: curPos?.longitude,
-        latitude: curPos?.latitude,
+        longitude: curPos.longitude,
+        latitude: curPos.latitude,
       });
     } else {
       setMapErrors && setMapErrors('ERROR_MAX_LIMIT_LOCATION');
@@ -330,7 +330,7 @@ export const GoogleMap = (props: GoogleMapsParams) => {
                           onPress={() => {
                             showLocation({
                               latitude: location?.latitude,
-                              longitude: location.longitude,
+                              longitude: location?.longitude,
                               sourceLatitude: userLocation?.latitude,
                               sourceLongitude: userLocation.longitude,
                               naverCallerName: 'com.businessapp',

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

@@ -55,10 +55,10 @@ const MapViewComponent = (props: MapViewParams) => {
     if (mapRef.current) {
       mapRef.current.fitToCoordinates(
         [
-          { latitude: location?.latitude, longitude: location.longitude },
+          { latitude: location.latitude, longitude: location.longitude },
           {
             latitude: userLocation?.latitude,
-            longitude: userLocation.longitude,
+            longitude: userLocation?.longitude,
           },
         ],
         {

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

@@ -45,7 +45,7 @@ const NewOrderNotificationUI = (props: any) => {
     },
   }
 
-  const notificationSound = new Sound(theme.sounds.notification, '', () => { });
+  const notificationSound = new Sound(theme.sounds.notification, '', () => {});
 
   let _timeout: any = null
 
@@ -75,11 +75,11 @@ const NewOrderNotificationUI = (props: any) => {
         await fetch(`${ordering.root}/users/${user.id}/locations`, {
           method: 'POST',
           body: JSON.stringify({
-            location: JSON.stringify({ location: `{lat: ${location?.latitude}, lng: ${location?.longitude}}` })
+            location: JSON.stringify({location: `{lat: ${location.latitude}, lng: ${location.longitude}}`})
           }),
           headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` }
         })
-      } catch { }
+      } catch {}
       const duration = moment.duration(moment().diff(moment.utc(value?.last_driver_assigned_at)))
       const assignedSecondsDiff = duration.asSeconds()
       if (assignedSecondsDiff < 5 && !isBusinessApp) {

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

@@ -557,7 +557,7 @@ export const BusinessPreorder = (props: any) => {
     : null
 
 const splitCateringValue = (configName : string) =>
-  Object.values(a || props?.business?.configs || {})
+  Object.values(props?.business?.configs || {})
     ?.find(config => config?.key === configName)
     ?.value?.split('|')
     ?.find(val => val.includes(cateringTypeString || ''))?.split(',')[1]

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

@@ -45,6 +45,7 @@ const CartUI = (props: any) => {
     isMultiCheckout,
     hideDeliveryFee,
     hideDriverTip,
+    hideCouponInput,
     preorderSlotInterval,
     preorderLeadTime,
     preorderTimeRange,
@@ -406,7 +407,7 @@ const CartUI = (props: any) => {
                 <OText size={12}>-{parsePrice(event.amount, { isTruncable: true })}</OText>
               </OSTable>
             ))}
-            {isCouponEnabled && !isCartPending && (
+            {isCouponEnabled && !isCartPending && !hideCouponInput && (
               <OSTable>
                 <OSCoupon>
                   <CouponControl

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

@@ -23,7 +23,9 @@ import { MultiCartsPaymethodsAndWallets } from '../MultiCartsPaymethodsAndWallet
 import { Cart } from '../Cart'
 import { FloatingButton } from '../FloatingButton'
 import { DriverTips } from '../DriverTips'
+import { CouponControl } from '../CouponControl';
 import { DriverTipsContainer } from '../Cart/styles'
+import { OSTable, OSCoupon } from '../OrderSummary/styles';
 
 import {
   ChContainer,
@@ -263,6 +265,29 @@ const MultiCheckoutUI = (props: any) => {
             </ChSection>
           )}
 
+          {
+            validationFields?.fields?.checkout?.coupon?.enabled &&
+            openCarts.every((cart: any) => cart.business_id && cart.status !== 2) &&
+            configs?.multi_business_checkout_coupon_input_style?.value === 'group' &&
+          (
+            <ChSection>
+              <OText size={14} lineHeight={20} color={theme.colors.textNormal}>
+                {t('DISCOUNT_COUPON', 'Discount coupon')}
+              </OText>
+              <OSTable>
+                <OSCoupon>
+                  <CouponControl
+                    isMulti
+                    carts={openCarts}
+                    businessIds={openCarts.map((cart: any) => cart.business_id)}
+                    price={openCarts.reduce((total: any, cart: any) => total + cart.total, 0)}
+                  />
+                </OSCoupon>
+              </OSTable>
+              <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginTop: 13, marginHorizontal: -40 }} />
+            </ChSection>
+          )}
+
           <ChSection>
             <ChCarts>
               <CartsHeader>
@@ -276,6 +301,7 @@ const MultiCheckoutUI = (props: any) => {
                     cart={cart}
                     cartuuid={cart.uuid}
                     isMultiCheckout
+                    hideCouponInput={configs?.multi_business_checkout_coupon_input_style?.value === 'group'}
                     hideDeliveryFee={configs?.multi_business_checkout_show_combined_delivery_fee?.value === '1'}
                     hideDriverTip={configs?.multi_business_checkout_show_combined_driver_tip?.value === '1'}
                     onNavigationRedirect={(route: string, params: any) => props.navigation.navigate(route, params)}

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

@@ -117,11 +117,11 @@ const OrderProgressUI = (props: any) => {
               <View style={styles.logoWrapper}>
                 <FastImage
                   style={{ width: 50, height: 50 }}
-                  source={{
+                  source={orderList?.orders.length === 1 ? {
                     uri: optimizeImage(lastOrder?.business?.logo, 'h_50,c_limit'),
                     priority: FastImage.priority.normal,
-                  }}
-                  resizeMode={FastImage.resizeMode.cover}
+                  } : theme.images.logos.logotype}
+                  resizeMode={FastImage.resizeMode.contain}
                 />
               </View>
               <View style={{
@@ -190,7 +190,7 @@ export const OrderProgress = (props: any) => {
     useDefualtSessionManager: true,
     paginationSettings: {
       initialPage: 1,
-      pageSize: 1,
+      pageSize: 10,
       controlType: 'infinity'
     }
   }

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

@@ -75,7 +75,7 @@ const PaymentOptionsUI = (props: any) => {
 			case 'paypal':
 				return theme.images.general.paypal
 			case 'stripe':
-				return theme.images.general.stripe
+				return theme.images.general.creditCard
 			case 'stripe_direct':
 				return theme.images.general.stripecc
 			case 'stripe_connect':