ordering-ui-admin-external 1.40.4 → 1.40.6

package/_modules/components/Orders/OrderBill/index.js

@@ -63,6 +63,7 @@ var OrderBill = exports.OrderBill = function OrderBill(props) {
     4: t('SPOT_NUMBER_CURBSIDE', 'Spot number'),
     5: t('SPOT_NUMBER_DRIVE_THRU', 'Drive thru lane')
   };
+  var isPickupOrder = (order === null || order === void 0 ? void 0 : order.delivery_type) === 2;
   var walletName = {
     cash: {
       name: t('CASH_WALLET', 'Cash Wallet')
@@ -169,7 +170,7 @@ var OrderBill = exports.OrderBill = function OrderBill(props) {
     }, /*#__PURE__*/_react.default.createElement("td", null, t(offer === null || offer === void 0 || (_offer$name2 = offer.name) === null || _offer$name2 === void 0 || (_offer$name2 = _offer$name2.toUpperCase()) === null || _offer$name2 === void 0 ? void 0 : _offer$name2.replaceAll(' ', '_'), offer.name), offer.rate_type === 1 && /*#__PURE__*/_react.default.createElement("span", null, "(".concat((0, _utils.verifyDecimals)(offer === null || offer === void 0 ? void 0 : offer.rate, parsePrice), "%)"))), /*#__PURE__*/_react.default.createElement("td", null, "- ", parsePrice(offer === null || offer === void 0 || (_offer$summary2 = offer.summary) === null || _offer$summary2 === void 0 ? void 0 : _offer$summary2.discount, {
       currency: (0, _utils.getCurrenySymbol)(order === null || order === void 0 ? void 0 : order.currency)
     })));
-  })), typeof (order === null || order === void 0 || (_order$summary12 = order.summary) === null || _order$summary12 === void 0 ? void 0 : _order$summary12.delivery_price) === 'number' && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DELIVERY_FEE', 'Delivery Fee')), /*#__PURE__*/_react.default.createElement("td", null, parsePrice((order === null || order === void 0 || (_order$summary13 = order.summary) === null || _order$summary13 === void 0 ? void 0 : _order$summary13.delivery_price) + getIncludedTaxes(true), {
+  })), typeof (order === null || order === void 0 || (_order$summary12 = order.summary) === null || _order$summary12 === void 0 ? void 0 : _order$summary12.delivery_price) === 'number' && !isPickupOrder && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DELIVERY_FEE', 'Delivery Fee')), /*#__PURE__*/_react.default.createElement("td", null, parsePrice((order === null || order === void 0 || (_order$summary13 = order.summary) === null || _order$summary13 === void 0 ? void 0 : _order$summary13.delivery_price) + getIncludedTaxes(true), {
     currency: (0, _utils.getCurrenySymbol)(order === null || order === void 0 ? void 0 : order.currency)
   }))), (order === null || order === void 0 || (_order$taxes6 = order.taxes) === null || _order$taxes6 === void 0 ? void 0 : _order$taxes6.length) > 0 && (order === null || order === void 0 || (_order$taxes7 = order.taxes) === null || _order$taxes7 === void 0 ? void 0 : _order$taxes7.filter(function (tax) {
     return (tax === null || tax === void 0 ? void 0 : tax.type) === 2 && (tax === null || tax === void 0 ? void 0 : tax.rate) !== 0 && (tax === null || tax === void 0 ? void 0 : tax.target) === 'delivery_fee';

package/_modules/components/Orders/OrderDetailsHeader/index.js

@@ -94,7 +94,7 @@ var OrderDetailsHeader = exports.OrderDetailsHeader = function OrderDetailsHeade
       return document.removeEventListener('click', closeSelect);
     };
   }, [showPrinterOptions]);
