ordering-ui-react-native 0.15.67 → 0.15.70

package/package.json

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

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

@@ -335,7 +335,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
         addressName: order?.business?.address,
         zipcode: order?.business?.zipcode
       },
-      icon: order?.business?.logo || theme.images.dummies.businessLogo,
+      icon: order?.business?.logo || 'https://res.cloudinary.com/demo/image/fetch/c_thumb,g_face,r_max/https://res.cloudinary.com/ordering2/image/upload/v1654619525/hzegwosnplvrbtjkpfi6.png',
       level: 2,
     },
     {

package/themes/original/index.tsx

@@ -45,7 +45,7 @@ import { UpsellingProducts } from './src/components/UpsellingProducts';
 import { UserVerification } from './src/components/UserVerification';
 import { BusinessListingSearch } from './src/components/BusinessListingSearch';
 import { LastOrders } from './src/components/LastOrders';
-import  NavBar from './src/components/NavBar';
+import NavBar from './src/components/NavBar';
 import { BusinessTypeFilter } from './src/components/BusinessTypeFilter';
 import { BusinessController } from './src/components/BusinessController';
 import { BusinessFeaturedController } from './src/components/BusinessFeaturedController';
@@ -81,17 +81,17 @@ import { SingleProductReview } from './src/components/SingleProductReview';
 import { LogoutButton } from './src/components/LogoutButton';
 import { UserFormDetailsUI } from './src/components/UserFormDetails';
 import { WalletTransactionItem } from './src/components/WalletTransactionItem';
-
+import { Promotions } from './src/components/Promotions'
 import { USER_TYPE, ORDER_TYPES } from './src/config/constants'
 
 import { OSBill, OSTable, OSCoupon, OSTotal, OSRow } from './src/components/OrderSummary/styles';
 
 import { FormInput, FormSide, ButtonsWrapper, LoginWith, OTab, OTabs } from './src/components/LoginForm/styles';
-import { OSItem, OSItemContent, OSItemActions} from './src/components/PaymentOptionStripe/styles';
+import { OSItem, OSItemContent, OSItemActions } from './src/components/PaymentOptionStripe/styles';
 
 import Alert from './src/providers/AlertProvider'
 
-import { 
+import {
 	LoginParams,
 	ProfileParams,
 	AddressListParams,
@@ -134,7 +134,7 @@ import {
 	OAlert,
 	OModal,
 	OBottomPopup,
-  	HeaderTitle
+	HeaderTitle
 } from './src/components/shared';
 
 import { Container } from './src/layouts/Container';
@@ -176,7 +176,7 @@ export {
 	BusinessMenuList,
 	UserProfile,
 	MessageListing,
-  	Messages,
+	Messages,
 	Help,
 	HelpAccountAndPayment,
 	HelpGuide,
@@ -231,7 +231,7 @@ export {
 	LogoutButton,
 	UserFormDetailsUI,
 	WalletTransactionItem,
-
+	Promotions,
 	ORDER_TYPES,
 	USER_TYPE,
 
@@ -296,7 +296,7 @@ export {
 	OAlert,
 	OModal,
 	OBottomPopup,
- 	HeaderTitle,
+	HeaderTitle,
 
 	// layout
 	Container,

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

@@ -202,7 +202,7 @@ const OrderSummaryUI = (props: any) => {
                     <OSRow>
                       <OText size={12} numberOfLines={1}>
                         {fee.name || t('INHERIT_FROM_BUSINESS', 'Inherit from business')}{' '}
-                        ({fee?.fixed > 0 && `${parsePrice(fee?.fixed)} + `}{fee.percentage}%)
+                        ({fee?.fixed > 0 && `${parsePrice(fee?.fixed)}${fee.percentage > 0 ? ' + ' : ''}`}{fee.percentage > 0 && `${fee.percentage}%`}){' '}
                       </OText>
                       <TouchableOpacity onPress={() => setOpenTaxModal({ open: true, data: fee, type: 'fee' })} >
                         <AntIcon name='infocirlceo' size={16} color={theme.colors.primary} />

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

@@ -51,7 +51,7 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
 				btnStyle={{ paddingLeft: 0 }}
 				paddingTop={0}
 				style={{ paddingBottom: 0 }}
-				title={t('HOW_WILL_YOUR_ORDER_TYPE', 'How will your order type?')}
+				title={t('HOW_WILL_YOU_DELIVERY_TYPE', 'How will your order type?')}
 				titleAlign={'center'}
 				titleStyle={{ fontSize: 14 }}
 			/>

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

@@ -24,15 +24,6 @@ export const SearchBarContainer = styled.View`
   width: 100%;
   justify-content: flex-start;
   margin-bottom: 20px;
-  .search-bar {
-    justify-content: flex-start;
-    input {
-      width: 100%;
-    }
-  }
-  .clear {
-    right: 0;
-  }
 `
 
 export const SingleBusinessOffer = styled.View`
@@ -48,11 +39,6 @@ export const OfferData = styled.View`
   display: flex;
   align-items: center;
   flex-direction: column;
-  p{
-    color: #909BA9;
-    margin: 3px;
-    font-size: 14px;
-  }
 `
 
 export const Code = styled.View`
@@ -62,14 +48,7 @@ export const Code = styled.View`
   margin-bottom: 10px;
 `
 
-export const ValueOfOffer = styled.View`
-  p{
-    font-size: 16px;
-  }
-  span{
-    font-size: 20px;
-  }
-`
+export const ValueOfOffer = styled.View``
 
 export const BusinessInfo = styled.View`
   flex: 1;

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

@@ -109,7 +109,7 @@ const ProfileListUI = (props: ProfileParams) => {
 	const [confirm, setConfirm] = useState<any>({ open: false, content: null, handleOnAccept: null, id: null, title: null })
 
 	const isWalletEnabled = configs?.wallet_enabled?.value === '1' && (configs?.wallet_cash_enabled?.value === '1' || configs?.wallet_credit_point_enabled?.value === '1')
-	const IsPromotionsEnabled = configs?.advanced_offers_module === '1' || configs?.advanced_offers_module === 'true'
+	const IsPromotionsEnabled = configs?.advanced_offers_module?.value === '1' || configs?.advanced_offers_module?.value === true
 	const onRedirect = (route: string, params?: any) => {
 		navigation.navigate(route, params)
 	}

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

@@ -63,7 +63,7 @@ const WalletsUI = (props: any) => {
 
   const currentWalletSelected = (walletList.wallets?.length > 0 && walletList.wallets?.find((w: any) => w.type === tabSelected)) ?? null
 
-  const loyaltyLevel = Object.keys(user?.loyalty_level).length > 0 && user?.loyalty_level
+  const loyaltyLevel = Object.keys(user?.loyalty_level ?? {}).length > 0 && user?.loyalty_level
 
   const walletName: any = {
     cash: {

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

@@ -58,7 +58,7 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
 				btnStyle={{ paddingLeft: 0 }}
 				paddingTop={0}
 				style={{ paddingBottom: 0 }}
-				title={t('HOW_WILL_YOUR_ORDER_TYPE', 'How will your order type?')}
+				title={t('HOW_WILL_YOU_DELIVERY_TYPE', 'How will your order type?')}
 				titleAlign={'center'}
 				titleStyle={{ fontSize: 14 }}
 			/>