ordering-ui-external 10.7.9 → 10.8.1

package/_bundles/{ordering-ui.fe9ee0200d1b9bb29a58.js.LICENSE.txt → ordering-ui.651385f69462465b5ecd.js.LICENSE.txt}

@@ -34,6 +34,8 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
 
+/*! https://mths.be/utf8js v2.1.2 by @mathias */
+
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */

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

@@ -247,7 +247,7 @@ var MomentControlUI = function MomentControlUI(props) {
     onClick: function onClick() {
       return onClose();
     },
-    disabled: !timeSelected
+    disabled: !isASP ? !timeSelected : false
   }, /*#__PURE__*/_react.default.createElement("span", null, t('CONTINUE', 'Continue')), /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ArrowRight, null))));
 };
 var MomentControl = function MomentControl(props) {

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

@@ -265,7 +265,7 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
     };
   }();
   var locations = [_objectSpread(_objectSpread({}, order === null || order === void 0 || (_order$driver = order.driver) === null || _order$driver === void 0 ? void 0 : _order$driver.location), {}, {
-    icon: (order === null || order === void 0 || (_order$driver2 = order.driver) === null || _order$driver2 === void 0 ? void 0 : _order$driver2.photo) || ((_theme$images = theme.images) === null || _theme$images === void 0 || (_theme$images = _theme$images.dummies) === null || _theme$images === void 0 ? void 0 : _theme$images.driverPhoto)
+    icon: (order === null || order === void 0 || (_order$driver2 = order.driver) === null || _order$driver2 === void 0 ? void 0 : _order$driver2.photo) || ((_theme$images = theme.images) === null || _theme$images === void 0 || (_theme$images = _theme$images.general) === null || _theme$images === void 0 ? void 0 : _theme$images.driverPng)
   }), _objectSpread(_objectSpread({}, order === null || order === void 0 || (_order$business2 = order.business) === null || _order$business2 === void 0 ? void 0 : _order$business2.location), {}, {
     icon: (order === null || order === void 0 || (_order$business3 = order.business) === null || _order$business3 === void 0 ? void 0 : _order$business3.logo) || ((_theme$images2 = theme.images) === null || _theme$images2 === void 0 || (_theme$images2 = _theme$images2.dummies) === null || _theme$images2 === void 0 ? void 0 : _theme$images2.businessLogo)
   }), _objectSpread(_objectSpread({}, order === null || order === void 0 || (_order$customer = order.customer) === null || _order$customer === void 0 ? void 0 : _order$customer.location), {}, {

package/index-template.js

@@ -44,6 +44,7 @@ import phoneHero from './template/assets/images/phone-hero-callcenter.png'
 import deliveryIco from './template/assets/images/delivery.svg'
 import pickupIco from './template/assets/images/pickup.svg'
 import phone from './template/assets/images/phone.svg'
+import driverPng from './template/assets/images/driver.png'
 
 import orderStatus0 from './template/assets/images/order/status-0.svg'
 import orderStatus1 from './template/assets/images/order/status-1.svg'
@@ -144,7 +145,8 @@ theme.images = {
     phoneHero,
     deliveryIco,
     pickupIco,
-    phone
+    phone,
+    driverPng
   },
 
   order: {

package/package.json

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

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

@@ -165,11 +165,11 @@ const MomentControlUI = (props) => {
         return
       }
       _timeLists = hoursList
-      .filter(hour => (Object.keys(business || {})?.length === 0 || schedule?.lapses?.some(lapse =>
-        moment(dateSelected + ` ${hour.startTime}`) >= moment(dateSelected + ` ${lapse.open.hour}:${lapse.open.minute}`).add(preorderLeadTime, 'minutes') && moment(dateSelected + ` ${hour.endTime}`) <= moment(dateSelected + ` ${lapse.close.hour}:${lapse.close.minute}`))) &&
+        .filter(hour => (Object.keys(business || {})?.length === 0 || schedule?.lapses?.some(lapse =>
+          moment(dateSelected + ` ${hour.startTime}`) >= moment(dateSelected + ` ${lapse.open.hour}:${lapse.open.minute}`).add(preorderLeadTime, 'minutes') && moment(dateSelected + ` ${hour.endTime}`) <= moment(dateSelected + ` ${lapse.close.hour}:${lapse.close.minute}`))) &&
         moment(dateSelected + ` ${hour.startTime}`) < moment(dateSelected + ` ${hour.endTime}`) &&
         (moment().add(preorderLeadTime, 'minutes') < moment(dateSelected + ` ${hour.startTime}`) || !cateringPreorder))
-      .map(hour => {
+        .map(hour => {
           return {
             value: hour.startTime,
             text: is12hours ? (
@@ -351,7 +351,7 @@ const MomentControlUI = (props) => {
           <Button
             color='primary'
             onClick={() => onClose()}
-            disabled={!timeSelected}
+            disabled={!isASP ? !timeSelected : false}
           >
             <span>{t('CONTINUE', 'Continue')}</span>
             <ArrowRight />

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

@@ -190,7 +190,7 @@ const OrderDetailsUI = (props) => {
   }
 
   const locations = [
-    { ...order?.driver?.location, icon: order?.driver?.photo || theme.images?.dummies?.driverPhoto },
+    { ...order?.driver?.location, icon: order?.driver?.photo || theme.images?.general?.driverPng },
     { ...order?.business?.location, icon: order?.business?.logo || theme.images?.dummies?.businessLogo },
     { ...order?.customer?.location, icon: order?.customer?.photo || theme.images?.dummies?.customerPhoto }
   ]