ordering-ui-react-native 0.14.27 → 0.14.29-release

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

@@ -104,15 +104,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
 
   const { order, businessData } = props.order;
 
-  const walletName: any = {
-    cash: {
-      name: t('PAY_WITH_CASH_WALLET', 'Pay with Cash Wallet'),
-    },
-    credit_point: {
-      name: t('PAY_WITH_CREDITS_POINTS_WALLET', 'Pay with Credit Points Wallet'),
-    }
-  }
-
   const getOrderStatus = (s: string) => {
     const status = parseInt(s);
     const orderStatus = [
@@ -611,7 +602,9 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   <OText size={16} style={{ textAlign: 'left' }} color={theme.colors.textNormal}>
                     {t('DELIVERY_PREFERENCE', 'Delivery Preference')}
                   </OText>
-                  <OText size={12} style={{ textAlign: 'left' }} color={theme.colors.textNormal}>{order?.delivery_option?.name ?? t('EITHER_WAY', 'Either way')}</OText>
+                  <OText size={12} style={{ textAlign: 'left' }} color={theme.colors.textNormal}>
+                    {order?.delivery_option?.name ? t(order?.delivery_option?.name.toUpperCase().replace(/\s/g, '_')) : t('EITHER_WAY', 'Either way')}
+                  </OText>
                 </View>
               )}
               {order?.comment && (
@@ -835,51 +828,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   </OText>
                 </Table>
               </Total>
-              {order?.payment_events?.length > 0 && (
-                <View style={{marginTop: 10}}>
-                  <OText size={20} weight='bold' color={theme.colors.textNormal}>{t('PAYMENTS', 'Payments')}</OText>
-                  <View
-                    style={{
-                      width: '100%',
-                      marginTop: 10
-                    }}
-                  >
-                    {order?.payment_events?.map((event: any) => (
-                      <View
-                        key={event.id}
-                        style={{
-                          display: 'flex',
-                          flexDirection: 'row',
-                          justifyContent: 'space-between',
-                          alignItems: 'center',
-                          marginBottom: 10
-                        }}
-                      >
-                        <View
-                          style={{
-                            display: 'flex',
-                            flexDirection: 'column',
-                          }}
-                        >
-                          <OText>
-                            {event?.wallet_event
-                              ? walletName[event?.wallet_event?.wallet?.type]?.name
-                              : event?.paymethod?.name}
-                          </OText>
-                          {event?.data?.charge_id && (
-                            <OText>
-                              {`${t('CODE', 'Code')}: ${event?.data?.charge_id}`}
-                            </OText>
-                          )}
-                        </View>
-                        <OText>
-                          -{parsePrice(event.amount)}
-                        </OText>
-                      </View>
-                    ))}
-                  </View>
-                </View>
-              )}
             </OrderBill>
           </OrderContent>
         </>

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

@@ -193,13 +193,13 @@ const OrderProgressUI = (props: any) => {
           </View>
         </View>
       )}
-      {/* {!orderList?.loading && orderList?.orders?.length === 0 && (
+      {!orderList?.loading && orderList?.orders?.length === 0 && (
         <NotFoundSource
           image={imageFails}
           content={t('NO_RESULTS_FOUND', 'Sorry, no results found')}
           conditioned
         />
-      )} */}
+      )}
 		</>
 	)
 }

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

