ordering-ui-admin-external 1.45.33 → 1.45.35

package/_modules/components/BusinessIntelligence/AnalyticsMap/index.js

@@ -66,6 +66,7 @@ var AnalyticsMap = exports.AnalyticsMap = function AnalyticsMap(props) {
     isHeatMap: true,
     isHeat: isHeat,
     markerIcon: theme === null || theme === void 0 || (_theme$images = theme.images) === null || _theme$images === void 0 || (_theme$images = _theme$images.icons) === null || _theme$images === void 0 ? void 0 : _theme$images.mapMarker,
+    disableAutoFit: true,
     onError: function onError(error) {
       return console.error('Google Maps error:', error);
     }

package/_modules/components/Stores/ProductDetailsAdvanced/index.js

@@ -34,7 +34,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 var ProductDetailsAdvancedUI = function ProductDetailsAdvancedUI(props) {
-  var _formState$changes10, _productState$estimat, _taxSelected$value, _fesSelected$value, _productState$cost_pr, _productState$cost_of, _productState$minimum, _productState$maximum, _productState$calorie, _productState$weight, _productState$weight_;
+  var _formState$changes10, _productState$estimat, _taxSelected$value, _feesSelected$value, _productState$cost_pr, _productState$cost_of, _productState$minimum, _productState$maximum, _productState$calorie, _productState$weight, _productState$weight_;
   var formState = props.formState,
     productState = props.productState,
     handleClickProperty = props.handleClickProperty,
@@ -44,12 +44,13 @@ var ProductDetailsAdvancedUI = function ProductDetailsAdvancedUI(props) {
     setTaxToEdit = props.setTaxToEdit,
     handleSaveTax = props.handleSaveTax,
     handleChangeTax = props.handleChangeTax,
-    formTaxChanges = props.formTaxChanges,
     handleDeleteTax = props.handleDeleteTax,
     setAlertState = props.setAlertState,
     alertState = props.alertState,
     fees = props.fees,
-    handleUpdateClick = props.handleUpdateClick;
+    handleUpdateClick = props.handleUpdateClick,
+    formTaxChanges = props.formTaxChanges,
+    setFormTaxChanges = props.setFormTaxChanges;
   var formMethods = (0, _reactHookForm.useForm)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -78,7 +79,7 @@ var ProductDetailsAdvancedUI = function ProductDetailsAdvancedUI(props) {
     setFeesOptions = _useState8[1];
   var _useState9 = (0, _react.useState)(null),
     _useState10 = _slicedToArray(_useState9, 2),
-    fesSelected = _useState10[0],
+    feesSelected = _useState10[0],
     setFeeSelected = _useState10[1];
   var _useState11 = (0, _react.useState)(null),
     _useState12 = _slicedToArray(_useState11, 2),
@@ -138,6 +139,13 @@ var ProductDetailsAdvancedUI = function ProductDetailsAdvancedUI(props) {
       payload: null
     });
   };
+  var handleCloseModal = function handleCloseModal() {
+    setTaxToEdit({
+      action: null,
+      payload: null
+    });
+    setFormTaxChanges({});
+  };
   var getTaxes = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var inheritOption, addTaxOption, taxesOptions;
@@ -169,7 +177,8 @@ var ProductDetailsAdvancedUI = function ProductDetailsAdvancedUI(props) {
                 deleteFunctionality: (user === null || user === void 0 ? void 0 : user.level) === 0,
                 rate: tax.rate,
                 type: tax.type,
-                description: tax.description
+                description: tax.description,
+                order_type_rates: tax.order_type_rates
               };
             })), [addTaxOption]);
             setTaxesOption(taxesOptions);