-  return /*#__PURE__*/_react.default.createElement(_styles2.OrderDetailsHeaderContainer, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h1", null, isServiceOrder ? t('APPOINTMENT_NO', 'Appointment No.') : t('INVOICE_ORDER_NO', 'Order No'), " ", showExternalId && !!(order !== null && order !== void 0 && order.external_id) ? order.external_id : order.id), /*#__PURE__*/_react.default.createElement(_styles2.ButtonGroup, null, (user === null || user === void 0 ? void 0 : user.level) !== 5 && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
+  return /*#__PURE__*/_react.default.createElement(_styles2.OrderDetailsHeaderContainer, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h1", null, isServiceOrder ? t('APPOINTMENT_NO', 'Appointment No.') : t('INVOICE_ORDER_NO', 'Order No'), " ", order.id), /*#__PURE__*/_react.default.createElement(_styles2.ButtonGroup, null, (user === null || user === void 0 ? void 0 : user.level) !== 5 && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
     color: "black",
     active: openMessage === null || openMessage === void 0 ? void 0 : openMessage.chat,
     onClick: function onClick() {
@@ -161,7 +161,7 @@ var OrderDetailsHeader = exports.OrderDetailsHeader = function OrderDetailsHeade
     onClick: function onClick() {
       return closeSideBar();
     }
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.XLg, null)))), (order === null || order === void 0 ? void 0 : order.external_id) && /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h2", null, t('EXTERNAL_ID', 'External ID :'), " ", order === null || order === void 0 ? void 0 : order.external_id)), /*#__PURE__*/_react.default.createElement("p", null, (order === null || order === void 0 || (_order$payment_events = order.payment_events) === null || _order$payment_events === void 0 ? void 0 : _order$payment_events.length) > 0 ? order === null || order === void 0 || (_order$payment_events2 = order.payment_events) === null || _order$payment_events2 === void 0 ? void 0 : _order$payment_events2.filter(function (item) {
+  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.XLg, null)))), showExternalId && (order === null || order === void 0 ? void 0 : order.external_id) && /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h2", null, t('EXTERNAL_ID', 'External ID :'), " ", order === null || order === void 0 ? void 0 : order.external_id)), /*#__PURE__*/_react.default.createElement("p", null, (order === null || order === void 0 || (_order$payment_events = order.payment_events) === null || _order$payment_events === void 0 ? void 0 : _order$payment_events.length) > 0 ? order === null || order === void 0 || (_order$payment_events2 = order.payment_events) === null || _order$payment_events2 === void 0 ? void 0 : _order$payment_events2.filter(function (item) {
     return item.event === 'payment';
   }).map(function (event, i) {
     var _walletName$event$wal, _event$wallet_event, _event$paymethod, _event$paymethod2, _event$data, _event$paymethod3, _event$data2, _event$data3, _event$data4, _event$data5;

package/_modules/components/Orders/ProductItemAccordion/index.js

@@ -133,8 +133,9 @@ var ProductItemAccordion = exports.ProductItemAccordion = function ProductItemAc
               _step2;
             try {
               for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                var _suboption$half_price;
                 var suboption = _step2.value;
-                subOptionPrice += suboption.quantity * suboption.price;
+                subOptionPrice += suboption.quantity * (['left', 'right'].includes(suboption.position) ? (_suboption$half_price = suboption.half_price) !== null && _suboption$half_price !== void 0 ? _suboption$half_price : suboption.price : suboption.price);
               }
             } catch (err) {
               _iterator2.e(err);
@@ -254,13 +255,14 @@ var ProductItemAccordion = exports.ProductItemAccordion = function ProductItemAc
     }, /*#__PURE__*/_react.default.createElement("p", null, option.name), /*#__PURE__*/_react.default.createElement(_styles.ProductOptionsList, {
       className: "suboption"
     }, option.suboptions.map(function (suboption) {
+      var _suboption$half_price2;
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
         key: suboption.id
       }, /*#__PURE__*/_react.default.createElement("li", null, /*#__PURE__*/_react.default.createElement("span", null, getFormattedSubOptionName({
         quantity: suboption.quantity,
         name: suboption.name,
-        position: suboption.position !== 'whole' ? t(suboption.position.toUpperCase(), suboption.position) : '',
-        price: suboption.price
+        position: (suboption === null || suboption === void 0 ? void 0 : suboption.position) !== 'whole' ? t(suboption.position.toUpperCase(), suboption.position) : '',
+        price: ['left', 'right'].includes(suboption.position) ? (_suboption$half_price2 = suboption.half_price) !== null && _suboption$half_price2 !== void 0 ? _suboption$half_price2 : suboption.price : suboption.price
       }))));
     })));
   })), product.comment && /*#__PURE__*/_react.default.createElement(_styles.ProductComment, null, /*#__PURE__*/_react.default.createElement("p", null, t('COMMENT', 'Comment')), /*#__PURE__*/_react.default.createElement("h3", null, product.comment))));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.40.4",