@@ -28,6 +28,7 @@ import { TouchableOpacity } from 'react-native';
 
 const OrderSummaryUI = (props: any) => {
   const {
+    cart,
     changeQuantity,
     getProductMax,
     offsetDisabled,
@@ -75,16 +76,6 @@ const OrderSummaryUI = (props: any) => {
     }
   }
 
-  const cart = orderState?.carts?.[`businessId:${props.cart.business_id}`]
-
-  const walletName: any = {
-    cash: {
-      name: t('PAY_WITH_CASH_WALLET', 'Pay with Cash Wallet'),
-    },
-    credit_point: {
-      name: t('PAY_WITH_CREDITS_POINTS_WALLET', 'Pay with Credit Points Wallet'),
-    }
-  }
 
   return (
     <OSContainer>
@@ -177,14 +168,6 @@ const OrderSummaryUI = (props: any) => {
                   <OText size={12}>{parsePrice(cart?.driver_tip)}</OText>
                 </OSTable>
               )}
-              {cart?.payment_events?.length > 0 && cart?.payment_events?.map((event: any) => (
-                <OSTable key={event.id}>
-                  <OText size={12} numberOfLines={1}>
-                    {walletName[cart?.wallets?.find((wallet: any) => wallet.id === event.wallet_id)?.type]?.name}
-                  </OText>
-                  <OText size={12}>-{parsePrice(event.amount)}</OText>
-                </OSTable>
-              ))}
               {isCouponEnabled && !isCartPending && (
                 <View>
                   <View style={{ paddingVertical: 5 }}>
@@ -202,7 +185,7 @@ const OrderSummaryUI = (props: any) => {
                       {t('TOTAL', 'Total')}
                     </OText>
                     <OText size={14} style={{ fontWeight: 'bold' }} >
-                      {parsePrice(cart?.balance ?? cart?.total)}
+                      {parsePrice(cart?.total)}
                     </OText>
                   </OSTable>
                 </View>
@@ -222,8 +205,7 @@ const OrderSummaryUI = (props: any) => {
                           height: 100,
                           borderColor: theme.colors.border,
                           paddingRight: 50,
-                          marginTop: 10,
-                          borderRadius: 8
+                          marginTop: 10
                         }}
                         multiline
                       />

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

@@ -380,13 +380,30 @@ export const ProductOptionsUI = (props: any) => {
 									</Placeholder>
 								) : (
 									<>
-										<OText
-											size={20}
-											lineHeight={30}
-											weight={'600'}
-											style={{ flex: 1, marginBottom: 5 }}>
-											{product?.name || productCart.name}
-										</OText>
+										<View style={{ flexDirection: 'row' }}>
+											<OText
+												size={20}
+												lineHeight={30}
+												weight={'600'}
+												style={{ flex: 1, marginBottom: 10 }}>
+												{product?.name || productCart.name}
+											</OText>
+											{product?.calories && (
+												<OText size={16} style={{ color: '#808080' }}>{product?.calories} cal
+												</OText>
+											)}
+										</View>
+										<View style={{ flexDirection: 'row', marginBottom: 10 }}>
+											<OText size={16} style={{ flex: I18nManager.isRTL ? 1 : 0 }} color={theme.colors.primary}>{productCart.price ? parsePrice(productCart.price) : ''}</OText>
+											{product?.offer_price && (
+												<OText style={{    fontSize: 14,
+													color: '#808080',
+													textDecorationLine: 'line-through',
+													marginLeft: 7,
+													marginRight: 7
+												}}>{parsePrice(product?.offer_price)}</OText>
+											)}
+										</View>
 										{((product?.sku && product?.sku !== '-1' && product?.sku !== '1') || (product?.estimated_person)) && (
 											<OText size={14} style={{ flex: I18nManager.isRTL ? 1 : 0 }} color={'#909BA9'} mBottom={7}>
 												{

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

@@ -14,7 +14,6 @@ import { ProfileParams } from '../../types';
 import { LogoutButton } from '../LogoutButton'
 import { LanguageSelector } from '../LanguageSelector'
 import MessageCircle from 'react-native-vector-icons/AntDesign'
-import Ionicons from 'react-native-vector-icons/Ionicons'
 
 import {
 	OIcon,
@@ -161,10 +160,6 @@ const ProfileListUI = (props: ProfileParams) => {
 						<MessageCircle name='message1' style={styles.messageIconStyle} color={theme.colors.textNormal} />
 						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MESSAGES', 'Messages')}</OText>
 					</ListItem>
-					<ListItem onPress={() => onRedirect('Wallets', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
-						<Ionicons name='wallet-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('WALLETS', 'Wallets')}</OText>
-					</ListItem>
 					<ListItem onPress={() => navigation.navigate('Help', {})} activeOpacity={0.7}>
 						<OIcon src={theme.images.general.ic_help} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
 						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('HELP', 'Help')}</OText>

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

@@ -129,7 +129,6 @@ export interface BusinessesListingParams {
 	businessTypes?: any;
 	defaultBusinessType?: any;
 	franchiseId?: any;
-	businessId?: any;
 }
 export interface HighestRatedBusinessesParams {
 	businessesList: { businesses: Array<any>, loading: boolean, error: null | string };
@@ -345,8 +344,8 @@ export interface MessagesParams {
 	onClose?: () => void,
 	isMeesageListing?: boolean,
 	setCanRead?: any,
-	business?: boolean,
-	driver?: boolean,
+	business: boolean,
+	driver: boolean,
 	onMessages?: any
 }
 export interface ViewInterface {
@@ -456,7 +455,6 @@ export interface GoogleMapsParams {
 
 export interface HelpParams {
 	navigation: any;
-	businessId?: any;
 }
 
 export interface LastOrdersParams {

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

@@ -1,163 +0,0 @@
-import React, { useState, useEffect } from 'react'
-import { Platform, StyleSheet, View } from 'react-native'
-import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
-import { useTheme } from 'styled-components/native'
-import CheckBox from '@react-native-community/checkbox';
-import {
-  PaymentOptionWallet as PaymentOptionWalletController,
-  useLanguage,
-  useUtils,
-} from 'ordering-components/native'
-
-import {
-  Container,
-  SectionLeft,
-} from './styles'
-
-import { OText } from '../shared'
-
-const PaymentOptionWalletUI = (props: any) => {
-  const {
-    cart,
-    walletsState,
-    selectWallet,
-    deletetWalletSelected
-  } = props
-
-  const theme = useTheme()
-  const [, t] = useLanguage()
-  const [{ parsePrice }] = useUtils()
-
-  const styles = StyleSheet.create({
-    checkBoxStyle: {
-      width: 25,
-      height: 25,
-    }
-  });
-
-  const [checkedState, setCheckedState] = useState(
-    new Array(walletsState.result?.length).fill(false)
-  );
-
-  const creditBalance = (wallet: any) => ` = ${parsePrice((wallet.balance * wallet.redemption_rate) / 100)}`
-
-  const walletName: any = {
-    cash: {
-      name: t('PAY_WITH_CASH_WALLET', 'Pay with Cash Wallet'),
-    },
-    credit_point: {
-      name: t('PAY_WITH_CREDITS_POINTS_WALLET', 'Pay with Credit Points Wallet'),
-    }
-  }
-
-  const handleOnChange = (position: any, wallet: any) => {
-    const updatedCheckedState = checkedState.map((item, index) =>
-      index === position ? !item : item
-    );
-
-    if (!checkedState[position]) {
-      selectWallet(wallet)
-    } else {
-      deletetWalletSelected(wallet)
-    }
-
-    setCheckedState(updatedCheckedState);
-  };
-
-  useEffect(() => {
-    if (!walletsState.loading) {
-      setCheckedState(
-        walletsState.result.map((wallet: any) => {
-          return !!cart?.wallets?.find((w: any) => w.id === wallet.id)
-        })
-      )
-    }
-  }, [walletsState.result?.length])
-
-  return (
-    <>
-      {!walletsState.loading &&
-        !walletsState.error &&
-        walletsState.result?.length > 0 &&
-      (
-        <>
-          {walletsState.result?.map((wallet: any, idx: any) => wallet.valid && (
-            <Container
-              key={wallet.id}
-              isBottomBorder={idx === walletsState.result?.filter((wallet: any) => wallet.valid)?.length - 1}
-            >
-              <SectionLeft>
-                <CheckBox
-                  value={checkedState[idx]}
-                  onValueChange={() => handleOnChange(idx, wallet)}
-                  disabled={(cart?.balance === 0 && !checkedState[idx]) || wallet.balance === 0 }
-                  boxType={'square'}
-                  tintColors={{
-                    true: theme.colors.primary,
-                    false: theme.colors.disabled
-                  }}
-                  tintColor={theme.colors.disabled}
-                  onCheckColor={theme.colors.primary}
-                  onTintColor={theme.colors.primary}
-                  style={Platform.OS === 'ios' && styles.checkBoxStyle}
-                />
-                <View style={{ alignItems: 'baseline' }}>
-                  <View>
-                    <OText
-                      style={((cart?.balance === 0 && !checkedState[idx]) || wallet.balance === 0) ?{
-                        color: theme.colors.disabled
-                      } : {}}
-                    >
-                      {walletName[wallet.type]?.name}
-                    </OText>
-                  </View>
-              </View>
-              </SectionLeft>
-
-              <View style={{maxWidth: '40%', alignItems: 'flex-end' }}>
-                {wallet.type === 'cash' && (
-                  <OText>
-                    {parsePrice(wallet?.balance)}
-                  </OText>
-                )}
-                {wallet.type === 'credit_point' && (
-                  <OText>
-                    <OText color={theme.colors.primary} weight='bold'>
-                    {`${wallet?.balance} ${t('POINTS', 'Points')}`}
-                    </OText>
-                    <OText>
-                      {`${wallet.balance > 0 && creditBalance(wallet)}`}
-                    </OText>
-                  </OText>
-                )}
-              </View>
-            </Container>
-          ))}
-        </>
-      )}
-
-      {walletsState?.loading && (
-        <View>
-          {[...Array(2).keys()].map(i => (
-            <View style={{ marginBottom: 10 }} key={i}>
-              <Placeholder Animation={Fade}>
-                <PlaceholderLine width={100} height={40} style={{ marginBottom: 0, borderRadius: 8 }} />
-              </Placeholder>
-            </View>
-          ))}
-        </View>
-      )}
-    </>
-  )
-}
-
-export const PaymentOptionWallet = (props: any) => {
-  const paymentWalletProps = {
-    ...props,
-    UIComponent: PaymentOptionWalletUI
-  }
-
-  return (
-    <PaymentOptionWalletController {...paymentWalletProps} />
-  )
-}

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

@@ -1,38 +0,0 @@
-import styled, { css } from 'styled-components/native'
-
-export const Container = styled.View`
-  width: 100%;
-  display: flex;
-  padding: 20px 0;
-  margin-top: 10px;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  border-top-width: 1px;
-  border-top-color: ${(props: any) => props.theme.colors.backgroundGray200};
-  ${(props: any) => props.isBottomBorder && css`
-    border-bottom-width: 1px;
-    border-bottom-color: ${(props: any) => props.theme.colors.backgroundGray200};
-  `}
-`
-
-export const SectionLeft = styled.View`
-  max-width: 55%;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-`
-
-export const SectionLeftText = styled.View`
-  alignSelf: flex-start;
-  display: flex;
-  flex-direction: column;
-  flex-wrap: wrap;
-`
-
-export const SectionWrapper = styled.View`
-  padding-top: 10px;
-  display: flex;
-  flex-direction: column;
-`

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

@@ -1,68 +0,0 @@
-import React from 'react'
-import { useTheme } from 'styled-components/native'
-import { useLanguage, useUtils } from 'ordering-components/native'
-
-import {
-  Container,
-  DateBlock,
-  MessageBlock,
-  DescriptionBlock,
-  Dot
-} from './styles'
-import { OIcon, OText } from '../shared';
-
-export const WalletTransactionItem = (props: any) => {
-  const {
-    item,
-    idx,
-    type
-  } = props
-
-  const theme = useTheme()
-  const [{ parsePrice, parseDate }] = useUtils()
-  const [, t] = useLanguage()
-
-  const LANG_EVENT_KEY = `WALLET_${type.toUpperCase()}_${item?.event.toUpperCase()}_${item?.event_type.toUpperCase()}_${item?.amount >= 0 ? 'POSITIVE': 'NEGATIVE'}`
-  const lang_event_text = !!item?.event?.order_id
-    ? `:author ${item?.amount >= 0 ? 'add' : 'reduce'} money in Order No. :order_id`
-    : `:author ${item?.amount >= 0 ? 'add' : 'reduce'} money`
-
-  return (
-    <Container>
-      <Dot isTop={idx === 0} />
-      <DateBlock>
-        <OText color={theme.colors.disabled}>{parseDate(item?.created_at)}</OText>
-        <OText
-          style={{
-            color: item?.amount > 0 && theme.colors.primary,
-            fontWeight: 'bold'
-          }}
-        >
-          {item?.amount > 0 && '+ '}{parsePrice(item?.amount)}
-        </OText>
-      </DateBlock>
-      <MessageBlock>
-        <OText>
-          {t(LANG_EVENT_KEY, lang_event_text)
-            .replace(':author', item?.event?.author?.name ?? '')
-            .replace(':order_id', item?.event?.order_id ?? '')}
-        </OText>
-      </MessageBlock>
-      {!!item?.description && (
-        <DescriptionBlock>
-          <OText>{item?.description}</OText>
-        </DescriptionBlock>
-      )}
-      {!!item?.code && (
-        <DescriptionBlock>
-          <OText weight={'bold'}>
-            {t('CODE', 'Code')}
-            <OText weight={'100'}>
-              {': '}{item?.code}
-            </OText>
-          </OText>
-        </DescriptionBlock>
-      )}
-    </Container>
-  )
-}

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

@@ -1,37 +0,0 @@
-import styled from 'styled-components/native'
-
-export const Container = styled.View`
-  display: flex;
-  flex-direction: column;
-  margin-bottom: 20px;
-  position: relative;
-  padding-left: 10px;
-`
-
-export const DateBlock = styled.View`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-`
-
-export const MessageBlock = styled.View`
-  display: flex;
-  font-size: 14px;
-`
-
-export const Dot = styled.View`
-  position: absolute;
-  top: ${(props: any) => props.isTop ? 0 : 6}px;
-  left: -4px;
-  width: 6px;
-  height: 6px;
-  border-radius: 50px;
-  background-color: ${(props: any) => props.theme.colors.disabled};
-`
-
-export const DescriptionBlock = styled(MessageBlock)`
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-`