ordering-ui-react-native 0.17.21 → 0.17.23

package/package.json

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

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import { LanguageSelector as LanguageSelectorController, useOrder } from 'ordering-components/native'
+import { LanguageSelector as LanguageSelectorController, useOrder, useLanguage } from 'ordering-components/native'
 import { useTheme } from 'styled-components/native';
 import { Platform, StyleSheet, View } from 'react-native'
 
@@ -11,6 +11,7 @@ import { OIcon } from '../shared'
 const LanguageSelectorUI = (props: LanguageSelectorParams) => {
 
 	const [orderState] = useOrder()
+	const [state] = useLanguage()
 
 	const theme = useTheme();
 
@@ -74,7 +75,7 @@ const LanguageSelectorUI = (props: LanguageSelectorParams) => {
 						useNativeAndroidPickerStyle={false}
 						placeholder={{}}
 						Icon={() => <View style={pickerStyle ? pickerStyle.icon : _pickerStyle.icon}><OIcon src={theme.images.general.arrow_down} color={theme.colors.white} style={{ width: '100%' }} /></View>}
-						disabled={orderState.loading}
+						disabled={orderState.loading || state.loading}
 					/>
 				</>
 			) : <DummyContainer />}

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

@@ -31,7 +31,8 @@ import {
   Map,
   Divider,
   OrderAction,
-  PlaceSpotWrapper
+  PlaceSpotWrapper,
+  ProfessionalPhoto
 } from './styles';
 import { OButton, OIcon, OModal, OText } from '../shared';
 import { ProductItemAccordion } from '../ProductItemAccordion';
@@ -876,6 +877,26 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               </OrderAction>
             </HeaderInfo>
             <OrderProducts>
+              {!!order?.products[0]?.calendar_event?.professional && (
+                <View style={{ flexDirection: 'row', alignItems: 'center', width: '100%' }}>
+                  {!!order?.products[0]?.calendar_event?.professional?.photo ? (
+                    <ProfessionalPhoto
+                      source={{
+                        uri: order?.products[0]?.calendar_event?.professional?.photo
+                      }}
+                      imageStyle={{ borderRadius: 8 }}
+                    />
+                  ) : (
+                    <OIcon
+                      src={theme.images.general.user}
+                      cover={false}
+                      width={82}
+                      height={82}
+                    />
+                  )}
+                  <OText size={12} lineHeight={18} weight={'500'} numberOfLines={1}>{order?.products[0]?.calendar_event?.professional?.name} {order?.products[0]?.calendar_event?.professional?.lastname}</OText>
+                </View>
+              )}
               {order?.products?.length &&
                 order?.products.map((product: any, i: number) => (
                   <ProductItemAccordion

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

@@ -132,3 +132,13 @@ export const OrderAction = styled.View`
 export const PlaceSpotWrapper = styled.View`
   padding-horizontal: 40px;
 `
+
+export const ProfessionalPhoto = styled.ImageBackground`
+  width: 100%;
+  position: relative;
+  max-height: 82px;
+  height: 82px;
+  width: 82px;
+  resize-mode: cover;
+  margin-right: 10px;
+`;

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

@@ -1108,11 +1108,20 @@ export const ProductOptionsUI = (props: any) => {
 
 
 export const ProductForm = (props: any) => {
-	const productOptionsProps = {
-		...props,
-		productCart: { ...props.productCart, quantity: props?.product?.minimum_per_order || 1 },
-		UIComponent: ProductOptionsUI,
-	};
+  const productOptionsProps = {
+    ...props,
+    productCart: {
+      ...props.productCart,
+      quantity: props.productCart?.code
+        ? props.productCart?.quantity
+        : props?.product?.minimum_per_order || 1
+    },
+    UIComponent: ProductOptionsUI
+  }
 
-	return <ProductOptions {...productOptionsProps} />;
+  return <ProductOptions {...productOptionsProps} />
 };
+
+ProductForm.defaultProps = {
+  productAddedToCartLength: 0
+}