ordering-ui-external 2.7.2 → 3.0.0

package/template/pages/BusinessProductsList/index.js

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import { useParams, useLocation } from 'react-router-dom'
-import { useApi, useEvent, useSite } from 'ordering-components-external'
+import { useApi, useEvent, useSite, useOrderingTheme } from 'ordering-components-external'
 import { BusinessProductsListing } from '../../../src/themes/five/src/components/BusinessProductsListing'
 import { HelmetTags } from '../../components/HelmetTags'
 import { capitalize } from '../../../src/utils'
@@ -10,6 +10,12 @@ import { checkSiteUrl } from '../../Utils'
 export const BusinessProductsList = (props) => {
   const [{ site }] = useSite()
   const { search } = useLocation()
+  const [orderingTheme] = useOrderingTheme()
+
+  const websiteThemeType = orderingTheme?.theme?.my_products?.components?.website_theme?.components?.type
+  const websiteThemeBusinessSlug = orderingTheme?.theme?.my_products?.components?.website_theme?.components?.business_slug
+  const updatedBusinessSlug = (websiteThemeType === 'single_store' && websiteThemeBusinessSlug) || settings?.businessSlug
+
   const [helmetMetaTags, setHelmetMetaTags] = useState({
     title: '',
     description: '',
@@ -19,7 +25,7 @@ export const BusinessProductsList = (props) => {
   let businessSlug = ''
   const businessUrlTemplate = checkSiteUrl(site?.business_url_template, '/store/:business_slug')
   const productUrlTemplate = checkSiteUrl(site?.product_url_template, '/store/:business_slug?category=:category_id&product=:product_id')
-  
+
   if (businessUrlTemplate.includes('?')) {
     const businessParameter = businessUrlTemplate.replace('/store?', '').replace('=:business_slug', '')
     const params = new URLSearchParams(search)
@@ -82,11 +88,11 @@ export const BusinessProductsList = (props) => {
     ...props,
     ordering,
     avoidBusinessLoading: true,
-    isCustomLayout: settings?.use_marketplace || settings?.businessSlug,
+    isCustomLayout: settings?.use_marketplace || updatedBusinessSlug,
     useKioskApp: settings?.use_kiosk,
     isSearchByName: true,
     isSearchByDescription: true,
-    slug: settings?.businessSlug || businessSlug,
+    slug: updatedBusinessSlug || businessSlug,
     categoryId,
     productId,
     businessProps: [

package/template/pages/BusinessesList/index.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { BusinessesListing } from '../../../src/themes/five/src/components/BusinessesListing'
-import { useEvent, useSite } from 'ordering-components-external'
+import { useEvent, useSite, useOrderingTheme } from 'ordering-components-external'
 import { HelmetTags } from '../../components/HelmetTags'
 import settings from '../../config'
 import { checkSiteUrl } from '../../Utils'
@@ -8,15 +8,22 @@ import { checkSiteUrl } from '../../Utils'
 export const BusinessesList = (props) => {
   const [events] = useEvent()
   const [{ site }] = useSite()
+  const [orderingTheme] = useOrderingTheme()
 
   const businessUrlTemplate = checkSiteUrl(site?.business_url_template, '/store/:business_slug')
 
+  const websiteThemeType = orderingTheme?.theme?.my_products?.components?.website_theme?.components?.type
+  const websiteThemeBusinessSlug = orderingTheme?.theme?.my_products?.components?.website_theme?.components?.business_slug
+  const updatedBusinessSlug = (websiteThemeType === 'single_store' && websiteThemeBusinessSlug) || settings?.businessSlug
+  const websiteThemeFranchiseSlug = orderingTheme?.theme?.my_products?.components?.website_theme?.components?.franchise_slug
+  const updatedFranchiseSlug = (websiteThemeType === 'franchise' && websiteThemeFranchiseSlug) || settings?.franchiseSlug
+
   const businessListingProps = {
     ...props,
     isSearchByName: true,
     isSearchByDescription: true,
-    franchiseId: settings?.franchiseSlug,
-    businessId: settings?.businessSlug,
+    franchiseId: updatedFranchiseSlug,
+    businessId: updatedBusinessSlug,
     onBusinessClick: (business) => {
       if (businessUrlTemplate === '/store/:business_slug' || businessUrlTemplate === '/:business_slug') {
         events.emit('go_to_page', { page: 'business', params: { business_slug: business.slug } })
@@ -26,7 +33,7 @@ export const BusinessesList = (props) => {
     },
     currentPageParam: 0,
     propsToFetch: ['id', 'name', 'header', 'logo', 'location', 'address', 'ribbon', 'timezone', 'schedule', 'open', 'delivery_price', 'distance', 'delivery_time', 'pickup_time', 'reviews', 'featured', 'offers', 'food', 'laundry', 'alcohol', 'groceries', 'slug', 'city', 'city_id', 'menus'],
-    onRedirectPage: (data) => events.emit('go_to_page', data),
+    onRedirectPage: (data) => events.emit('go_to_page', data)
   }
 
   return (

package/template/pages/Checkout/index.js

@@ -4,7 +4,7 @@ import { useParams, useLocation } from 'react-router-dom'
 import { HelmetTags } from '../../components/HelmetTags'
 
 import { Checkout } from '../../../src/themes/five/src/components/Checkout'
-import { useEvent, useOrder, useLanguage, useSite } from 'ordering-components-external'
+import { useEvent, useOrder, useLanguage, useSite, useOrderingTheme } from 'ordering-components-external'
 import settings from '../../config'
 import { checkSiteUrl } from '../../Utils'
 
@@ -15,6 +15,11 @@ export const CheckoutPage = (props) => {
   const [orderState, { confirmCart, changeMoment }] = useOrder()
   const [, t] = useLanguage()
   const [{ site }] = useSite()
+  const [orderingTheme] = useOrderingTheme()
+  const websiteThemeType = orderingTheme?.theme?.my_products?.components?.website_theme?.components?.type
+  const websiteThemeBusinessSlug = orderingTheme?.theme?.my_products?.components?.website_theme?.components?.business_slug
+  const updatedBusinessSlug = (websiteThemeType === 'single_store' && websiteThemeBusinessSlug) || settings?.businessSlug
+
   const stripePayments = ['stripe', 'stripe_connect', 'stripe_direct', 'google_pay', 'apple_pay']
   const businessUrlTemplate = checkSiteUrl(site?.business_url_template, '/store/:business_slug')
 
@@ -101,7 +106,7 @@ export const CheckoutPage = (props) => {
     useValidationFields: true,
     validationFieldsType: 'checkout',
     useKioskApp: settings?.use_kiosk,
-    businessSlug: settings?.businessSlug,
+    businessSlug: updatedBusinessSlug,
     onPlaceOrderClick: (data, paymethod, cart) => {
       if (cart?.order?.uuid) {
         if (orderState?.options?.moment) {

package/template/pages/Home/index.js

@@ -26,6 +26,9 @@ export const HomePage = (props) => {
   const [events] = useEvent()
   const [{ site }] = useSite()
   const [{ theme }] = useOrderingTheme()
+  const websiteThemeType = theme?.my_products?.components?.website_theme?.components?.type
+  const websiteThemeBusinessSlug = theme?.my_products?.components?.website_theme?.components?.business_slug
+  const updatedBusinessSlug = (websiteThemeType === 'single_store' && websiteThemeBusinessSlug) || settings?.businessSlug
 
   const requestsState = {}
   const isKioskApp = settings?.use_kiosk
@@ -38,9 +41,9 @@ export const HomePage = (props) => {
 
   const handleGoToBusiness = () => {
     if (businessUrlTemplate === '/store/:business_slug' || businessUrlTemplate === '/:business_slug') {
-      events.emit('go_to_page', { page: 'business', params: { business_slug: settings?.businessSlug } })
+      events.emit('go_to_page', { page: 'business', params: { business_slug: updatedBusinessSlug } })
     } else {
-      events.emit('go_to_page', { page: 'business', search: `?${businessUrlTemplate.split('?')[1].replace(':business_slug', '')}${settings?.businessSlug}` })
+      events.emit('go_to_page', { page: 'business', search: `?${businessUrlTemplate.split('?')[1].replace(':business_slug', '')}${updatedBusinessSlug}` })
     }
   }
 

package/template/pages/MessagesList/index.js

@@ -2,14 +2,19 @@ import React from 'react'
 import { MessagesListing } from '../../../src/themes/five/src/components/MessagesListing'
 
 import { HelmetTags } from '../../components/HelmetTags'
-import { useEvent } from 'ordering-components-external'
+import { useEvent, useOrderingTheme } from 'ordering-components-external'
 import settings from '../../config'
 
 export const MessagesList = (props) => {
   const [events] = useEvent()
+  const [orderingTheme] = useOrderingTheme()
+  const websiteThemeType = orderingTheme?.theme?.my_products?.components?.website_theme?.components?.type
+  const websiteThemeFranchiseSlug = orderingTheme?.theme?.my_products?.components?.website_theme?.components?.franchise_slug
+  const updatedFranchiseSlug = (websiteThemeType === 'franchise' && websiteThemeFranchiseSlug) || settings?.franchiseSlug
+
   const messageprops = {
     ...props,
-    franchiseId: settings?.franchiseSlug,
+    franchiseId: updatedFranchiseSlug,
     onRedirectPage: (data) => events.emit('go_to_page', data)
   }
   return (

package/template/pages/MyOrders/index.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { useSite, useEvent } from 'ordering-components-external'
+import { useSite, useEvent, useOrderingTheme } from 'ordering-components-external'
 import { MyOrders as MyOrdersController } from '../../../src/themes/five/src/components/MyOrders'
 import { HelmetTags } from '../../components/HelmetTags'
 import settings from '../../config'
@@ -9,14 +9,21 @@ import { useWindowSize } from '../../../src/hooks/useWindowSize'
 export const MyOrders = (props) => {
   const [events] = useEvent()
   const [{ site }] = useSite()
+  const [orderingTheme] = useOrderingTheme()
+  const websiteThemeType = orderingTheme?.theme?.my_products?.components?.website_theme?.components?.type
+  const websiteThemeBusinessSlug = orderingTheme?.theme?.my_products?.components?.website_theme?.components?.business_slug
+  const updatedBusinessSlug = (websiteThemeType === 'single_store' && websiteThemeBusinessSlug) || settings?.businessSlug
+  const websiteThemeFranchiseSlug = orderingTheme?.theme?.my_products?.components?.website_theme?.components?.franchise_slug
+  const updatedFranchiseSlug = (websiteThemeType === 'franchise' && websiteThemeFranchiseSlug) || settings?.franchiseSlug
+
   const windowSize = useWindowSize()
   const businessUrlTemplate = checkSiteUrl(site?.business_url_template, '/store/:business_slug')
   const productUrlTemplate = checkSiteUrl(site?.product_url_template, '/store/:business_slug?category=:category_id&product=:product_id')
 
   const ordersProps = {
     ...props,
-    franchiseId: settings?.franchiseSlug,
-    businessId: settings?.businessSlug,
+    franchiseId: updatedFranchiseSlug,
+    businessId: updatedBusinessSlug,
     hideOptions: windowSize.width < 576,
     onRedirectPage: (data) => {
       if (data.page === 'business') {