ordering-ui-react-native 0.12.8 → 0.12.12

package/themes/single-business/src/components/PreviousOrders/index.tsx

@@ -73,21 +73,32 @@ export const PreviousOrders = (props: PreviousOrdersParams) => {
 	const [reorderSelected, setReorderSelected] = useState<number | null>(null);
 	const [{ parseDate, optimizeImage }] = useUtils();
 	const allowedOrderStatus = [1, 2, 5, 6, 10, 11, 12];
+  const [isReviewedOrders, setIsReviewedOrders] = useState<Array<any>>([])
 
 	const handleClickViewOrder = (uuid: string) => {
 		onNavigationRedirect &&
 			onNavigationRedirect('OrderDetails', { orderId: uuid });
 	};
 
+  const handleReviewState = (orderId: any) => {
+    if (!orderId || isReviewedOrders.includes(orderId)) return
+    setIsReviewedOrders([ ...isReviewedOrders, orderId ])
+  }
+
 	const handleClickOrderReview = (order: any) => {
 		onNavigationRedirect &&
 			onNavigationRedirect('ReviewOrder', {
-				order: {
-					id: order?.id,
-					business_id: order?.business_id,
-					logo: order.business?.logo,
-				},
-			});
+        order: {
+          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
+        },
+        handleReviewState: handleReviewState
+      });
 	};
 
 	const formatDate = (date: string, option?: any) => {
@@ -100,82 +111,85 @@ export const PreviousOrders = (props: PreviousOrdersParams) => {
 	};
 
 	return (
-		<View style={{ marginBottom: 30 }}>
-			{orders.map((order: any) => (
-				<TouchableOpacity
-					onPress={() => handleClickViewOrder(order?.uuid)}
-					activeOpacity={0.7}
-					style={{ flexDirection: 'row' }}
-					key={order.id}>
-					<Card>
-						{/* {!!order.business?.logo && (
-							<Logo>
-								<OIcon
-									url={optimizeImage(order.business?.logo, 'h_300,c_limit')}
-									style={styles.logo}
-								/>
-							</Logo>
-						)} */}
-						<Information>
-							<OText size={12} lineHeight={18} weight={'600'} numberOfLines={1} ellipsizeMode={'tail'}>
-								{`${t('ORDER_NO', 'Order No')}.${order.id}`}
-							</OText>
-							<OText
-								size={10}
-								lineHeight={21}
-								color={theme.colors.textSecondary}
-								style={{ marginVertical: 3 }}
-								numberOfLines={1}>
-								{order?.delivery_datetime_utc
-									? formatDate(order?.delivery_datetime_utc)
-									: formatDate(order?.delivery_datetime, { utc: false })}
-							</OText>
-							<OText
-								color={theme.colors.primary}
-								size={10}
-								lineHeight={15}
-								numberOfLines={1}>
-								{getOrderStatus(order.status)?.value}
-							</OText>
-						</Information>
-						<Status>
-							<OButton
-								text={t('REORDER', 'Reorder')}
-								imgRightSrc={''}
-								textStyle={styles.buttonText}
-								style={
-									reorderLoading && order.id === reorderSelected
-										? styles.reorderLoading
-										: styles.reorderbutton
-								}
-								onClick={() => handleReorderClick(order.id)}
-								isLoading={reorderLoading && order.id === reorderSelected}
-							/>
-							{allowedOrderStatus.includes(parseInt(order?.status)) &&
-								!order.review && (
-									<TouchableOpacity
-										onPress={() => handleClickOrderReview(order)}
-										style={styles.reviewButton}>
-										<OText size={10} color={theme.colors.primary} numberOfLines={1}>
-											{t('REVIEW', 'Review')}
-										</OText>
-									</TouchableOpacity>
-								)}
-						</Status>
-					</Card>
-				</TouchableOpacity>
-			))}
-			{pagination.totalPages && pagination.currentPage < pagination.totalPages && (
-				<WrappButton>
-					<OButton
-						onClick={loadMoreOrders}
-						text={t('LOAD_MORE_ORDERS', 'Load more orders')}
-						imgRightSrc={null}
-						textStyle={{ color: theme.colors.white }}
-						style={{ borderRadius: 7.6, shadowOpacity: 0, marginTop: 20 }}
-					/>
-				</WrappButton>
-			)}
-		</View>
+    orders.length === 0 ? null : (
+      <View style={{ marginBottom: 30 }}>
+        {orders.map((order: any) => (
+          <TouchableOpacity
+            onPress={() => handleClickViewOrder(order?.uuid)}
+            activeOpacity={0.7}
+            style={{ flexDirection: 'row' }}
+            key={order.id}>
+            <Card>
+              {/* {!!order.business?.logo && (
+                <Logo>
+                  <OIcon
+                    url={optimizeImage(order.business?.logo, 'h_300,c_limit')}
+                    style={styles.logo}
+                  />
+                </Logo>
+              )} */}
+              <Information>
+                <OText size={12} lineHeight={18} weight={'600'} numberOfLines={1} ellipsizeMode={'tail'}>
+                  {`${t('ORDER_NO', 'Order No')}.${order.id}`}
+                </OText>
+                <OText
+                  size={10}
+                  lineHeight={21}
+                  color={theme.colors.textSecondary}
+                  style={{ marginVertical: 3 }}
+                  numberOfLines={1}>
+                  {order?.delivery_datetime_utc
+                    ? formatDate(order?.delivery_datetime_utc)
+                    : formatDate(order?.delivery_datetime, { utc: false })}
+                </OText>
+                <OText
+                  color={theme.colors.primary}
+                  size={10}
+                  lineHeight={15}
+                  numberOfLines={1}>
+                  {getOrderStatus(order.status)?.value}
+                </OText>
+              </Information>
+              <Status>
+                <OButton
+                  text={t('REORDER', 'Reorder')}
+                  imgRightSrc={''}
+                  textStyle={styles.buttonText}
+                  style={
+                    reorderLoading && order.id === reorderSelected
+                      ? styles.reorderLoading
+                      : styles.reorderbutton
+                  }
+                  onClick={() => handleReorderClick(order.id)}
+                  isLoading={reorderLoading && order.id === reorderSelected}
+                />
+                {allowedOrderStatus.includes(parseInt(order?.status)) &&
+                  !order.review && !isReviewedOrders.includes(order?.id) &&
+                (
+                  <TouchableOpacity
+                    onPress={() => handleClickOrderReview(order)}
+                    style={styles.reviewButton}>
+                    <OText size={10} color={theme.colors.primary} numberOfLines={1}>
+                      {t('REVIEW', 'Review')}
+                    </OText>
+                  </TouchableOpacity>
+                )}
+              </Status>
+            </Card>
+          </TouchableOpacity>
+        ))}
+        {pagination.totalPages && pagination.currentPage < pagination.totalPages && (
+          <WrappButton>
+            <OButton
+              onClick={loadMoreOrders}
+              text={t('LOAD_MORE_ORDERS', 'Load more orders')}
+              imgRightSrc={null}
+              textStyle={{ color: theme.colors.white }}
+              style={{ borderRadius: 7.6, shadowOpacity: 0, marginTop: 20 }}
+            />
+          </WrappButton>
+        )}
+      </View>
+    )
 	);
 };

package/themes/single-business/src/components/PromotionCard/index.tsx

@@ -19,8 +19,8 @@ export const PromotionCard = (props: any) => {
     onPromotionClick,
   } = props
 
-  const [theme] = useTheme();
-  const [{ optimizeImage }] = useUtils();
+  const theme = useTheme();
+  const [{ optimizeImage, parseDate }] = useUtils();
 
   return (
     <>
@@ -75,6 +75,14 @@ export const PromotionCard = (props: any) => {
                   {promotion?.description}
                 </OText>
               )}
+              <OText
+                size={16}
+                numberOfLines={1}
+                ellipsizeMode='tail'
+                style={styles.textStyle}
+              >
+                {`Expires ${parseDate(promotion?.end)}`}
+              </OText>
             </>
           )}
         </WrapContent>

package/themes/single-business/src/components/Promotions/index.tsx

@@ -12,7 +12,7 @@ const PromotionsUI = (props: any) => {
   const { offersState, loadMoreOffers } = props
 
   const [, t] = useLanguage();
-  const [theme] = useTheme();
+  const theme = useTheme();
   const { height } = useWindowDimensions();
 
   return (