+  "version": "1.40.6",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {

package/src/components/Orders/OrderBill/index.js

@@ -29,6 +29,7 @@ export const OrderBill = (props) => {
     4: t('SPOT_NUMBER_CURBSIDE', 'Spot number'),
     5: t('SPOT_NUMBER_DRIVE_THRU', 'Drive thru lane')
   }
+  const isPickupOrder = order?.delivery_type === 2
 
   const walletName = {
     cash: {
@@ -189,7 +190,7 @@ export const OrderBill = (props) => {
               </tr>
             ))
           }
-          {typeof order?.summary?.delivery_price === 'number' && (
+          {typeof order?.summary?.delivery_price === 'number' && !isPickupOrder && (
             <tr>
               <td>{t('DELIVERY_FEE', 'Delivery Fee')}</td>
               <td>{parsePrice(order?.summary?.delivery_price + getIncludedTaxes(true), { currency: getCurrenySymbol(order?.currency) })}</td>

package/src/components/Orders/OrderDetailsHeader/index.js

@@ -96,7 +96,7 @@ export const OrderDetailsHeader = (props) => {
   return (
     <OrderDetailsHeaderContainer>
       <div>
-        <h1>{isServiceOrder ? t('APPOINTMENT_NO', 'Appointment No.') : t('INVOICE_ORDER_NO', 'Order No')} {(showExternalId && !!order?.external_id) ? order.external_id : order.id}</h1>
+        <h1>{isServiceOrder ? t('APPOINTMENT_NO', 'Appointment No.') : t('INVOICE_ORDER_NO', 'Order No')} {order.id}</h1>
         <ButtonGroup>
           {user?.level !== 5 && (
             <ButtonLink
@@ -184,7 +184,7 @@ export const OrderDetailsHeader = (props) => {
           </ButtonLink>
         </ButtonGroup>
       </div>
-      {order?.external_id && (
+      {showExternalId && order?.external_id && (
         <div>
           <h2>
             {t('EXTERNAL_ID', 'External ID :')} {order?.external_id}

package/src/components/Orders/ProductItemAccordion/index.js

@@ -107,7 +107,7 @@ export const ProductItemAccordion = (props) => {
       if (product.options?.length > 0) {
         for (const option of product.options) {
           for (const suboption of option.suboptions) {
-            subOptionPrice += suboption.quantity * suboption.price
+            subOptionPrice += suboption.quantity * ((['left', 'right'].includes(suboption.position)) ? (suboption.half_price ?? suboption.price) : suboption.price)
           }
         }
       }
@@ -292,8 +292,8 @@ export const ProductItemAccordion = (props) => {
                           {getFormattedSubOptionName({
                             quantity: suboption.quantity,
                             name: suboption.name,
-                            position: (suboption.position !== 'whole') ? t(suboption.position.toUpperCase(), suboption.position) : '',
-                            price: suboption.price
+                            position: (suboption?.position !== 'whole') ? t(suboption.position.toUpperCase(), suboption.position) : '',
+                            price: (['left', 'right'].includes(suboption.position)) ? (suboption.half_price ?? suboption.price) : suboption.price
                           })}
                         </span>
                       </li>