@@ -238,10 +247,10 @@ var ProductDetailsAdvancedUI = function ProductDetailsAdvancedUI(props) {
   };
   (0, _react.useEffect)(function () {
     if (taxes) getTaxes();
-  }, [JSON.stringify(taxes)]);
+  }, [JSON.stringify(taxes), productState === null || productState === void 0 ? void 0 : productState.tax_id]);
   (0, _react.useEffect)(function () {
     if (fees) getFees();
-  }, [JSON.stringify(fees)]);
+  }, [JSON.stringify(fees), productState === null || productState === void 0 ? void 0 : productState.fee_id]);
   (0, _react.useEffect)(function () {
     if (taxToDelete.action) {
       setAlertState({
@@ -373,9 +382,9 @@ var ProductDetailsAdvancedUI = function ProductDetailsAdvancedUI(props) {
     }
   })), /*#__PURE__*/_react.default.createElement(_styles2.LabelCustom, {
     htmlFor: "fees"
-  }, t('FEES', 'Fees')), /*#__PURE__*/_react.default.createElement(_styles2.TypeSelectWrapper, null, fesSelected && /*#__PURE__*/_react.default.createElement(_FirstSelect.Select, {
-    placeholder: fesSelected.showOnSelected,
-    defaultValue: (_fesSelected$value = fesSelected === null || fesSelected === void 0 ? void 0 : fesSelected.value) !== null && _fesSelected$value !== void 0 ? _fesSelected$value : 'inherit',
+  }, t('FEES', 'Fees')), /*#__PURE__*/_react.default.createElement(_styles2.TypeSelectWrapper, null, feesSelected && /*#__PURE__*/_react.default.createElement(_FirstSelect.Select, {
+    placeholder: feesSelected.showOnSelected,
+    defaultValue: (_feesSelected$value = feesSelected === null || feesSelected === void 0 ? void 0 : feesSelected.value) !== null && _feesSelected$value !== void 0 ? _feesSelected$value : 'inherit',
     options: feesOptions,
     onChange: function onChange(val) {
       return handleClickProperty('fee_id', val === 'inherit' ? null : val);
@@ -560,28 +569,18 @@ var ProductDetailsAdvancedUI = function ProductDetailsAdvancedUI(props) {
     color: "primary",
     borderRadius: "7.6px",
     disabled: formState.loading || Object.keys(formState === null || formState === void 0 ? void 0 : formState.changes).length === 0
-  }, formState !== null && formState !== void 0 && formState.loading ? t('LOADING', 'Loading') : t('SAVE', 'Save')), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
+  }, formState !== null && formState !== void 0 && formState.loading ? t('LOADING', 'Loading') : t('SAVE', 'Save')), !!(taxToEdit !== null && taxToEdit !== void 0 && taxToEdit.action) && /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
     open: !!(taxToEdit !== null && taxToEdit !== void 0 && taxToEdit.action),
     width: "80%",
     padding: "30px",
     title: typeof (taxToEdit === null || taxToEdit === void 0 ? void 0 : taxToEdit.payload) === 'boolean' ? t("ADD_".concat(getTaxOrFeeString(taxToEdit === null || taxToEdit === void 0 ? void 0 : taxToEdit.action).toUpperCase()), "Add ".concat(getTaxOrFeeString(taxToEdit === null || taxToEdit === void 0 ? void 0 : taxToEdit.action))) : t("EDIT_".concat(getTaxOrFeeString(taxToEdit === null || taxToEdit === void 0 ? void 0 : taxToEdit.action).toUpperCase()), "Edit ".concat(getTaxOrFeeString(taxToEdit === null || taxToEdit === void 0 ? void 0 : taxToEdit.action))),
-    onClose: function onClose() {
-      return setTaxToEdit({
-        action: null,
-        payload: null
-      });
-    }
+    onClose: handleCloseModal
   }, /*#__PURE__*/_react.default.createElement(_EditTaxManager.EditTaxManager, {
     type: taxToEdit === null || taxToEdit === void 0 ? void 0 : taxToEdit.action,
     data: taxToEdit === null || taxToEdit === void 0 ? void 0 : taxToEdit.payload,
     onChange: handleChangeTax,
     formChanges: formTaxChanges,
-    onClose: function onClose() {
-      return setTaxToEdit({
-        action: null,
-        payload: null
-      });
-    },
+    onClose: handleCloseModal,
     handleSave: handleSaveTax
   })), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
     title: taxToDelete.action ? t("DELETE_".concat(getTaxOrFeeString(taxToDelete === null || taxToDelete === void 0 ? void 0 : taxToDelete.action).toUpperCase()), "Delete ".concat(getTaxOrFeeString(taxToDelete === null || taxToDelete === void 0 ? void 0 : taxToDelete.action))) : t('ERROR'),

package/_modules/components/Stores/SingleBusiness/index.js

@@ -160,6 +160,8 @@ var SingleBusinessUI = function SingleBusinessUI(props) {
 var SingleBusiness = exports.SingleBusiness = function SingleBusiness(props) {
   var isSkeleton = props.isSkeleton;
   var singleBusinessProps = _objectSpread(_objectSpread({}, props), {}, {
+    notGetSites: true,
+    notGetTaxes: true,
     UIComponent: SingleBusinessUI
   });
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isSkeleton ? /*#__PURE__*/_react.default.createElement(SingleBusinessUI, props) : /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.BusinessDetails, singleBusinessProps));

package/_modules/components/Stores/index.js

@@ -483,6 +483,12 @@ Object.defineProperty(exports, "PaymentOption", {
     return _PaymentOption.PaymentOption;
   }
 });
+Object.defineProperty(exports, "PaymentOptionCredomatic", {
+  enumerable: true,
+  get: function get() {
+    return _PaymentOptionCredomatic.PaymentOptionCredomatic;
+  }
+});
 Object.defineProperty(exports, "PaymentOptionMethods", {
   enumerable: true,
   get: function get() {
@@ -828,4 +834,5 @@ var _SpoonityApiKey = require("./SpoonityApiKey");
 var _BusinessPlaceGroupList = require("./BusinessPlaceGroupList");
 var _BusinessPlaceGroup = require("./BusinessPlaceGroup");
 var _BusinessPlace = require("./BusinessPlace");
-var _BusinessAddStore = require("./BusinessAddStore");
+var _BusinessAddStore = require("./BusinessAddStore");
+var _PaymentOptionCredomatic = require("./PaymentOptionCredomatic");

package/_modules/index.js

@@ -765,6 +765,12 @@ Object.defineProperty(exports, "Cms", {
     return _Settings.Cms;
   }
 });
+Object.defineProperty(exports, "ColorPicker", {
+  enumerable: true,
+  get: function get() {
+    return _Shared.ColorPicker;
+  }
+});
 Object.defineProperty(exports, "ColumnAllowSettingPopover", {
   enumerable: true,
   get: function get() {
@@ -1677,6 +1683,12 @@ Object.defineProperty(exports, "PaymentOption", {
     return _Stores.PaymentOption;
   }
 });
+Object.defineProperty(exports, "PaymentOptionCredomatic", {
+  enumerable: true,
+  get: function get() {
+    return _Stores.PaymentOptionCredomatic;
+  }
+});
 Object.defineProperty(exports, "PaymentOptionMethods", {
   enumerable: true,
   get: function get() {

package/_modules/styles/Select/FirstSelect/index.js

@@ -151,7 +151,7 @@ var Select = exports.Select = function Select(props) {
         return onEdit(option, i);
       },
       className: "edit"
-    }, t('EDIT', 'Edit')), option.deleteFunctionality && /*#__PURE__*/_react.default.createElement(_BsTrash.default, {
+    }, t('EDIT', 'Edit')), option.deleteFunctionality && onDelete && /*#__PURE__*/_react.default.createElement(_BsTrash.default, {
       className: "delete",
       onClick: function onClick() {
         return onDelete(option.value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.45.33",
+  "version": "1.45.35",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "moment-range": "^4.0.2",
-    "ordering-components-admin-external": "1.43.77",
+    "ordering-components-admin-external": "1.43.79",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

package/src/components/BusinessIntelligence/AnalyticsMap/index.js

@@ -65,6 +65,7 @@ export const AnalyticsMap = (props) => {
                   isHeatMap
                   isHeat={isHeat}
                   markerIcon={theme?.images?.icons?.mapMarker}
+                  disableAutoFit
                   onError={(error) => console.error('Google Maps error:', error)}
                 />
                 <Button

package/src/components/Stores/ProductDetailsAdvanced/index.js

@@ -34,12 +34,13 @@ const ProductDetailsAdvancedUI = (props) => {
     setTaxToEdit,
     handleSaveTax,
     handleChangeTax,
-    formTaxChanges,
     handleDeleteTax,
     setAlertState,
     alertState,
     fees,
-    handleUpdateClick
+    handleUpdateClick,
+    formTaxChanges,
+    setFormTaxChanges
   } = props
 
   const formMethods = useForm()
@@ -50,7 +51,7 @@ const ProductDetailsAdvancedUI = (props) => {
   const [isShowPriceByWeight, setIsShowPriceByWeight] = useState(false)
   const [taxesOption, setTaxesOption] = useState([])
   const [feesOptions, setFeesOptions] = useState([])
-  const [fesSelected, setFeeSelected] = useState(null)
+  const [feesSelected, setFeeSelected] = useState(null)
   const [taxSelected, setTaxSelected] = useState(null)
   const [taxToDelete, setTaxToDelete] = useState({ action: null, id: null })
 
@@ -102,6 +103,11 @@ const ProductDetailsAdvancedUI = (props) => {
     setTaxToDelete({ action: null, payload: null })
   }
 
+  const handleCloseModal = () => {
+    setTaxToEdit({ action: null, payload: null })
+    setFormTaxChanges({})
+  }
+
   const getTaxes = async () => {
     const inheritOption = {
       name: t('INHERIT_FROM_BUSINESS', 'Inherit from business'),
@@ -129,7 +135,8 @@ const ProductDetailsAdvancedUI = (props) => {
         deleteFunctionality: user?.level === 0,
         rate: tax.rate,
         type: tax.type,
-        description: tax.description
+        description: tax.description,
+        order_type_rates: tax.order_type_rates
       })),
       addTaxOption
     ]
@@ -194,11 +201,11 @@ const ProductDetailsAdvancedUI = (props) => {
 
   useEffect(() => {
     if (taxes) getTaxes()
-  }, [JSON.stringify(taxes)])
+  }, [JSON.stringify(taxes), productState?.tax_id])
 
   useEffect(() => {
     if (fees) getFees()
-  }, [JSON.stringify(fees)])
+  }, [JSON.stringify(fees), productState?.fee_id])
 
   useEffect(() => {
     if (taxToDelete.action) {
@@ -331,10 +338,10 @@ const ProductDetailsAdvancedUI = (props) => {
       </TypeSelectWrapper>
       <LabelCustom htmlFor='fees'>{t('FEES', 'Fees')}</LabelCustom>
       <TypeSelectWrapper>
-        {fesSelected && (
+        {feesSelected && (
           <Select
-            placeholder={fesSelected.showOnSelected}
-            defaultValue={fesSelected?.value ?? 'inherit'}
+            placeholder={feesSelected.showOnSelected}
+            defaultValue={feesSelected?.value ?? 'inherit'}
             options={feesOptions}
             onChange={(val) => handleClickProperty('fee_id', val === 'inherit' ? null : val)}
             onEdit={(val) => setTaxToEdit({ action: 'fees', payload: val })}
@@ -526,24 +533,26 @@ const ProductDetailsAdvancedUI = (props) => {
       >
         {formState?.loading ? t('LOADING', 'Loading') : t('SAVE', 'Save')}
       </Button>
-      <Modal
-        open={!!taxToEdit?.action}
-        width='80%'
-        padding='30px'
-        title={typeof taxToEdit?.payload === 'boolean'
-          ? t(`ADD_${getTaxOrFeeString(taxToEdit?.action).toUpperCase()}`, `Add ${getTaxOrFeeString(taxToEdit?.action)}`)
-          : t(`EDIT_${getTaxOrFeeString(taxToEdit?.action).toUpperCase()}`, `Edit ${getTaxOrFeeString(taxToEdit?.action)}`)}
-        onClose={() => setTaxToEdit({ action: null, payload: null })}
-      >
-        <EditTaxManager
-          type={taxToEdit?.action}
-          data={taxToEdit?.payload}
-          onChange={handleChangeTax}
-          formChanges={formTaxChanges}
-          onClose={() => setTaxToEdit({ action: null, payload: null })}
-          handleSave={handleSaveTax}
-        />
-      </Modal>
+      {!!taxToEdit?.action && (
+        <Modal
+          open={!!taxToEdit?.action}
+          width='80%'
+          padding='30px'
+          title={typeof taxToEdit?.payload === 'boolean'
+            ? t(`ADD_${getTaxOrFeeString(taxToEdit?.action).toUpperCase()}`, `Add ${getTaxOrFeeString(taxToEdit?.action)}`)
+            : t(`EDIT_${getTaxOrFeeString(taxToEdit?.action).toUpperCase()}`, `Edit ${getTaxOrFeeString(taxToEdit?.action)}`)}
+          onClose={handleCloseModal}
+        >
+          <EditTaxManager
+            type={taxToEdit?.action}
+            data={taxToEdit?.payload}
+            onChange={handleChangeTax}
+            formChanges={formTaxChanges}
+            onClose={handleCloseModal}
+            handleSave={handleSaveTax}
+          />
+        </Modal>
+      )}
       <Alert
         title={taxToDelete.action ? t(`DELETE_${getTaxOrFeeString(taxToDelete?.action).toUpperCase()}`, `Delete ${getTaxOrFeeString(taxToDelete?.action)}`) : t('ERROR')}
         content={alertState.content}

package/src/components/Stores/SingleBusiness/index.js

@@ -241,6 +241,8 @@ export const SingleBusiness = (props) => {
   const { isSkeleton } = props
   const singleBusinessProps = {
     ...props,
+    notGetSites: true,
+    notGetTaxes: true,
     UIComponent: SingleBusinessUI
   }
   return (

package/src/components/Stores/index.js

@@ -116,6 +116,7 @@ import { BusinessPlaceGroupList } from './BusinessPlaceGroupList'
 import { BusinessPlaceGroup } from './BusinessPlaceGroup'
 import { BusinessPlace } from './BusinessPlace'
 import { BusinessAddStore } from './BusinessAddStore'
+import { PaymentOptionCredomatic } from './PaymentOptionCredomatic'
 
 export {
   BusinessAdd,
@@ -235,5 +236,6 @@ export {
   BusinessPlaceGroupList,
   BusinessPlaceGroup,
   BusinessPlace,
-  BusinessAddStore
+  BusinessAddStore,
+  PaymentOptionCredomatic
 }

package/src/index.js

@@ -332,7 +332,8 @@ import {
   BusinessPlace,
   BusinessSalesChannel,
   BusinessQRCodeOptions,
-  BusinessAddStore
+  BusinessAddStore,
+  PaymentOptionCredomatic
 } from './components/Stores'
 import {
   CustomersListing,
@@ -405,7 +406,8 @@ import {
   ImageCrop,
   NotFoundSource,
   RangeCalendar,
-  InputPhoneNumber
+  InputPhoneNumber,
+  ColorPicker
 } from './components/Shared'
 import { LogoutButton } from './components/LogoutButton'
 import { LanguageSelector } from './components/LanguageSelector'
@@ -747,6 +749,7 @@ export {
   ProductTagDetails,
   SingleBusiness,
   PaymentOptionSquare,
+  PaymentOptionCredomatic,
   BusinessWalletsList,
   PaymentOptionMethods,
   BusinessPublishing,
@@ -839,6 +842,7 @@ export {
   NotFoundSource,
   RangeCalendar,
   InputPhoneNumber,
+  ColorPicker,
 
   capitalize,
   verifyDecimals,

package/src/styles/Select/FirstSelect/index.js

@@ -160,7 +160,7 @@ export const Select = (props) => {
                         {t('EDIT', 'Edit')}
                       </Button>
                     )}
-                    {option.deleteFunctionality && (
+                    {option.deleteFunctionality && onDelete && (
                       <BsTrash className='delete' onClick={() => onDelete(option.value)} />
                     )}
                   </FunctionalityContainer>