ordering-ui-react-native 0.18.80 → 0.18.81

package/package.json

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

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

@@ -3,6 +3,8 @@ import {
   useLanguage,
   useConfig,
   useUtils,
+  useToast,
+  ToastType,
   MultiCartsPaymethodsAndWallets as MultiCartsPaymethodsAndWalletsController
 } from 'ordering-components/native'
 import { useTheme } from 'styled-components/native'
@@ -45,7 +47,8 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
   const [, t] = useLanguage()
   const [{ configs }] = useConfig()
   const [{ parsePrice }] = useUtils()
-	const { confirmApplePayPayment } = useApplePay()
+	const [, { showToast }] = useToast();
+  const { confirmApplePayPayment } = useApplePay()
 
   const [addCardOpen, setAddCardOpen] = useState({ stripe: false, stripeConnect: false });
 
@@ -91,20 +94,38 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
   }
 
   useEffect(() => {
-		if (methodsPay.includes(paymethodSelected?.gateway)) {
-      if (typeof paymethodSelected?.paymethod_data === 'string'){
-        const sourceId =  JSON.parse(paymethodSelected?.paymethod_data)?.source_id
+    if (methodsPay.includes(paymethodSelected?.gateway)) {
+      if (typeof paymethodSelected?.paymethod_data === 'string') {
+        const sourceId = JSON.parse(paymethodSelected?.paymethod_data)?.source_id
         sourceId && handlePlaceOrder(confirmApplePayPayment)
       }
-		}
-	}, [JSON.stringify(paymethodSelected)])
+    }
+  }, [JSON.stringify(paymethodSelected)])
+
+  useEffect(() => {
+    if (cartTotal === 0) {
+      handlePaymethodDataChange(null)
+      handleSelectPaymethod(null)
+    }
+  }, [cartTotal])
+
+  const handleChangePaymethod = (paymethod: any) => {
+    if (cartTotal > 0) {
+      handleSelectPaymethod(paymethod)
+      return
+    }
+    showToast(
+      ToastType.Error,
+      t('CART_BALANCE_ZERO', 'Sorry, the amount to pay is equal to zero and it is not necessary to select a payment method'))
+      ;
+  }
 
   const renderPaymethods = ({ item }: any) => {
     return (
       <>
         {item?.gateway === 'global_apple_pay' ? (
           <TouchableOpacity
-            onPress={() => handleSelectPaymethod({ ...item, paymethod: { gateway: item.gateway }, paymethod_id: item?.id })}
+            onPress={() => handleChangePaymethod({ ...item, paymethod: { gateway: item.gateway }, paymethod_id: item?.id })}
           >
             <OIcon
               src={getPayIcon(item.gateway)}
@@ -115,7 +136,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
           </TouchableOpacity>
         ) : (
           <TouchableOpacity
-            onPress={() => handleSelectPaymethod({ ...item, paymethod: { gateway: item.gateway }, paymethod_id: item?.id })}
+            onPress={() => handleChangePaymethod({ ...item, paymethod: { gateway: item.gateway }, paymethod_id: item?.id })}
           >
             <PMItem
               key={item.id}
@@ -208,9 +229,9 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
           handleSource={handlePaymethodDataChange}
           onCancel={() => setAddCardOpen({ ...addCardOpen, stripe: false })}
           setMethodPaySupported={setMethodPaySupported}
-					methodPaySupported={methodPaySupported}
-					placeByMethodPay={placeByMethodPay}
-					setPlaceByMethodPay={setPlaceByMethodPay}
+          methodPaySupported={methodPaySupported}
+          placeByMethodPay={placeByMethodPay}
+          setPlaceByMethodPay={setPlaceByMethodPay}
           methodsPay={methodsPay}
           paymethod={paymethodSelected?.paymethod?.gateway}
           cartTotal={cartTotal}

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

@@ -1018,7 +1018,9 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                           )} */}
                         </View>
                         <OText>
-                          -{parsePrice(event.amount, { isTruncable: true })}
+                          {configs.currency_position?.value === 'left'
+                            ? `${configs.format_number_currency?.value} -${parseNumber(event.amount, { isTruncable: true })}`
+                            : `-${parsePrice(event.amount, { isTruncable: true })}`}
                         </OText>
                       </View>
                     ))}

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

@@ -126,6 +126,12 @@ const PaymentOptionsUI = (props: any) => {
 			;
 	}
 
+	useEffect(() => {
+		if (cart?.balance === 0) {
+			handlePaymethodClick(null)
+		}
+	}, [cart?.balance])
+
 	useEffect(() => {
 		if (paymethodsList.paymethods.length === 1) {
 			handlePaymethodClick && handlePaymethodClick(paymethodsList.paymethods[0])
@@ -339,7 +345,7 @@ const PaymentOptionsUI = (props: any) => {
 					onPaymentChange={onPaymentChange}
 					payType={isOpenMethod?.paymethod?.name}
 					onSelectCard={handlePaymethodDataChange}
-					addCardOpen={addCardOpen} 
+					addCardOpen={addCardOpen}
 					setAddCardOpen={setAddCardOpen}
 					onCancel={() => handlePaymethodClick(null)}
 					paymethodSelected={paymethodSelected?.data?.id}