ordering-ui-external 2.7.3 → 3.0.1

package/_modules/themes/five/src/components/BusinessInformation/index.js

@@ -13,6 +13,7 @@ var _styles = require("./styles");
 var _MdClose = _interopRequireDefault(require("@meronex/icons/md/MdClose"));
 var _ScheduleAccordion = require("../ScheduleAccordion");
 var _styledComponents = require("styled-components");
+var _moment = _interopRequireDefault(require("moment"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -29,7 +30,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var BusinessInformationUI = function BusinessInformationUI(props) {
-  var _theme$business_view, _theme$business_view$, _theme$business_view$2, _theme$business_view$3, _theme$business_view$4, _theme$business_view2, _theme$business_view3, _theme$business_view4, _theme$business_view5, _theme$business_view6, _theme$business_view7, _theme$business_view8, _theme$business_view9, _theme$business_view10, _theme$business_view11, _theme$business_view12, _theme$business_view13, _theme$business_view14, _theme$business_view15, _theme$business_view16, _theme$business_view17, _theme$business_view18, _theme$business_view19, _theme$business_view20, _theme$business_view21, _theme$business_view22, _theme$business_view23, _theme$business_view24, _theme$business_view25, _theme$business_view26, _theme$business_view27, _theme$business_view28, _theme$business_view29, _theme$business_view30, _theme$business_view31, _theme$business_view32, _theme$business_view33, _theme$business_view34, _theme$business_view35, _theme$business_view36, _theme$business_view37, _theme$business_view38, _theme$business_view39, _theme$business_view40, _theme$business_view41, _props$beforeElements, _props$beforeComponen, _configs$google_maps_, _props$afterComponent, _props$afterElements;
+  var _theme$business_view, _theme$business_view$, _theme$business_view$2, _theme$business_view$3, _theme$business_view$4, _theme$business_view2, _theme$business_view3, _theme$business_view4, _theme$business_view5, _theme$business_view6, _theme$business_view7, _theme$business_view8, _theme$business_view9, _theme$business_view10, _theme$business_view11, _theme$business_view12, _theme$business_view13, _theme$business_view14, _theme$business_view15, _theme$business_view16, _theme$business_view17, _theme$business_view18, _theme$business_view19, _theme$business_view20, _theme$business_view21, _theme$business_view22, _theme$business_view23, _theme$business_view24, _theme$business_view25, _theme$business_view26, _theme$business_view27, _theme$business_view28, _theme$business_view29, _theme$business_view30, _theme$business_view31, _theme$business_view32, _theme$business_view33, _theme$business_view34, _theme$business_view35, _theme$business_view36, _theme$business_view37, _theme$business_view38, _theme$business_view39, _theme$business_view40, _theme$business_view41, _configs$general_hour, _props$beforeElements, _props$beforeComponen, _configs$google_maps_, _props$afterComponent, _props$afterElements;
   var business = props.business,
     businessLocation = props.businessLocation,
     businessSchedule = props.businessSchedule,
@@ -60,13 +61,12 @@ var BusinessInformationUI = function BusinessInformationUI(props) {
   var hidePickupTime = theme === null || theme === void 0 ? void 0 : (_theme$business_view27 = theme.business_view) === null || _theme$business_view27 === void 0 ? void 0 : (_theme$business_view28 = _theme$business_view27.components) === null || _theme$business_view28 === void 0 ? void 0 : (_theme$business_view29 = _theme$business_view28.information) === null || _theme$business_view29 === void 0 ? void 0 : (_theme$business_view30 = _theme$business_view29.components) === null || _theme$business_view30 === void 0 ? void 0 : (_theme$business_view31 = _theme$business_view30.pickup_time) === null || _theme$business_view31 === void 0 ? void 0 : _theme$business_view31.hidden;
   var hideImages = theme === null || theme === void 0 ? void 0 : (_theme$business_view32 = theme.business_view) === null || _theme$business_view32 === void 0 ? void 0 : (_theme$business_view33 = _theme$business_view32.components) === null || _theme$business_view33 === void 0 ? void 0 : (_theme$business_view34 = _theme$business_view33.information) === null || _theme$business_view34 === void 0 ? void 0 : (_theme$business_view35 = _theme$business_view34.components) === null || _theme$business_view35 === void 0 ? void 0 : (_theme$business_view36 = _theme$business_view35.images) === null || _theme$business_view36 === void 0 ? void 0 : _theme$business_view36.hidden;
   var hideAddress = theme === null || theme === void 0 ? void 0 : (_theme$business_view37 = theme.business_view) === null || _theme$business_view37 === void 0 ? void 0 : (_theme$business_view38 = _theme$business_view37.components) === null || _theme$business_view38 === void 0 ? void 0 : (_theme$business_view39 = _theme$business_view38.information) === null || _theme$business_view39 === void 0 ? void 0 : (_theme$business_view40 = _theme$business_view39.components) === null || _theme$business_view40 === void 0 ? void 0 : (_theme$business_view41 = _theme$business_view40.address) === null || _theme$business_view41 === void 0 ? void 0 : _theme$business_view41.hidden;
-  var scheduleFormatted = function scheduleFormatted(_ref) {
-    var hour = _ref.hour,
-      minute = _ref.minute;
-    var checkTime = function checkTime(val) {
-      return val < 10 ? "0".concat(val) : val;
-    };
-    return "".concat(checkTime(hour), ":").concat(checkTime(minute));
+  var formatTime = configs === null || configs === void 0 ? void 0 : (_configs$general_hour = configs.general_hour_format) === null || _configs$general_hour === void 0 ? void 0 : _configs$general_hour.value;
+  var checkTime = function checkTime(val) {
+    return val < 10 ? "0".concat(val) : val;
+  };
+  var timeFormated = function timeFormated(time) {
+    return (0, _moment.default)("1900-01-01 ".concat(checkTime(time.hour), ":").concat(checkTime(time.minute))).format(formatTime);
   };
   var handleModalImage = function handleModalImage(src) {
     setImage(src);
@@ -92,7 +92,7 @@ var BusinessInformationUI = function BusinessInformationUI(props) {
     return /*#__PURE__*/_react.default.createElement(_ScheduleAccordion.ScheduleAccordion, {
       key: i,
       weekIndex: i,
-      scheduleFormatted: scheduleFormatted,
+      timeFormated: timeFormated,
       schedule: schedule
     });
   }))), /*#__PURE__*/_react.default.createElement(_styles.Divider, null)), /*#__PURE__*/_react.default.createElement(_styles.DeliveryInfo, null, /*#__PURE__*/_react.default.createElement("div", null, !hideDeliveryTime && /*#__PURE__*/_react.default.createElement("h5", null, t('DELIVERY_TIME', 'Delivery Time'), ": ", (0, _utils.convertHoursToMinutes)(business === null || business === void 0 ? void 0 : business.delivery_time)), !hidePickupTime && /*#__PURE__*/_react.default.createElement("h5", null, t('PICKUP_TIME', 'Pickup Time'), ": ", (0, _utils.convertHoursToMinutes)(business === null || business === void 0 ? void 0 : business.pickup_time)))), /*#__PURE__*/_react.default.createElement(_styles.Divider, null)), !hideVideos && (businessVideos === null || businessVideos === void 0 ? void 0 : businessVideos.length) > 0 && /*#__PURE__*/_react.default.createElement(_styles.BusinessMediaContent, null, /*#__PURE__*/_react.default.createElement(_styles.SectionTitle, null, t('VIDEOS', 'Videos')), /*#__PURE__*/_react.default.createElement("div", null, businessVideos.map(function (video, i) {

package/_modules/themes/five/src/components/Header/index.js

@@ -296,7 +296,7 @@ var Header = function Header(props) {
     alt: "Isotype",
     width: isChew ? '70px' : '35px',
     height: isChew ? '20px' : '45px',
-    src: isChew ? theme === null || theme === void 0 ? void 0 : (_theme$images3 = theme.images) === null || _theme$images3 === void 0 ? void 0 : (_theme$images3$logos = _theme$images3.logos) === null || _theme$images3$logos === void 0 ? void 0 : _theme$images3$logos.chewLogo : isHome && windowSize.width < 576 ? theme === null || theme === void 0 ? void 0 : (_theme$images4 = theme.images) === null || _theme$images4 === void 0 ? void 0 : (_theme$images4$logos = _theme$images4.logos) === null || _theme$images4$logos === void 0 ? void 0 : _theme$images4$logos.isotypeInvert : (orderingTheme === null || orderingTheme === void 0 ? void 0 : (_orderingTheme$theme9 = orderingTheme.theme) === null || _orderingTheme$theme9 === void 0 ? void 0 : (_orderingTheme$theme10 = _orderingTheme$theme9.my_products) === null || _orderingTheme$theme10 === void 0 ? void 0 : (_orderingTheme$theme11 = _orderingTheme$theme10.components) === null || _orderingTheme$theme11 === void 0 ? void 0 : (_orderingTheme$theme12 = _orderingTheme$theme11.images) === null || _orderingTheme$theme12 === void 0 ? void 0 : (_orderingTheme$theme13 = _orderingTheme$theme12.components) === null || _orderingTheme$theme13 === void 0 ? void 0 : (_orderingTheme$theme14 = _orderingTheme$theme13.logo) === null || _orderingTheme$theme14 === void 0 ? void 0 : (_orderingTheme$theme15 = _orderingTheme$theme14.components) === null || _orderingTheme$theme15 === void 0 ? void 0 : _orderingTheme$theme15.image) || (theme === null || theme === void 0 ? void 0 : (_theme$images5 = theme.images) === null || _theme$images5 === void 0 ? void 0 : (_theme$images5$logos = _theme$images5.logos) === null || _theme$images5$logos === void 0 ? void 0 : _theme$images5$logos.isotype),
+    src: isChew ? theme === null || theme === void 0 ? void 0 : (_theme$images3 = theme.images) === null || _theme$images3 === void 0 ? void 0 : (_theme$images3$logos = _theme$images3.logos) === null || _theme$images3$logos === void 0 ? void 0 : _theme$images3$logos.chewLogo : windowSize.width <= 768 ? theme === null || theme === void 0 ? void 0 : (_theme$images4 = theme.images) === null || _theme$images4 === void 0 ? void 0 : (_theme$images4$logos = _theme$images4.logos) === null || _theme$images4$logos === void 0 ? void 0 : _theme$images4$logos.isotypeInvert : (orderingTheme === null || orderingTheme === void 0 ? void 0 : (_orderingTheme$theme9 = orderingTheme.theme) === null || _orderingTheme$theme9 === void 0 ? void 0 : (_orderingTheme$theme10 = _orderingTheme$theme9.my_products) === null || _orderingTheme$theme10 === void 0 ? void 0 : (_orderingTheme$theme11 = _orderingTheme$theme10.components) === null || _orderingTheme$theme11 === void 0 ? void 0 : (_orderingTheme$theme12 = _orderingTheme$theme11.images) === null || _orderingTheme$theme12 === void 0 ? void 0 : (_orderingTheme$theme13 = _orderingTheme$theme12.components) === null || _orderingTheme$theme13 === void 0 ? void 0 : (_orderingTheme$theme14 = _orderingTheme$theme13.logo) === null || _orderingTheme$theme14 === void 0 ? void 0 : (_orderingTheme$theme15 = _orderingTheme$theme14.components) === null || _orderingTheme$theme15 === void 0 ? void 0 : _orderingTheme$theme15.image) || (theme === null || theme === void 0 ? void 0 : (_theme$images5 = theme.images) === null || _theme$images5 === void 0 ? void 0 : (_theme$images5$logos = _theme$images5.logos) === null || _theme$images5$logos === void 0 ? void 0 : _theme$images5$logos.isotype),
     loading: "lazy"
   }))), isShowOrderOptions && windowSize.width >= 576 && /*#__PURE__*/_react.default.createElement(_styles.Menu, {
     id: "center-side",

package/_modules/themes/five/src/components/ProductForm/styles.js

@@ -72,7 +72,7 @@ var SectionTitle = _styledComponents.default.h3(_templateObject18 || (_templateO
 exports.SectionTitle = SectionTitle;
 var ProductComment = _styledComponents.default.div(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  margin-bottom: 130px;\n\n  textarea {\n    margin-top: 8px;\n  }\n\n  p {\n    font-weight: 300;\n    margin-bottom: 5px;\n  }\n\n  @media (min-width: 577px) {\n    margin-bottom: 62px;\n  }\n\n  @media (min-width: 769px) {\n    margin-bottom: 0px;\n    padding-bottom: 10px;\n  }\n"])));
 exports.ProductComment = ProductComment;
-var ProductActions = _styledComponents.default.div(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  align-items: center;\n  padding: 10px 0px;\n  width: 100%;\n  z-index: 9999997;\n\n  position: fixed;\n  bottom: 0;\n  right: 0;\n  width: 100%;\n  background-color: #FFF;\n\n  div.price {\n    padding-top: 10px;\n    color: ", ";\n    h4 {\n      margin: 0;\n      font-weight: 600;\n      font-size: 20px;\n      line-height: 20px;\n    }\n    span {\n      font-size: 13px;\n      color: #D83520;\n      line-height: 15px;\n    }\n  }\n\n  div.incdec-control {\n    width: 135px;\n    display: flex;\n    justify-content: space-around;\n    align-items: center;\n    position: relative;\n\n    svg {\n      width: 25px;\n      height: 25px;\n      cursor: pointer;\n    }\n  }\n\n  div.price-amount-block {\n    display: flex;\n    justify-content: space-between;\n    width: 70%\n  }\n\n  svg {\n    color: ", ";\n  }\n\n  svg.disabled {\n    pointer-events: none;\n    color: #CED4DA;\n  }\n\n  button:disabled,\n  button.disabled {\n    background: #E9ECEF;\n    border: 1px solid #E9ECEF;\n    color: #B1BCCC;\n  }\n\n  button.add {\n    width: 90%;\n    padding: 5px 10px;\n    margin-top: 10px;\n    position: relative;\n\n    &.soldout {\n      width: 100%;\n      pointer-events: none;\n    }\n  }\n  .qty {\n    flex: 1;\n    text-align: center;\n    display: flex;\n    align-items: center;\n    height: 38px;\n    min-width: 60px;\n    box-sizing: border-box;\n    padding: 0;\n    margin: 0 10px;\n  }\n\n  #address_control {\n    button.add {\n      width: calc(100% - 20px) !important;\n      margin: 10px 10px 0 10px;\n    }\n  }\n  \n  div#address_list {\n    padding: 0;\n  }\n\n  @media (min-width: 577px) {\n    position: sticky;\n  }\n\n  @media (min-width: 1200px) {\n    bottom: 0px;\n    flex-direction: row;\n    justify-content: space-between;\n    border-top: 1px solid #E9ECEF;\n    width: calc(100% + 40px);\n    transform: translateX(-20px);\n    padding: 10px 20px;\n    box-sizing: border-box;\n\n    ", "\n\n    div.price {\n      width: 25%;\n    }\n\n    button.add {\n      width: 35%;\n      margin-top: 0;\n    }\n\n    div.incdec-control {\n      margin-right: 18%;\n      &.show-weight-unit{\n        width: 30%;\n      }\n    }\n  }\n"])), function (props) {
+var ProductActions = _styledComponents.default.div(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  align-items: center;\n  padding: 10px 0px;\n  width: 100%;\n  z-index: 9999997;\n\n  position: fixed;\n  bottom: 0;\n  right: 0;\n  width: 100%;\n  background-color: #FFF;\n\n  div.price {\n    padding-top: 10px;\n    color: ", ";\n    h4 {\n      margin: 0;\n      font-weight: 600;\n      font-size: 20px;\n      line-height: 20px;\n    }\n    span {\n      font-size: 13px;\n      color: #D83520;\n      line-height: 15px;\n    }\n  }\n\n  div.incdec-control {\n    width: 195px;\n    display: flex;\n    justify-content: space-around;\n    align-items: center;\n    position: relative;\n\n    svg {\n      width: 25px;\n      height: 25px;\n      cursor: pointer;\n    }\n  }\n\n  div.price-amount-block {\n    display: flex;\n    justify-content: space-between;\n    width: 70%\n  }\n\n  svg {\n    color: ", ";\n  }\n\n  svg.disabled {\n    pointer-events: none;\n    color: #CED4DA;\n  }\n\n  button:disabled,\n  button.disabled {\n    background: #E9ECEF;\n    border: 1px solid #E9ECEF;\n    color: #B1BCCC;\n  }\n\n  button.add {\n    width: 90%;\n    padding: 5px 10px;\n    margin-top: 10px;\n    position: relative;\n\n    &.soldout {\n      width: 100%;\n      pointer-events: none;\n    }\n  }\n  .qty {\n    flex: 1;\n    text-align: center;\n    display: flex;\n    align-items: center;\n    height: 38px;\n    min-width: 60px;\n    box-sizing: border-box;\n    padding: 0;\n    margin: 0 10px;\n  }\n\n  #address_control {\n    button.add {\n      width: calc(100% - 20px) !important;\n      margin: 10px 10px 0 10px;\n    }\n  }\n  \n  div#address_list {\n    padding: 0;\n  }\n\n  @media (min-width: 577px) {\n    position: sticky;\n  }\n\n  @media (min-width: 1200px) {\n    bottom: 0px;\n    flex-direction: row;\n    justify-content: space-between;\n    border-top: 1px solid #E9ECEF;\n    width: calc(100% + 40px);\n    transform: translateX(-20px);\n    padding: 10px 20px;\n    box-sizing: border-box;\n\n    ", "\n\n    div.price {\n      width: 25%;\n    }\n\n    button.add {\n      width: 35%;\n      margin-top: 0;\n    }\n\n    div.incdec-control {\n      margin-right: 18%;\n      &.show-weight-unit{\n        width: 40%;\n      }\n    }\n  }\n"])), function (props) {
   var _props$theme;
   return (_props$theme = props.theme) === null || _props$theme === void 0 ? void 0 : _props$theme.colors.darkTextColor;
 }, function (props) {

package/_modules/themes/five/src/components/ScheduleAccordion/index.js

@@ -20,7 +20,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var ScheduleAccordion = function ScheduleAccordion(props) {
   var _schedule$lapses;
-  var scheduleFormatted = props.scheduleFormatted,
+  var timeFormated = props.timeFormated,
     schedule = props.schedule,
     weekIndex = props.weekIndex;
   var _useState = (0, _react.useState)(false),
@@ -42,8 +42,8 @@ var ScheduleAccordion = function ScheduleAccordion(props) {
     }
   }, schedule === null || schedule === void 0 ? void 0 : (_schedule$lapses = schedule.lapses) === null || _schedule$lapses === void 0 ? void 0 : _schedule$lapses.map(function (lapse, i) {
     return schedule !== null && schedule !== void 0 && schedule.enabled ? /*#__PURE__*/_react.default.createElement("p", {
-      key: "".concat(i, "-").concat(scheduleFormatted(lapse.open))
-    }, scheduleFormatted(lapse.open) + ' - ' + scheduleFormatted(lapse.close)) : /*#__PURE__*/_react.default.createElement(_styles.ClosedSchedule, null, t('CLOSED', 'Closed'));
+      key: "".concat(i, "-").concat(timeFormated(lapse.open))
+    }, timeFormated(lapse.open) + ' - ' + timeFormated(lapse.close)) : /*#__PURE__*/_react.default.createElement(_styles.ClosedSchedule, null, t('CLOSED', 'Closed'));
   }))));
 };
 exports.ScheduleAccordion = ScheduleAccordion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-external",
-  "version": "2.7.3",
+  "version": "3.0.1",
   "description": "Ordering UI Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -87,7 +87,7 @@
     "lodash": "^4.17.19",
     "moment": "^2.29.4",
     "nanoid": "^4.0.0",
-    "ordering-components-external": "2.8.1",
+    "ordering-components-external": "3.0.1",
     "payment": "^2.4.6",
     "polished": "^3.6.6",
     "react-bootstrap-icons": "^1.7.2",

package/src/components/MomentContent/index.js

@@ -8,7 +8,7 @@ import { SpinnerLoader } from '../SpinnerLoader'
 import { useWindowSize } from '../../hooks/useWindowSize'
 
 export const MomentContent = (props) => {
-  
+
   const [orderState] = useOrder()
 
   const { width } = useWindowSize()

package/src/themes/callcenterOriginal/src/components/Shared/Modal/index.js

@@ -73,7 +73,7 @@ const ModalUI = (props) => {
             {onCancel && <Button color='primary' onClick={() => onCancel()}>{cancelText || t('CANCEL')}</Button>}
           </ModalActions>)}
       </ModalDialogInnerContainer>
-      
+
     </ModalDialog>
   )
 }

package/src/themes/five/src/components/BusinessInformation/index.js

@@ -27,6 +27,7 @@ import {
 import MdClose from '@meronex/icons/md/MdClose'
 import { ScheduleAccordion } from '../ScheduleAccordion'
 import { useTheme } from 'styled-components'
+import moment from 'moment'
 
 export const BusinessInformationUI = (props) => {
   const {
@@ -53,11 +54,12 @@ export const BusinessInformationUI = (props) => {
   const hidePickupTime = theme?.business_view?.components?.information?.components?.pickup_time?.hidden
   const hideImages = theme?.business_view?.components?.information?.components?.images?.hidden
   const hideAddress = theme?.business_view?.components?.information?.components?.address?.hidden
+  const formatTime = configs?.general_hour_format?.value
 
-  const scheduleFormatted = ({ hour, minute }) => {
-    const checkTime = (val) => val < 10 ? `0${val}` : val
-    return `${checkTime(hour)}:${checkTime(minute)}`
-  }
+	const checkTime = (val) => (val < 10 ? `0${val}` : val);
+	const timeFormated = (time) => {
+		return moment(`1900-01-01 ${checkTime(time.hour)}:${checkTime(time.minute)}`).format(formatTime)
+	}
 
   const handleModalImage = (src) => {
     setImage(src)
@@ -125,7 +127,7 @@ export const BusinessInformationUI = (props) => {
                         <ScheduleAccordion
                           key={i}
                           weekIndex={i}
-                          scheduleFormatted={scheduleFormatted}
+                          timeFormated={timeFormated}
                           schedule={schedule}
                         />
                       ))}

package/src/themes/five/src/components/Header/index.js

@@ -240,7 +240,7 @@ export const Header = (props) => {
               isChew={isChew}
             >
               <img alt='Logotype' width='170px' height={isChew ? '35px' : '45px'} src={isChew ? theme?.images?.logos?.chewLogo : orderingTheme?.theme?.my_products?.components?.images?.components?.logo?.components?.image || theme?.images?.logos?.logotype} loading='lazy' />
-              <img alt='Isotype' width={isChew ? '70px' : '35px'} height={isChew ? '20px' : '45px'} src={isChew ? theme?.images?.logos?.chewLogo : (isHome && windowSize.width < 576 ? theme?.images?.logos?.isotypeInvert : orderingTheme?.theme?.my_products?.components?.images?.components?.logo?.components?.image || theme?.images?.logos?.isotype)} loading='lazy' />
+              <img alt='Isotype' width={isChew ? '70px' : '35px'} height={isChew ? '20px' : '45px'} src={isChew ? theme?.images?.logos?.chewLogo : (windowSize.width <= 768 ? theme?.images?.logos?.isotypeInvert : orderingTheme?.theme?.my_products?.components?.images?.components?.logo?.components?.image || theme?.images?.logos?.isotype)} loading='lazy' />
             </LogoHeader>
           </LeftHeader>
           {isShowOrderOptions && windowSize.width >= 576 && (

package/src/themes/five/src/components/ProductForm/styles.js

@@ -298,7 +298,7 @@ export const ProductActions = styled.div`
   }
 
   div.incdec-control {
-    width: 135px;
+    width: 195px;
     display: flex;
     justify-content: space-around;
     align-items: center;
@@ -400,7 +400,7 @@ export const ProductActions = styled.div`
     div.incdec-control {
       margin-right: 18%;
       &.show-weight-unit{
-        width: 30%;
+        width: 40%;
       }
     }
   }

package/src/themes/five/src/components/ScheduleAccordion/index.js

@@ -13,7 +13,7 @@ import IosArrowDown from '@meronex/icons/ios/IosArrowDown'
 export const ScheduleAccordion = (props) => {
 
 	const {
-		scheduleFormatted,
+		timeFormated,
 		schedule,
 		weekIndex
 	} = props
@@ -43,10 +43,10 @@ export const ScheduleAccordion = (props) => {
 				<HoursWrappers style={{ display: isActive ? 'flex' : 'none', paddingLeft: 60 }}>
 					{schedule?.lapses?.map((lapse, i) => (
 						schedule?.enabled ?
-							<p key={`${i}-${scheduleFormatted(lapse.open)}`}>
-								{scheduleFormatted(lapse.open) +
+							<p key={`${i}-${timeFormated(lapse.open)}`}>
+								{timeFormated(lapse.open) +
 									' - ' +
-									scheduleFormatted(lapse.close)}
+									timeFormated(lapse.close)}
 							</p>
 							:
 							<ClosedSchedule>

package/src/themes/two/src/components/Header/index.js

@@ -340,7 +340,7 @@ export const Header = (props) => {
                 )}
               </AddressWrapper>
               {(isPreOrderSetting || configState?.configs?.preorder_status_enabled?.value === undefined) && (
-                <MomentControl 
+                <MomentControl
                   isModalBehavior
                 />
               )}

package/template/app.js

@@ -170,14 +170,18 @@ export const App = () => {
     }
   }
 
+  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 businessesSlug = {
     marketplace: 'marketplace',
-    kiosk: settings?.businessSlug,
-    business: settings?.businessSlug
+    kiosk: updatedBusinessSlug,
+    business: updatedBusinessSlug
   }
 
   const singleBusinessConfig = {
-    isActive: settings?.use_marketplace || settings?.businessSlug || isKioskApp,
+    isActive: settings?.use_marketplace || updatedBusinessSlug || isKioskApp,
     businessSlug: businessesSlug[isKioskApp ? 'kiosk' : settings?.use_marketplace ? 'marketplace' : 'business']
   }
 
@@ -421,8 +425,8 @@ export const App = () => {
   }, [configs, loaded])
 
   useEffect(() => {
-    if (isHome && (settings?.use_marketplace || settings?.businessSlug)) {
-      goToPage('business', { store: settings?.use_marketplace ? 'marketplace' : settings?.businessSlug })
+    if (isHome && (settings?.use_marketplace || updatedBusinessSlug)) {
+      goToPage('business', { store: settings?.use_marketplace ? 'marketplace' : updatedBusinessSlug })
     }
   }, [])
 
@@ -483,7 +487,7 @@ export const App = () => {
                 singleBusinessConfig={singleBusinessConfig}
                 searchValue={searchValue}
                 setSearchValue={setSearchValue}
-                businessSlug={settings?.businessSlug}
+                businessSlug={updatedBusinessSlug}
                 notificationState={oneSignalState}
               />
             )}

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') {