ordering-ui-react-native 0.23.30 → 0.23.32

package/package.json

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

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

@@ -25,14 +25,15 @@ const FloatingButtonUI = (props: FloatingButtonParams) => {
     secondButton,
     widthButton,
     isPadding,
-    isHideRejectButtons
+    isHideRejectButtons,
+    principalButtonColor
   } = props;
 
   const theme = useTheme();
 
   const styles = StyleSheet.create({
     primaryBtn: {
-      backgroundColor: theme.colors.primary,
+      backgroundColor: principalButtonColor ?? theme.colors.primary,
     },
     secodaryBtn: {
       backgroundColor: theme.colors.textSecondary,

package/themes/business/src/components/OrderDetails/Delivery.tsx

@@ -12,7 +12,8 @@ import {
   useSession,
   ToastType,
   useUtils,
-  useConfig
+  useConfig,
+  useApi
 } from 'ordering-components/native';
 
 import Alert from '../../providers/AlertProvider';
@@ -58,8 +59,9 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const [, { showToast }] = useToast();
   const [{ parsePrice, parseNumber }] = useUtils();
   const [{ configs }] = useConfig();
-
+  const [ordering] = useApi()
   const { order } = props.order
+  const isDelosiProject = ['delosi', 'delosipruebas'].includes(ordering?.project)
 
   const hideTimer = configs?.hidden_driver_eta_time?.value === '1'
   const isAllowedDriverRejectOrder = configs?.allow_driver_reject_order?.value === '1'
@@ -95,6 +97,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
 
   const deliveryTypes = [1, 7]
 
+
   const showFloatButtonsPickUp: any = {
     8: !isHideRejectButtons,
     3: true,
@@ -646,7 +649,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                     isHideRejectButtons={isHideRejectButtons || !isEnabledFailedPickupDriver}
                   />
                 )}
-                {(validStatusComplete.includes(order?.status)) && (
+                {(validStatusComplete.includes(order?.status)) && !(isDelosiProject && order?.status !== 26 && isHideRejectButtons) && (
                   <>
                     <FloatingButton
                       disabled={props.order?.loading || disabledActionsByInternet}
@@ -659,10 +662,11 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                         handleViewActionOrder && handleViewActionOrder('deliveryFailed')
                       }
                       secondBtnText={t('DELIVERY_COMPLETE', 'Delivery complete')}
-                      secondButton={true}
+                      secondButton={isDelosiProject ? order?.status === 26 : true}
                       firstColorCustom={theme.colors.red}
+                      principalButtonColor={theme.colors.red}
                       secondColorCustom={theme.colors.green}
-                      widthButton={isHideRejectButtons ? '100%' : '45%'}
+                      widthButton={isHideRejectButtons || (isDelosiProject && order?.status !== 26) ? '100%' : '45%'}
                       isHideRejectButtons={isHideRejectButtons}
                     />
                   </>

package/themes/business/src/types/index.tsx

@@ -503,7 +503,8 @@ export interface FloatingButtonParams {
   firstColorCustom?: string;
   secondColorCustom?: string;
   paddingBottomIos?: any;
-  isHideRejectButtons?: boolean
+  isHideRejectButtons?: boolean;
+  principalButtonColor?: string;
 }
 export interface MomentOptionParams {
   navigation: any;

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

@@ -54,6 +54,7 @@ const SingleProductCardUI = React.memo((props: SingleProductCardParams) => {
 		: theme?.business_view?.components?.products?.components?.product?.components?.image?.hidden
 	const textSize = isChewLayout ? 12 : 10
 	const logoPosition = theme?.business_view?.components?.products?.components?.product?.components?.image?.position
+	const hideFavoriteIcon = theme?.business_view?.components?.products?.components?.product?.components?.favorite?.hidden
 
 	const styles = StyleSheet.create({
 		container: {
@@ -198,7 +199,7 @@ const SingleProductCardUI = React.memo((props: SingleProductCardParams) => {
 									style={{ ...styles.line18, flex: 1 }}>
 									{product?.name}
 								</OText>
-								{!isPreviously && (
+								{!isPreviously && !hideFavoriteIcon && (
 									<LottieAnimation
 										type='favorite'
 										onClick={handleChangeFavorite}