ordering-ui-admin-external 1.36.1 → 1.36.3

package/_modules/components/Orders/CreateCustomOrder/CustomOrderDetails/index.js

@@ -197,7 +197,7 @@ var CustomOrderDetailsUI = function CustomOrderDetailsUI(props) {
   }), cart && (cart === null || cart === void 0 ? void 0 : cart.products.length) > 0 && isOrderByProducts && /*#__PURE__*/_react.default.createElement(_Checkout.Checkout, {
     cartUuid: cart.uuid,
     onPlaceOrderClick: function onPlaceOrderClick(data, paymethod, cart) {
-      (cart === null || cart === void 0 ? void 0 : cart.uuid) && handleOpenCustomOrderDetail(cart.uuid);
+      (cart === null || cart === void 0 ? void 0 : cart.order_id) && handleOpenCustomOrderDetail(cart.order_id);
       onClose();
     },
     extraFields: extraFields

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

@@ -150,7 +150,7 @@ var OrdersTable = function OrdersTable(props) {
     var restHours = Math.floor(restMinOfTargetedMin / 60);
     var restMins = restMinOfTargetedMin - 60 * restHours;
     // make standard time format
-    day = day === 0 ? '' : day + 'day  ';
+    day = day === 0 ? '' : "".concat(day + ' ' + t('DAY', 'day') + ' ');
     restHours = restHours < 10 ? '0' + restHours : restHours;
     restMins = restMins < 10 ? '0' + restMins : restMins;
     var finalTaget = sign + day + restHours + ':' + restMins;

package/_modules/components/Settings/SettingsList/index.js

@@ -154,7 +154,7 @@ var SettingsListUI = function SettingsListUI(props) {
     width: 70,
     height: 44
   })), !settingsState.error && !settingsState.loading && configs && !settingsState.API && /*#__PURE__*/_react.default.createElement(_styles2.GeneralContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.FormContainer, null, configs.length > 0 && configs.map(function (config, i) {
-    var _config$options, _config$options2, _config$options3, _config$options4;
+    var _config$options, _config$options2, _config$options3, _config$options4, _config$value;
     return /*#__PURE__*/_react.default.createElement("div", {
       key: i
     }, config.type === 1 && /*#__PURE__*/_react.default.createElement(_styles2.FormGroupText, {
@@ -224,7 +224,28 @@ var SettingsListUI = function SettingsListUI(props) {
     })), !(config !== null && config !== void 0 && config.options) && /*#__PURE__*/_react.default.createElement(_styles2.OptionsError, null, t('NO_OPTIONS_VALUE', 'There is no options value')))), config.type === 5 && /*#__PURE__*/_react.default.createElement(_SettingsImage.SettingsImage, {
       config: config,
       saveConfig: saveConfig
-    }));
+    }), config.type === 6 && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.FormGroupText, {
+      className: "form-group"
+    }, /*#__PURE__*/_react.default.createElement("label", null, config === null || config === void 0 ? void 0 : config.name), (config === null || config === void 0 ? void 0 : config.description) && /*#__PURE__*/_react.default.createElement(_styles2.Description, null, config === null || config === void 0 ? void 0 : config.description), config === null || config === void 0 || (_config$value = config.value) === null || _config$value === void 0 || (_config$value = _config$value.split('|')) === null || _config$value === void 0 || (_config$value = _config$value.filter(function (value) {
+      return valuesTypeSix.includes(value === null || value === void 0 ? void 0 : value.split(',')[0]);
+    })) === null || _config$value === void 0 ? void 0 : _config$value.map(function (value, i, hash) {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
+        key: "".concat(config === null || config === void 0 ? void 0 : config.id, " ").concat(value)
+      }, /*#__PURE__*/_react.default.createElement(_styles2.Description, {
+        typeSix: true
+      }, t(value === null || value === void 0 ? void 0 : value.split(',')[0], value === null || value === void 0 ? void 0 : value.split(',')[0].replace('_', ' '))), /*#__PURE__*/_react.default.createElement("input", {
+        type: "text",
+        defaultValue: value === null || value === void 0 ? void 0 : value.split(',')[1],
+        onChange: function onChange(e) {
+          return handleChangeTypeSix({
+            value: e.target.value,
+            type: value === null || value === void 0 ? void 0 : value.split(',')[0]
+          }, config);
+        },
+        className: "form-control",
+        placeholder: 0
+      }));
+    }))));
   }))), !settingsState.loading && settingsState.error && /*#__PURE__*/_react.default.createElement(_Shared.NotFoundSource, {
     content: t('NOT_FOUND_CONFIG', 'Sorry, we couldn\'t find the config.'),
     btnTitle: t('PROFILE_CATEGORY_REDIRECT', 'Go to Category Description'),

package/_modules/components/SidebarMenu/index.js

@@ -83,14 +83,12 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
     title: t('DRIVERS_DASHBOARD', 'Drivers Dashboard'),
     pageName: 'drivers',
     url: '/drivers'
-  },
-  // {
-  //   id: 4,
-  //   title: t('ALL_IN_ONE', 'All in one'),
-  //   pageName: 'all_in_one',
-  //   url: '/all-in-one'
-  // },
-  {
+  }, {
+    id: 4,
+    title: t('ALL_IN_ONE', 'All in one'),
+    pageName: 'all_in_one',
+    url: '/all-in-one'
+  }, {
     id: 5,
     title: t('APPOINTMENTS', 'Appointments'),
     pageName: 'appointments',

package/package.json

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

package/src/components/Orders/CreateCustomOrder/CustomOrderDetails/index.js

@@ -195,7 +195,7 @@ const CustomOrderDetailsUI = (props) => {
               <Checkout
                 cartUuid={cart.uuid}
                 onPlaceOrderClick={(data, paymethod, cart) => {
-                  cart?.uuid && handleOpenCustomOrderDetail(cart.uuid)
+                  cart?.order_id && handleOpenCustomOrderDetail(cart.order_id)
                   onClose()
                 }}
                 extraFields={extraFields}

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

@@ -153,7 +153,7 @@ export const OrdersTable = (props) => {
     let restHours = Math.floor(restMinOfTargetedMin / 60)
     let restMins = restMinOfTargetedMin - 60 * restHours
     // make standard time format
-    day = day === 0 ? '' : day + 'day  '
+    day = day === 0 ? '' : `${day + ' ' + t('DAY', 'day') + ' '}`
     restHours = restHours < 10 ? '0' + restHours : restHours
     restMins = restMins < 10 ? '0' + restMins : restMins
 

package/src/components/Settings/SettingsList/index.js

@@ -263,7 +263,7 @@ export const SettingsListUI = (props) => {
                           />
                         )
                       }
-                      {/* {config.type === 6 && (
+                      {config.type === 6 && (
                         <>
                           <FormGroupText className='form-group'>
                             <label>{config?.name}</label>
@@ -285,7 +285,7 @@ export const SettingsListUI = (props) => {
                             ))}
                           </FormGroupText>
                         </>
-                        )} */}
+                      )}
                     </div>
                   ))
                 }

package/src/components/SidebarMenu/index.js

@@ -82,12 +82,12 @@ const SidebarMenuUI = (props) => {
       pageName: 'drivers',
       url: '/drivers'
     },
-    // {
-    //   id: 4,
-    //   title: t('ALL_IN_ONE', 'All in one'),
-    //   pageName: 'all_in_one',
-    //   url: '/all-in-one'
-    // },
+    {
+      id: 4,
+      title: t('ALL_IN_ONE', 'All in one'),
+      pageName: 'all_in_one',
+      url: '/all-in-one'
+    },
     {
       id: 5,
       title: t('APPOINTMENTS', 'Appointments'),