@fonixtree/magic-design 2.0.189 → 2.0.191

package/lib/composite-comp/public/components/Stores/mobile/index.js

@@ -243,24 +243,40 @@ function (_super) {
     _this.state = {
       list: []
     };
+    _this.sourceType = '1';
+    _this.maxProdNum = 5;
 
     _this.getData = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var params, res, list;
+        var _a, maxProdNum, sourceType, params, info, res, list;
 
-        var _a;
+        var _b;
 
-        return __generator(this, function (_b) {
-          switch (_b.label) {
+        return __generator(this, function (_c) {
+          switch (_c.label) {
             case 0:
+              _a = this.props.panelProps.content, maxProdNum = _a.maxProdNum, sourceType = _a.sourceType;
               params = {
                 pageIndex: 1,
-                pageSize: 10
+                pageSize: maxProdNum,
+                pageTotal: true
               };
 
+              if (sourceType === '2') {
+                params.freeShipping = 'Y';
+              } else if (sourceType === '3') {
+                params.newFlag = 'Y';
+              } else if (sourceType === '4') {
+                params.sortType = '1';
+              }
+
               if ((0, _commonUtil.isLogin)()) {
-                params.longitude = '118.78344';
-                params.latitude = '31.90613';
+                info = getStore('USER_ADDRESS_INFO') || {};
+
+                if (info.longitude && info.latitude) {
+                  params.longitude = info.longitude;
+                  params.latitude = info.latitude;
+                }
               }
 
               return [4
@@ -268,8 +284,8 @@ function (_super) {
               , (0, _commonUtil.commonFetch)('/designer/v1/h5/store/es', params, 'POST')];
 
             case 1:
-              res = _b.sent();
-              list = ((_a = res.storePage) === null || _a === void 0 ? void 0 : _a.list) || [];
+              res = _c.sent();
+              list = ((_b = res.storePage) === null || _b === void 0 ? void 0 : _b.list) || [];
               this.setState({
                 list: list
               });
@@ -288,6 +304,14 @@ function (_super) {
     this.getData();
   };
 
+  Mobile.prototype.componentWillReceiveProps = function (nextProps) {
+    if (nextProps.panelProps.content.sourceType !== this.sourceType || nextProps.panelProps.content.maxProdNum !== this.maxProdNum) {
+      this.getData();
+      this.sourceType = nextProps.panelProps.content.sourceType;
+      this.maxProdNum = nextProps.panelProps.content.maxProdNum;
+    }
+  };
+
   Mobile.prototype.render = function () {
     var _a;
 

package/lib/composite-comp/public/components/Wallet/defaultJSON.js

@@ -28,7 +28,7 @@ var getDefaultJSON = function getDefaultJSON() {
   var defaultFontFamily = _constants.projectFontFamily[(_a = window.systemParams) === null || _a === void 0 ? void 0 : _a.projectCode] || 'Open Sans';
   return {
     id: groupId,
-    type: 'WALLET',
+    type: 'WALLET_PRODUCT',
     groupSource: walletDataList.map(function (item) {
       var itemId = (0, _uuid.v4)();
       return {

package/lib/composite-comp/public/components/Wallet/index.js

@@ -74,7 +74,7 @@ function (_super) {
   };
 
   Wallet.defaultProps = {};
-  Wallet.type = 'WALLET';
+  Wallet.type = 'WALLET_PRODUCT';
   Wallet.getDefaultJSON = _defaultJSON.getDefaultJSON;
   Wallet = __decorate([_compositeDecorator["default"]], Wallet);
   return Wallet;

package/lib/composite-comp/public/config-panels/StoresConfig/ConfigContent/index.js

@@ -145,14 +145,22 @@ function (_super) {
       value: panelProps.sourceType
     }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
       value: "1"
-    }, (0, _locale.i18n)('FREE_SHIPPING_STORES')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+    }, (0, _locale.i18n)('ALL_STORES')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "2"
+    }, (0, _locale.i18n)('FREE_SHIPPING_STORES')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "3"
+    }, (0, _locale.i18n)('NEW_STORES')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "4"
+    }, (0, _locale.i18n)('HIGH_SALES_STORES')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "5"
+    }, (0, _locale.i18n)('SELECT_STORES')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: (0, _locale.i18n)('PRODUCT_QUANTITY'),
       topSplit: true
     }, /*#__PURE__*/_react["default"].createElement(_antd.Radio.Group, {
       onChange: function onChange(e) {
         panelProps.maxProdNum = e.target.value;
 
-        _this.selfRender();
+        _this.reRender();
       },
       value: panelProps.maxProdNum
     }, /*#__PURE__*/_react["default"].createElement(_antd.Radio, {

package/lib/constants/index.js

@@ -73,6 +73,9 @@ var fontFamilyList = [{
 }, {
   name: (0, _locale.i18n)('INTER'),
   value: 'Inter'
+}, {
+  name: (0, _locale.i18n)('ROBOTO'),
+  value: 'Roboto'
 }];
 exports.fontFamilyList = fontFamilyList;
 var fontWeightList = [{
@@ -109,7 +112,8 @@ exports.projectCodes = projectCodes;
 var projectFontFamily = {
   MN: 'Inter',
   Ashita: 'Montserrat',
-  pto: 'Open Sans'
+  pto: 'Open Sans',
+  ar: 'Roboto'
 };
 exports.projectFontFamily = projectFontFamily;
 var campaignTypes = {
@@ -323,7 +327,7 @@ var compInfoMap = {
     name: 'Wallet',
     icon: 'icon-Wallet'
   },
-  WALLET: {
+  WALLET_PRODUCT: {
     name: 'Wallet',
     icon: 'icon-Wallet'
   },

package/lib/core/Designer/ToolBarModal/index.js

@@ -209,7 +209,7 @@ function (_super) {
 
     var quillFormat = this.state.quillFormat;
 
-    var _fontWeightList = quillFormat['font-family'] === 'Montserrat' ? _constants.fontWeightList : _constants.otherFontWeightList;
+    var _fontWeightList = ['Montserrat', 'Roboto'].includes(quillFormat['font-family']) ? _constants.fontWeightList : _constants.otherFontWeightList;
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       ref: this.toolBarRef,

package/lib/decorator/compositeDecorator.js

@@ -15,8 +15,6 @@ var _constants = require("../constants");
 
 var _commonUtil = require("../utils/commonUtil");
 
-var _androidUtil = require("../utils/androidUtil");
-
 var _storeUtil = require("../utils/storeUtil");
 
 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); }
@@ -289,13 +287,12 @@ function compositeDecorator(WrappedComponent) {
           hoveredFloor: _mobx.store.hoveredFloor
         });
       });
-      this.getOuterWrapStyle();
+      this.getOuterWrapStyle(); // if (browserVersion().isDelivistaApp) {
 
-      if ((0, _androidUtil.browserVersion)().isDelivistaApp) {
-        window['switchLanguage'] = this.switchLanguage;
-        window['getUserAddress'] = this.getUserAddress; // switchLanguage();
-        // getUserAddress();
-      }
+      window['switchLanguage'] = this.switchLanguage;
+      window['getUserAddress'] = this.getUserAddress; // switchLanguage();
+      // getUserAddress();
+      // }
     };
 
     Wrapper.prototype.componentWillUnmount = function () {

package/lib/locale/ar/ar.json

@@ -1,4 +1,10 @@
 {
+  "SELECT_STORES": "Select stores",
+  "HIGH_SALES_STORES": "High sales stores",
+  "NEW_STORES": "New stores",
+  "ALL_STORES": "All stores",
+  "ROBOTO": "Roboto",
+  "POINTS": "Points",
   "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",

package/lib/locale/en/en.json

@@ -1,4 +1,10 @@
 {
+  "SELECT_STORES": "Select stores",
+  "HIGH_SALES_STORES": "High sales stores",
+  "NEW_STORES": "New stores",
+  "ALL_STORES": "All stores",
+  "ROBOTO": "Roboto",
+  "POINTS": "Points",
   "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",

package/lib/locale/es/es.json

@@ -1,4 +1,10 @@
 {
+  "SELECT_STORES": "Select stores",
+  "HIGH_SALES_STORES": "High sales stores",
+  "NEW_STORES": "New stores",
+  "ALL_STORES": "All stores",
+  "ROBOTO": "Roboto",
+  "POINTS": "Points",
   "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",

package/lib/locale/mn/mn.json

@@ -1,4 +1,10 @@
 {
+  "SELECT_STORES": "Select stores",
+  "HIGH_SALES_STORES": "High sales stores",
+  "NEW_STORES": "New stores",
+  "ALL_STORES": "All stores",
+  "ROBOTO": "Roboto",
+  "POINTS": "Points",
   "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Бэлэгтэй",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",
@@ -172,7 +178,7 @@
   "COUPON": "Купон",
   "HEADER_IMAGE": "Толгойн зураг",
   "ACTIVITY_LABEL": "Үйл ажиллагааны шошго",
-  "STOCK": "Хувьцаа",
+  "STOCK": "Үлдэгдэл",
   "DISCOUNT_LABEL": "Хөнгөлөлтийн шошго",
   "SESSION_TIME": "Сеанс цаг",
   "COUNTDOWN": "Countdown",

package/lib/meta-comp/config-panels/ButtonConfig/index.js

@@ -171,7 +171,7 @@ function (_super) {
 
     var fontSizeKey = window.magicDesign.device == 'pc' ? 'pcFontSize' : 'fontSize';
 
-    var _fontWeightList = ((_a = data === null || data === void 0 ? void 0 : data.buttonText) === null || _a === void 0 ? void 0 : _a.fontFamily) === 'Montserrat' ? _constants.fontWeightList : _constants.otherFontWeightList;
+    var _fontWeightList = ['Montserrat', 'Roboto'].includes((_a = data === null || data === void 0 ? void 0 : data.buttonText) === null || _a === void 0 ? void 0 : _a.fontFamily) ? _constants.fontWeightList : _constants.otherFontWeightList;
 
     var ButtonTextSetting = function ButtonTextSetting(_data) {
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {

package/lib/meta-comp/config-panels/TextConfig/index.js

@@ -187,7 +187,7 @@ function (_super) {
       };
     }
 
-    var _fontWeightList = textData.fontFamily === 'Montserrat' ? _constants.fontWeightList : _constants.otherFontWeightList;
+    var _fontWeightList = ['Montserrat', 'Roboto'].includes(textData.fontFamily) ? _constants.fontWeightList : _constants.otherFontWeightList;
 
     var source = [{
       key: '1',

package/lib/utils/dateUtil.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.formatDateTime = exports.formatDateMinute = exports.formatDate = void 0;
 exports.formatDayMonth = formatDayMonth;
 exports.formatDayMonthTime = formatDayMonthTime;
+exports.isToday = isToday;
+exports.isTomorrow = isTomorrow;
 exports.newDate = void 0;
 
 var _moment = _interopRequireDefault(require("moment"));
@@ -80,4 +82,16 @@ function formatDayMonthTime(date, fmt) {
   }
 
   return (0, _moment["default"])(newDate(date)).format(fmt);
+}
+
+function isToday(date) {
+  var now = new Date();
+  var tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+  return date.getDate() === tomorrow.getDate() && date.getMonth() === tomorrow.getMonth() && date.getFullYear() === tomorrow.getFullYear();
+}
+
+function isTomorrow(date) {
+  var now = new Date();
+  var tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
+  return date.getDate() === tomorrow.getDate() && date.getMonth() === tomorrow.getMonth() && date.getFullYear() === tomorrow.getFullYear();
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "2.0.189",
+  "version": "2.0.191",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",
@@ -32,7 +32,7 @@
     "marked": "4.3.0",
     "mobx": "6.6.1",
     "mobx-react": "7.5.2",
-    "moment": "2.29.3",
+    "moment": "2.30",
     "postcss-pxtorem": "^6.0.0",
     "quill": "^1.3.7",
     "ramda": "^0.28.0",