@fonixtree/magic-design 2.0.84 → 2.0.85

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. package/es/common/GroupList/index.js +2 -0
  2. package/es/composite-comp/dito/components/CommonFunctions/defaultJSON.js +8 -4
  3. package/es/composite-comp/dito/components/CommonFunctions/mobile/index.js +6 -4
  4. package/es/composite-comp/dito/components/Orders/defaultJSON.js +2 -2
  5. package/es/composite-comp/dito/components/Orders/mobile/index.js +15 -6
  6. package/es/composite-comp/dito/components/Orders/mobile/index.less +1 -0
  7. package/es/composite-comp/dito/components/PersonalInformation/defaultJSON.js +1 -1
  8. package/es/composite-comp/dito/components/PersonalInformation/mobile/index.js +34 -5
  9. package/es/composite-comp/dito/components/PersonalInformation/mobile/index.less +20 -18
  10. package/es/composite-comp/dito/config-panels/OrdersConfig/ConfigGroup/index.js +4 -1
  11. package/es/composite-comp/dito/second-config-panels/OrdersSecondConfig/index.js +4 -4
  12. package/es/composite-comp/dito/second-config-panels/PersonalInformationSecondConfig/index.js +2 -2
  13. package/es/constants/index.js +3 -3
  14. package/es/locale/en/en.json +4 -4
  15. package/es/locale/es/es.json +4 -4
  16. package/es/locale/id/id.json +4 -4
  17. package/es/utils/commonUtil.js +1 -1
  18. package/lib/common/GroupList/index.js +2 -0
  19. package/lib/composite-comp/dito/components/CommonFunctions/defaultJSON.js +8 -4
  20. package/lib/composite-comp/dito/components/CommonFunctions/mobile/index.js +6 -4
  21. package/lib/composite-comp/dito/components/Orders/defaultJSON.js +2 -2
  22. package/lib/composite-comp/dito/components/Orders/mobile/index.js +15 -6
  23. package/lib/composite-comp/dito/components/Orders/mobile/index.less +1 -0
  24. package/lib/composite-comp/dito/components/PersonalInformation/defaultJSON.js +1 -1
  25. package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.js +34 -5
  26. package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.less +20 -18
  27. package/lib/composite-comp/dito/config-panels/OrdersConfig/ConfigGroup/index.js +4 -1
  28. package/lib/composite-comp/dito/second-config-panels/OrdersSecondConfig/index.js +4 -4
  29. package/lib/composite-comp/dito/second-config-panels/PersonalInformationSecondConfig/index.js +2 -2
  30. package/lib/constants/index.js +3 -3
  31. package/lib/locale/en/en.json +4 -4
  32. package/lib/locale/es/es.json +4 -4
  33. package/lib/locale/id/id.json +4 -4
  34. package/lib/utils/commonUtil.js +1 -1
  35. package/package.json +1 -1
package/es/common/GroupList/index.js CHANGED
@@ -121,6 +121,8 @@ function (_super) {
121
121
  _this.setState({});
122
122
 
123
123
  (0, _coreUtil.renderPreview)();
124
+
125
+ _this.props.reRender();
124
126
  };
125
127
 
126
128
  _this.deleteItem = function (e, item) {
package/es/composite-comp/dito/components/CommonFunctions/defaultJSON.js CHANGED
@@ -7,7 +7,7 @@ exports.getDefaultJSON = exports.CommonFunctionsGroupSourceJSON = void 0;
7
7
 
8
8
  var _uuid = require("uuid");
9
9
 
10
- var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON(text) {
10
+ var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON(text, url) {
11
11
  var groupId = (0, _uuid.v4)();
12
12
  return {
13
13
  id: groupId,
@@ -17,7 +17,7 @@ var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON(tex
17
17
  open: true,
18
18
  type: 'TEXT',
19
19
  specialContent: [],
20
- text: text || 'Function Name',
20
+ text: text || 'Chat With Us',
21
21
  content: {
22
22
  sizeType: 'Customize font styles',
23
23
  fontFamily: 'Open Sans',
@@ -25,7 +25,11 @@ var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON(tex
25
25
  fontSize: 14,
26
26
  color: '#2C2C2C',
27
27
  width: 0,
28
- textAlign: 'center'
28
+ textAlign: 'center',
29
+ clickUrl: {
30
+ name: url,
31
+ value: url
32
+ }
29
33
  },
30
34
  underline: {
31
35
  open: false,
@@ -63,7 +67,7 @@ var getDefaultJSON = function getDefaultJSON() {
63
67
  return {
64
68
  id: (0, _uuid.v4)(),
65
69
  type: 'COMMON_FUNCTIONS',
66
- groupSource: [CommonFunctionsGroupSourceJSON('Address'), CommonFunctionsGroupSourceJSON('Policies'), CommonFunctionsGroupSourceJSON('Security Center'), CommonFunctionsGroupSourceJSON('Function Name')],
70
+ groupSource: [CommonFunctionsGroupSourceJSON('Address', '/address/manage'), CommonFunctionsGroupSourceJSON('Policies', '/account/policies'), CommonFunctionsGroupSourceJSON('Security Center', '/account/security'), CommonFunctionsGroupSourceJSON('Chat With Us')],
67
71
  spacing: {
68
72
  pc: {
69
73
  paddingTop: 0,
package/es/composite-comp/dito/components/CommonFunctions/mobile/index.js CHANGED
@@ -56,10 +56,12 @@ function (_super) {
56
56
  _this.state = {};
57
57
 
58
58
  _this.onItemClick = function (item) {
59
- var url = (0, _commonUtil.ensure)(function () {
60
- return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
61
- }, '');
62
- (0, _commonUtil.navigateTo)(url);
59
+ if ((0, _commonUtil.checkLogin)()) {
60
+ var url = (0, _commonUtil.ensure)(function () {
61
+ return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
62
+ }, '');
63
+ (0, _commonUtil.navigateTo)(url);
64
+ }
63
65
  };
64
66
 
65
67
  return _this;
package/es/composite-comp/dito/components/Orders/defaultJSON.js CHANGED
@@ -54,7 +54,7 @@ var OrdersGroupSourceJSON = function OrdersGroupSourceJSON(text) {
54
54
  h5ImgHoverUrl: ''
55
55
  }
56
56
  },
57
- sourceType: 'To Pay'
57
+ sourceType: text
58
58
  };
59
59
  };
60
60
 
@@ -64,7 +64,7 @@ var getDefaultJSON = function getDefaultJSON() {
64
64
  return {
65
65
  id: (0, _uuid.v4)(),
66
66
  type: 'ORDERS',
67
- groupSource: [OrdersGroupSourceJSON('To Pay'), OrdersGroupSourceJSON('To Ship'), OrdersGroupSourceJSON('To Receive'), OrdersGroupSourceJSON('Rating'), OrdersGroupSourceJSON('Return')],
67
+ groupSource: [OrdersGroupSourceJSON('To Pay'), OrdersGroupSourceJSON('To Ship'), OrdersGroupSourceJSON('To Receive'), OrdersGroupSourceJSON('Done'), OrdersGroupSourceJSON('Cancelled')],
68
68
  spacing: {
69
69
  pc: {
70
70
  paddingTop: 0,
package/es/composite-comp/dito/components/Orders/mobile/index.js CHANGED
@@ -210,11 +210,11 @@ var orderData = {
210
210
  key: 'toReceiveNum',
211
211
  route: '/main/order/3'
212
212
  },
213
- Rating: {
213
+ Done: {
214
214
  key: 'toRatingNum',
215
215
  route: '/rating-list'
216
216
  },
217
- Return: {
217
+ Cancelled: {
218
218
  key: 'returnsNum',
219
219
  route: '/aftersale-list'
220
220
  }
@@ -234,8 +234,13 @@ function (_super) {
234
234
  };
235
235
 
236
236
  _this.onItemClick = function (v) {
237
- var url = orderData[v].route;
238
- (0, _commonUtil.navigateTo)(url);
237
+ var _a;
238
+
239
+ var routeUrl = (_a = orderData[v]) === null || _a === void 0 ? void 0 : _a.route;
240
+ var selfUrl = (0, _commonUtil.ensure)(function () {
241
+ return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
242
+ }, '');
243
+ (0, _commonUtil.navigateTo)(routeUrl || selfUrl);
239
244
  };
240
245
 
241
246
  _this.getInit = function () {
@@ -266,7 +271,9 @@ function (_super) {
266
271
 
267
272
  _this.getImageHtml = function (item) {
268
273
  var orderStatus = _this.state.orderStatus;
269
- var num = orderStatus[orderData[item.sourceType].key];
274
+ var num = (0, _commonUtil.ensure)(function () {
275
+ return orderStatus[orderData[item.sourceType].key];
276
+ }, '');
270
277
  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
271
278
  data: item.image,
272
279
  maxWidth: "100%"
@@ -321,7 +328,9 @@ function (_super) {
321
328
  }, item.image.open && _this.getImageHtml(item)), item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
322
329
  className: "title",
323
330
  data: item.title,
324
- readonly: true
331
+ onTextInput: function onTextInput(text) {
332
+ item.title.text = text;
333
+ }
325
334
  }));
326
335
  }))));
327
336
  };
package/es/composite-comp/dito/components/Orders/mobile/index.less CHANGED
@@ -44,6 +44,7 @@
44
44
  display: flex;
45
45
  flex-direction: row;
46
46
  justify-content: space-between;
47
+ height: 1.32rem;
47
48
  margin-top: 0.48rem;
48
49
  margin-bottom: 0.02rem;
49
50
  }
package/es/composite-comp/dito/components/PersonalInformation/defaultJSON.js CHANGED
@@ -70,7 +70,7 @@ var getDefaultJSON = function getDefaultJSON() {
70
70
  login: {
71
71
  open: true
72
72
  },
73
- groupSource: [PersonalInfoGroupSourceJSON('Wishlist'), PersonalInfoGroupSourceJSON('Stores'), PersonalInfoGroupSourceJSON('Coupons'), PersonalInfoGroupSourceJSON('Recently Viewed')],
73
+ groupSource: [PersonalInfoGroupSourceJSON('Wishlist'), PersonalInfoGroupSourceJSON('Stores'), PersonalInfoGroupSourceJSON('Vouchers'), PersonalInfoGroupSourceJSON('Recently Viewed')],
74
74
  spacing: {
75
75
  pc: {
76
76
  paddingTop: 0,
package/es/composite-comp/dito/components/PersonalInformation/mobile/index.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.setAccountPageValue = exports["default"] = void 0;
6
+ exports.setAccountPageValue = exports.pInfoData = exports["default"] = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
@@ -218,7 +218,23 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
218
218
  }
219
219
  };
220
220
 
221
+ var pInfoData = {
222
+ Wishlist: {
223
+ route: '/favourite/list'
224
+ },
225
+ Stores: {
226
+ route: '/collect-store'
227
+ },
228
+ Vouchers: {
229
+ route: '/my-coupon'
230
+ },
231
+ 'Recently Viewed': {
232
+ route: '/review-list'
233
+ }
234
+ };
235
+ exports.pInfoData = pInfoData;
221
236
  var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
237
+ var currentUser = JSON.parse(localStorage.getItem('currentUser')) || {};
222
238
 
223
239
  var setAccountPageValue = function setAccountPageValue(obj) {
224
240
  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
@@ -237,7 +253,7 @@ function (_super) {
237
253
 
238
254
  _this.state = {
239
255
  messageNum: '',
240
- userInfo: {}
256
+ userInfo: currentUser
241
257
  };
242
258
 
243
259
  _this.getNum = function (v) {
@@ -247,7 +263,7 @@ function (_super) {
247
263
  return userInfo.userCollectionNum || 0;
248
264
  } else if (v === _index.personalInfoType.STORES) {
249
265
  return userInfo.userCollectionStoreNum || 0;
250
- } else if (v === _index.personalInfoType.COUPONS) {
266
+ } else if (v === _index.personalInfoType.VOUCHERS) {
251
267
  return userInfo.couponNum || 0;
252
268
  } else if (v === _index.personalInfoType.VIEWED) {
253
269
  return userInfo.recentViewNum || 0;
@@ -292,7 +308,7 @@ function (_super) {
292
308
  };
293
309
 
294
310
  _this.goLoginPage = function () {
295
- if (browserVersion().isApp) {
311
+ if ((0, _androidUtil.browserVersion)().isApp) {
296
312
  (0, _androidUtil.goToLoginApp)();
297
313
  } else {
298
314
  (0, _commonUtil.goLogin)();
@@ -349,6 +365,16 @@ function (_super) {
349
365
  });
350
366
  };
351
367
 
368
+ _this.onItemClick = function (v) {
369
+ var _a;
370
+
371
+ var routeUrl = (_a = pInfoData[v]) === null || _a === void 0 ? void 0 : _a.route;
372
+ var selfUrl = (0, _commonUtil.ensure)(function () {
373
+ return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
374
+ }, '');
375
+ (0, _commonUtil.navigateTo)(routeUrl || selfUrl);
376
+ };
377
+
352
378
  return _this;
353
379
  }
354
380
 
@@ -424,7 +450,10 @@ function (_super) {
424
450
  className: "bottom"
425
451
  }, data.groupSource.map(function (item) {
426
452
  return /*#__PURE__*/_react["default"].createElement("div", {
427
- className: "item"
453
+ className: "item",
454
+ onClick: function onClick() {
455
+ return _this.onItemClick(item.sourceType);
456
+ }
428
457
  }, item.number.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
429
458
  className: "number",
430
459
  data: __assign(__assign({}, item.number), {
package/es/composite-comp/dito/components/PersonalInformation/mobile/index.less CHANGED
@@ -3,21 +3,21 @@
3
3
  padding: 0.32rem;
4
4
  box-sizing: border-box;
5
5
  }
6
- .top {
6
+ .personal-information-mobile .top {
7
7
  display: flex;
8
8
  justify-content: space-between;
9
9
  align-items: start;
10
10
  }
11
- .top .pInfoWrap {
11
+ .personal-information-mobile .top .pInfoWrap {
12
12
  display: flex;
13
13
  align-items: center;
14
14
  }
15
- .top .pInfoWrap .photoWrap {
15
+ .personal-information-mobile .top .pInfoWrap .photoWrap {
16
16
  position: relative;
17
17
  display: inline-block;
18
18
  vertical-align: middle;
19
19
  }
20
- .top .pInfoWrap .photoWrap > input {
20
+ .personal-information-mobile .top .pInfoWrap .photoWrap > input {
21
21
  position: absolute;
22
22
  top: 0;
23
23
  left: 0;
@@ -25,14 +25,14 @@
25
25
  height: 100%;
26
26
  opacity: 0;
27
27
  }
28
- .top .pInfoWrap .userInfo {
28
+ .personal-information-mobile .top .pInfoWrap .userInfo {
29
29
  display: inline-block;
30
30
  vertical-align: middle;
31
31
  }
32
- .top .pInfoWrap .userInfo p {
32
+ .personal-information-mobile .top .pInfoWrap .userInfo p {
33
33
  margin: 0;
34
34
  }
35
- .top .pInfoWrap .userInfo .name {
35
+ .personal-information-mobile .top .pInfoWrap .userInfo .name {
36
36
  font-size: 0.28rem;
37
37
  font-weight: 500;
38
38
  color: #ffffff;
@@ -42,13 +42,13 @@
42
42
  overflow: hidden;
43
43
  word-break: break-all;
44
44
  }
45
- .top .pInfoWrap .userInfo .phone {
45
+ .personal-information-mobile .top .pInfoWrap .userInfo .phone {
46
46
  font-size: 0.28rem;
47
47
  font-weight: 400;
48
48
  color: #ffffff;
49
49
  margin-top: 0.1rem;
50
50
  }
51
- .top .pInfoWrap .photo {
51
+ .personal-information-mobile .top .pInfoWrap .photo {
52
52
  display: inline-block;
53
53
  width: 0.88rem;
54
54
  height: 0.88rem;
@@ -58,18 +58,18 @@
58
58
  margin-right: 0.3rem;
59
59
  border-radius: 50%;
60
60
  }
61
- .top .pInfoWrap .btnLogin {
61
+ .personal-information-mobile .top .pInfoWrap .btnLogin {
62
62
  font-size: 0.28rem;
63
63
  font-weight: 400;
64
64
  color: #ffffff;
65
65
  font-family: Montserrat;
66
66
  }
67
- .top .btnGroup .iconWrap {
67
+ .personal-information-mobile .top .btnGroup .iconWrap {
68
68
  display: inline-block;
69
69
  margin-left: 0.3rem;
70
70
  position: relative;
71
71
  }
72
- .top .btnGroup .num {
72
+ .personal-information-mobile .top .btnGroup .num {
73
73
  position: absolute;
74
74
  top: -0.04rem;
75
75
  left: 0.28rem;
@@ -84,14 +84,14 @@
84
84
  font-size: 0.12rem;
85
85
  color: #ffffff;
86
86
  }
87
- .bottom {
87
+ .personal-information-mobile .bottom {
88
88
  display: flex;
89
89
  flex-direction: row;
90
90
  justify-content: space-around;
91
91
  width: 100%;
92
92
  margin-top: 0.48rem;
93
93
  }
94
- .bottom .item {
94
+ .personal-information-mobile .bottom .item {
95
95
  display: flex;
96
96
  flex-direction: column;
97
97
  justify-content: flex-start;
@@ -99,7 +99,7 @@
99
99
  flex: 1;
100
100
  position: relative;
101
101
  }
102
- .bottom .item:after {
102
+ .personal-information-mobile .bottom .item:after {
103
103
  content: '';
104
104
  display: inline-block;
105
105
  width: 0.02rem;
@@ -109,16 +109,18 @@
109
109
  top: 0.12rem;
110
110
  background: #ccc;
111
111
  }
112
- .bottom .item:last-child:after {
112
+ .personal-information-mobile .bottom .item:last-child:after {
113
113
  display: none;
114
114
  }
115
- .bottom .item .number {
115
+ .personal-information-mobile .bottom .item .number {
116
+ width: 70% !important;
116
117
  font-size: 0.36rem;
117
118
  font-weight: 600;
118
119
  color: #ffffff;
119
120
  text-align: center;
120
121
  }
121
- .bottom .item .title {
122
+ .personal-information-mobile .bottom .item .title {
123
+ width: 70% !important;
122
124
  font-size: 0.24rem;
123
125
  font-weight: 400;
124
126
  color: #ffffff;
package/es/composite-comp/dito/config-panels/OrdersConfig/ConfigGroup/index.js CHANGED
@@ -97,7 +97,9 @@ function (_super) {
97
97
  }
98
98
 
99
99
  ImageTextConfigGroup.prototype.render = function () {
100
- var source = this.props.source;
100
+ var _a = this.props,
101
+ source = _a.source,
102
+ maxNum = _a.maxNum;
101
103
  return /*#__PURE__*/_react["default"].createElement("div", {
102
104
  className: "banner_group"
103
105
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -111,6 +113,7 @@ function (_super) {
111
113
  })), /*#__PURE__*/_react["default"].createElement("div", {
112
114
  className: "btn_wrap"
113
115
  }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
116
+ disabled: source.length >= maxNum,
114
117
  icon: "icon-add",
115
118
  onClick: this.onAddClick,
116
119
  type: "primary"
package/es/composite-comp/dito/second-config-panels/OrdersSecondConfig/index.js CHANGED
@@ -114,10 +114,10 @@ function (_super) {
114
114
  }, (0, _locale.i18n)('TO_SHIP')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
115
115
  value: _index.orderStatusType.RECEIVE
116
116
  }, (0, _locale.i18n)('TO_RECEIVE')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
117
- value: _index.orderStatusType.RATING
118
- }, (0, _locale.i18n)('RATING')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
119
- value: _index.orderStatusType.RETURN
120
- }, (0, _locale.i18n)('RETURN'))))));
117
+ value: _index.orderStatusType.DONE
118
+ }, (0, _locale.i18n)('DONE')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
119
+ value: _index.orderStatusType.CANCELLED
120
+ }, (0, _locale.i18n)('CANCELLED'))))));
121
121
  };
122
122
 
123
123
  return _this;
package/es/composite-comp/dito/second-config-panels/PersonalInformationSecondConfig/index.js CHANGED
@@ -109,8 +109,8 @@ function (_super) {
109
109
  }, (0, _locale.i18n)('WISHLIST')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
110
110
  value: _index.personalInfoType.STORES
111
111
  }, (0, _locale.i18n)('STORES')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
112
- value: _index.personalInfoType.COUPONS
113
- }, (0, _locale.i18n)('COUPONS')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
112
+ value: _index.personalInfoType.VOUCHERS
113
+ }, (0, _locale.i18n)('VOUCHERS')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
114
114
  value: _index.personalInfoType.VIEWED
115
115
  }, (0, _locale.i18n)('RECENTLY_VIEWED'))))));
116
116
  };
package/es/constants/index.js CHANGED
@@ -49,14 +49,14 @@ var orderStatusType = {
49
49
  PAY: 'To Pay',
50
50
  SHIP: 'To Ship',
51
51
  RECEIVE: 'To Receive',
52
- RATING: 'Rating',
53
- RETURN: 'Return'
52
+ DONE: 'Done',
53
+ CANCELLED: 'Cancelled'
54
54
  };
55
55
  exports.orderStatusType = orderStatusType;
56
56
  var personalInfoType = {
57
57
  WISHLIST: 'Wishlist',
58
58
  STORES: 'Stores',
59
- COUPONS: 'Coupons',
59
+ VOUCHERS: 'Vouchers',
60
60
  VIEWED: 'Recently Viewed'
61
61
  };
62
62
  exports.personalInfoType = personalInfoType;
package/es/locale/en/en.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
- "RETURN": "Return",
3
- "RATING": "Rating",
2
+ "CANCELLED": "Cancelled",
3
+ "DONE": "Done",
4
4
  "TO_RECEIVE": "To Receive",
5
5
  "TO_SHIP": "To ship",
6
6
  "TO_PAY": "To Pay",
7
7
  "VIEW_ALL_ORDERS": "View All Orders",
8
- "ORDERS": "ORDERS",
8
+ "ORDERS": "Orders",
9
9
  "RECENTLY_VIEWED": "Recently Viewed",
10
- "COUPONS": "Coupons",
10
+ "VOUCHERS": "Vouchers",
11
11
  "STORES": "Stores",
12
12
  "WISHLIST": "Wishlist",
13
13
  "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
package/es/locale/es/es.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
- "RETURN": "Return",
3
- "RATING": "Rating",
2
+ "CANCELLED": "Cancelled",
3
+ "DONE": "Done",
4
4
  "TO_RECEIVE": "To Receive",
5
5
  "TO_SHIP": "To ship",
6
6
  "TO_PAY": "To Pay",
7
7
  "VIEW_ALL_ORDERS": "View All Orders",
8
- "ORDERS": "ORDERS",
8
+ "ORDERS": "Orders",
9
9
  "RECENTLY_VIEWED": "Recently Viewed",
10
- "COUPONS": "Coupons",
10
+ "VOUCHERS": "Vouchers",
11
11
  "STORES": "Stores",
12
12
  "WISHLIST": "Wishlist",
13
13
  "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
package/es/locale/id/id.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
- "RETURN": "Return",
3
- "RATING": "Rating",
2
+ "CANCELLED": "Cancelled",
3
+ "DONE": "Done",
4
4
  "TO_RECEIVE": "To Receive",
5
5
  "TO_SHIP": "To ship",
6
6
  "TO_PAY": "To Pay",
7
7
  "VIEW_ALL_ORDERS": "View All Orders",
8
- "ORDERS": "ORDERS",
8
+ "ORDERS": "Orders",
9
9
  "RECENTLY_VIEWED": "Recently Viewed",
10
- "COUPONS": "Coupons",
10
+ "VOUCHERS": "Vouchers",
11
11
  "STORES": "Stores",
12
12
  "WISHLIST": "Wishlist",
13
13
  "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
package/es/utils/commonUtil.js CHANGED
@@ -752,7 +752,7 @@ function pushGA(data, eventName) {
752
752
  elementName: data.elementName
753
753
  };
754
754
  console.log('GA push', eventName, eventData);
755
- window.gtag('event', eventName, eventData);
755
+ if (window.gtag) window.gtag('event', eventName, eventData);
756
756
  }
757
757
  } catch (error) {
758
758
  console.error(error);
package/lib/common/GroupList/index.js CHANGED
@@ -121,6 +121,8 @@ function (_super) {
121
121
  _this.setState({});
122
122
 
123
123
  (0, _coreUtil.renderPreview)();
124
+
125
+ _this.props.reRender();
124
126
  };
125
127
 
126
128
  _this.deleteItem = function (e, item) {
package/lib/composite-comp/dito/components/CommonFunctions/defaultJSON.js CHANGED
@@ -7,7 +7,7 @@ exports.getDefaultJSON = exports.CommonFunctionsGroupSourceJSON = void 0;
7
7
 
8
8
  var _uuid = require("uuid");
9
9
 
10
- var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON(text) {
10
+ var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON(text, url) {
11
11
  var groupId = (0, _uuid.v4)();
12
12
  return {
13
13
  id: groupId,
@@ -17,7 +17,7 @@ var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON(tex
17
17
  open: true,
18
18
  type: 'TEXT',
19
19
  specialContent: [],
20
- text: text || 'Function Name',
20
+ text: text || 'Chat With Us',
21
21
  content: {
22
22
  sizeType: 'Customize font styles',
23
23
  fontFamily: 'Open Sans',
@@ -25,7 +25,11 @@ var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON(tex
25
25
  fontSize: 14,
26
26
  color: '#2C2C2C',
27
27
  width: 0,
28
- textAlign: 'center'
28
+ textAlign: 'center',
29
+ clickUrl: {
30
+ name: url,
31
+ value: url
32
+ }
29
33
  },
30
34
  underline: {
31
35
  open: false,
@@ -63,7 +67,7 @@ var getDefaultJSON = function getDefaultJSON() {
63
67
  return {
64
68
  id: (0, _uuid.v4)(),
65
69
  type: 'COMMON_FUNCTIONS',
66
- groupSource: [CommonFunctionsGroupSourceJSON('Address'), CommonFunctionsGroupSourceJSON('Policies'), CommonFunctionsGroupSourceJSON('Security Center'), CommonFunctionsGroupSourceJSON('Function Name')],
70
+ groupSource: [CommonFunctionsGroupSourceJSON('Address', '/address/manage'), CommonFunctionsGroupSourceJSON('Policies', '/account/policies'), CommonFunctionsGroupSourceJSON('Security Center', '/account/security'), CommonFunctionsGroupSourceJSON('Chat With Us')],
67
71
  spacing: {
68
72
  pc: {
69
73
  paddingTop: 0,
package/lib/composite-comp/dito/components/CommonFunctions/mobile/index.js CHANGED
@@ -56,10 +56,12 @@ function (_super) {
56
56
  _this.state = {};
57
57
 
58
58
  _this.onItemClick = function (item) {
59
- var url = (0, _commonUtil.ensure)(function () {
60
- return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
61
- }, '');
62
- (0, _commonUtil.navigateTo)(url);
59
+ if ((0, _commonUtil.checkLogin)()) {
60
+ var url = (0, _commonUtil.ensure)(function () {
61
+ return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
62
+ }, '');
63
+ (0, _commonUtil.navigateTo)(url);
64
+ }
63
65
  };
64
66
 
65
67
  return _this;
package/lib/composite-comp/dito/components/Orders/defaultJSON.js CHANGED
@@ -54,7 +54,7 @@ var OrdersGroupSourceJSON = function OrdersGroupSourceJSON(text) {
54
54
  h5ImgHoverUrl: ''
55
55
  }
56
56
  },
57
- sourceType: 'To Pay'
57
+ sourceType: text
58
58
  };
59
59
  };
60
60
 
@@ -64,7 +64,7 @@ var getDefaultJSON = function getDefaultJSON() {
64
64
  return {
65
65
  id: (0, _uuid.v4)(),
66
66
  type: 'ORDERS',
67
- groupSource: [OrdersGroupSourceJSON('To Pay'), OrdersGroupSourceJSON('To Ship'), OrdersGroupSourceJSON('To Receive'), OrdersGroupSourceJSON('Rating'), OrdersGroupSourceJSON('Return')],
67
+ groupSource: [OrdersGroupSourceJSON('To Pay'), OrdersGroupSourceJSON('To Ship'), OrdersGroupSourceJSON('To Receive'), OrdersGroupSourceJSON('Done'), OrdersGroupSourceJSON('Cancelled')],
68
68
  spacing: {
69
69
  pc: {
70
70
  paddingTop: 0,
package/lib/composite-comp/dito/components/Orders/mobile/index.js CHANGED
@@ -210,11 +210,11 @@ var orderData = {
210
210
  key: 'toReceiveNum',
211
211
  route: '/main/order/3'
212
212
  },
213
- Rating: {
213
+ Done: {
214
214
  key: 'toRatingNum',
215
215
  route: '/rating-list'
216
216
  },
217
- Return: {
217
+ Cancelled: {
218
218
  key: 'returnsNum',
219
219
  route: '/aftersale-list'
220
220
  }
@@ -234,8 +234,13 @@ function (_super) {
234
234
  };
235
235
 
236
236
  _this.onItemClick = function (v) {
237
- var url = orderData[v].route;
238
- (0, _commonUtil.navigateTo)(url);
237
+ var _a;
238
+
239
+ var routeUrl = (_a = orderData[v]) === null || _a === void 0 ? void 0 : _a.route;
240
+ var selfUrl = (0, _commonUtil.ensure)(function () {
241
+ return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
242
+ }, '');
243
+ (0, _commonUtil.navigateTo)(routeUrl || selfUrl);
239
244
  };
240
245
 
241
246
  _this.getInit = function () {
@@ -266,7 +271,9 @@ function (_super) {
266
271
 
267
272
  _this.getImageHtml = function (item) {
268
273
  var orderStatus = _this.state.orderStatus;
269
- var num = orderStatus[orderData[item.sourceType].key];
274
+ var num = (0, _commonUtil.ensure)(function () {
275
+ return orderStatus[orderData[item.sourceType].key];
276
+ }, '');
270
277
  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
271
278
  data: item.image,
272
279
  maxWidth: "100%"
@@ -321,7 +328,9 @@ function (_super) {
321
328
  }, item.image.open && _this.getImageHtml(item)), item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
322
329
  className: "title",
323
330
  data: item.title,
324
- readonly: true
331
+ onTextInput: function onTextInput(text) {
332
+ item.title.text = text;
333
+ }
325
334
  }));
326
335
  }))));
327
336
  };
package/lib/composite-comp/dito/components/Orders/mobile/index.less CHANGED
@@ -44,6 +44,7 @@
44
44
  display: flex;
45
45
  flex-direction: row;
46
46
  justify-content: space-between;
47
+ height: 1.32rem;
47
48
  margin-top: 0.48rem;
48
49
  margin-bottom: 0.02rem;
49
50
  }
package/lib/composite-comp/dito/components/PersonalInformation/defaultJSON.js CHANGED
@@ -70,7 +70,7 @@ var getDefaultJSON = function getDefaultJSON() {
70
70
  login: {
71
71
  open: true
72
72
  },
73
- groupSource: [PersonalInfoGroupSourceJSON('Wishlist'), PersonalInfoGroupSourceJSON('Stores'), PersonalInfoGroupSourceJSON('Coupons'), PersonalInfoGroupSourceJSON('Recently Viewed')],
73
+ groupSource: [PersonalInfoGroupSourceJSON('Wishlist'), PersonalInfoGroupSourceJSON('Stores'), PersonalInfoGroupSourceJSON('Vouchers'), PersonalInfoGroupSourceJSON('Recently Viewed')],
74
74
  spacing: {
75
75
  pc: {
76
76
  paddingTop: 0,
package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.setAccountPageValue = exports["default"] = void 0;
6
+ exports.setAccountPageValue = exports.pInfoData = exports["default"] = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
@@ -218,7 +218,23 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
218
218
  }
219
219
  };
220
220
 
221
+ var pInfoData = {
222
+ Wishlist: {
223
+ route: '/favourite/list'
224
+ },
225
+ Stores: {
226
+ route: '/collect-store'
227
+ },
228
+ Vouchers: {
229
+ route: '/my-coupon'
230
+ },
231
+ 'Recently Viewed': {
232
+ route: '/review-list'
233
+ }
234
+ };
235
+ exports.pInfoData = pInfoData;
221
236
  var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
237
+ var currentUser = JSON.parse(localStorage.getItem('currentUser')) || {};
222
238
 
223
239
  var setAccountPageValue = function setAccountPageValue(obj) {
224
240
  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
@@ -237,7 +253,7 @@ function (_super) {
237
253
 
238
254
  _this.state = {
239
255
  messageNum: '',
240
- userInfo: {}
256
+ userInfo: currentUser
241
257
  };
242
258
 
243
259
  _this.getNum = function (v) {
@@ -247,7 +263,7 @@ function (_super) {
247
263
  return userInfo.userCollectionNum || 0;
248
264
  } else if (v === _index.personalInfoType.STORES) {
249
265
  return userInfo.userCollectionStoreNum || 0;
250
- } else if (v === _index.personalInfoType.COUPONS) {
266
+ } else if (v === _index.personalInfoType.VOUCHERS) {
251
267
  return userInfo.couponNum || 0;
252
268
  } else if (v === _index.personalInfoType.VIEWED) {
253
269
  return userInfo.recentViewNum || 0;
@@ -292,7 +308,7 @@ function (_super) {
292
308
  };
293
309
 
294
310
  _this.goLoginPage = function () {
295
- if (browserVersion().isApp) {
311
+ if ((0, _androidUtil.browserVersion)().isApp) {
296
312
  (0, _androidUtil.goToLoginApp)();
297
313
  } else {
298
314
  (0, _commonUtil.goLogin)();
@@ -349,6 +365,16 @@ function (_super) {
349
365
  });
350
366
  };
351
367
 
368
+ _this.onItemClick = function (v) {
369
+ var _a;
370
+
371
+ var routeUrl = (_a = pInfoData[v]) === null || _a === void 0 ? void 0 : _a.route;
372
+ var selfUrl = (0, _commonUtil.ensure)(function () {
373
+ return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
374
+ }, '');
375
+ (0, _commonUtil.navigateTo)(routeUrl || selfUrl);
376
+ };
377
+
352
378
  return _this;
353
379
  }
354
380
 
@@ -424,7 +450,10 @@ function (_super) {
424
450
  className: "bottom"
425
451
  }, data.groupSource.map(function (item) {
426
452
  return /*#__PURE__*/_react["default"].createElement("div", {
427
- className: "item"
453
+ className: "item",
454
+ onClick: function onClick() {
455
+ return _this.onItemClick(item.sourceType);
456
+ }
428
457
  }, item.number.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
429
458
  className: "number",
430
459
  data: __assign(__assign({}, item.number), {
package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.less CHANGED
@@ -3,21 +3,21 @@
3
3
  padding: 0.32rem;
4
4
  box-sizing: border-box;
5
5
  }
6
- .top {
6
+ .personal-information-mobile .top {
7
7
  display: flex;
8
8
  justify-content: space-between;
9
9
  align-items: start;
10
10
  }
11
- .top .pInfoWrap {
11
+ .personal-information-mobile .top .pInfoWrap {
12
12
  display: flex;
13
13
  align-items: center;
14
14
  }
15
- .top .pInfoWrap .photoWrap {
15
+ .personal-information-mobile .top .pInfoWrap .photoWrap {
16
16
  position: relative;
17
17
  display: inline-block;
18
18
  vertical-align: middle;
19
19
  }
20
- .top .pInfoWrap .photoWrap > input {
20
+ .personal-information-mobile .top .pInfoWrap .photoWrap > input {
21
21
  position: absolute;
22
22
  top: 0;
23
23
  left: 0;
@@ -25,14 +25,14 @@
25
25
  height: 100%;
26
26
  opacity: 0;
27
27
  }
28
- .top .pInfoWrap .userInfo {
28
+ .personal-information-mobile .top .pInfoWrap .userInfo {
29
29
  display: inline-block;
30
30
  vertical-align: middle;
31
31
  }
32
- .top .pInfoWrap .userInfo p {
32
+ .personal-information-mobile .top .pInfoWrap .userInfo p {
33
33
  margin: 0;
34
34
  }
35
- .top .pInfoWrap .userInfo .name {
35
+ .personal-information-mobile .top .pInfoWrap .userInfo .name {
36
36
  font-size: 0.28rem;
37
37
  font-weight: 500;
38
38
  color: #ffffff;
@@ -42,13 +42,13 @@
42
42
  overflow: hidden;
43
43
  word-break: break-all;
44
44
  }
45
- .top .pInfoWrap .userInfo .phone {
45
+ .personal-information-mobile .top .pInfoWrap .userInfo .phone {
46
46
  font-size: 0.28rem;
47
47
  font-weight: 400;
48
48
  color: #ffffff;
49
49
  margin-top: 0.1rem;
50
50
  }
51
- .top .pInfoWrap .photo {
51
+ .personal-information-mobile .top .pInfoWrap .photo {
52
52
  display: inline-block;
53
53
  width: 0.88rem;
54
54
  height: 0.88rem;
@@ -58,18 +58,18 @@
58
58
  margin-right: 0.3rem;
59
59
  border-radius: 50%;
60
60
  }
61
- .top .pInfoWrap .btnLogin {
61
+ .personal-information-mobile .top .pInfoWrap .btnLogin {
62
62
  font-size: 0.28rem;
63
63
  font-weight: 400;
64
64
  color: #ffffff;
65
65
  font-family: Montserrat;
66
66
  }
67
- .top .btnGroup .iconWrap {
67
+ .personal-information-mobile .top .btnGroup .iconWrap {
68
68
  display: inline-block;
69
69
  margin-left: 0.3rem;
70
70
  position: relative;
71
71
  }
72
- .top .btnGroup .num {
72
+ .personal-information-mobile .top .btnGroup .num {
73
73
  position: absolute;
74
74
  top: -0.04rem;
75
75
  left: 0.28rem;
@@ -84,14 +84,14 @@
84
84
  font-size: 0.12rem;
85
85
  color: #ffffff;
86
86
  }
87
- .bottom {
87
+ .personal-information-mobile .bottom {
88
88
  display: flex;
89
89
  flex-direction: row;
90
90
  justify-content: space-around;
91
91
  width: 100%;
92
92
  margin-top: 0.48rem;
93
93
  }
94
- .bottom .item {
94
+ .personal-information-mobile .bottom .item {
95
95
  display: flex;
96
96
  flex-direction: column;
97
97
  justify-content: flex-start;
@@ -99,7 +99,7 @@
99
99
  flex: 1;
100
100
  position: relative;
101
101
  }
102
- .bottom .item:after {
102
+ .personal-information-mobile .bottom .item:after {
103
103
  content: '';
104
104
  display: inline-block;
105
105
  width: 0.02rem;
@@ -109,16 +109,18 @@
109
109
  top: 0.12rem;
110
110
  background: #ccc;
111
111
  }
112
- .bottom .item:last-child:after {
112
+ .personal-information-mobile .bottom .item:last-child:after {
113
113
  display: none;
114
114
  }
115
- .bottom .item .number {
115
+ .personal-information-mobile .bottom .item .number {
116
+ width: 70% !important;
116
117
  font-size: 0.36rem;
117
118
  font-weight: 600;
118
119
  color: #ffffff;
119
120
  text-align: center;
120
121
  }
121
- .bottom .item .title {
122
+ .personal-information-mobile .bottom .item .title {
123
+ width: 70% !important;
122
124
  font-size: 0.24rem;
123
125
  font-weight: 400;
124
126
  color: #ffffff;
package/lib/composite-comp/dito/config-panels/OrdersConfig/ConfigGroup/index.js CHANGED
@@ -97,7 +97,9 @@ function (_super) {
97
97
  }
98
98
 
99
99
  ImageTextConfigGroup.prototype.render = function () {
100
- var source = this.props.source;
100
+ var _a = this.props,
101
+ source = _a.source,
102
+ maxNum = _a.maxNum;
101
103
  return /*#__PURE__*/_react["default"].createElement("div", {
102
104
  className: "banner_group"
103
105
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -111,6 +113,7 @@ function (_super) {
111
113
  })), /*#__PURE__*/_react["default"].createElement("div", {
112
114
  className: "btn_wrap"
113
115
  }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
116
+ disabled: source.length >= maxNum,
114
117
  icon: "icon-add",
115
118
  onClick: this.onAddClick,
116
119
  type: "primary"
package/lib/composite-comp/dito/second-config-panels/OrdersSecondConfig/index.js CHANGED
@@ -114,10 +114,10 @@ function (_super) {
114
114
  }, (0, _locale.i18n)('TO_SHIP')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
115
115
  value: _index.orderStatusType.RECEIVE
116
116
  }, (0, _locale.i18n)('TO_RECEIVE')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
117
- value: _index.orderStatusType.RATING
118
- }, (0, _locale.i18n)('RATING')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
119
- value: _index.orderStatusType.RETURN
120
- }, (0, _locale.i18n)('RETURN'))))));
117
+ value: _index.orderStatusType.DONE
118
+ }, (0, _locale.i18n)('DONE')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
119
+ value: _index.orderStatusType.CANCELLED
120
+ }, (0, _locale.i18n)('CANCELLED'))))));
121
121
  };
122
122
 
123
123
  return _this;
package/lib/composite-comp/dito/second-config-panels/PersonalInformationSecondConfig/index.js CHANGED
@@ -109,8 +109,8 @@ function (_super) {
109
109
  }, (0, _locale.i18n)('WISHLIST')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
110
110
  value: _index.personalInfoType.STORES
111
111
  }, (0, _locale.i18n)('STORES')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
112
- value: _index.personalInfoType.COUPONS
113
- }, (0, _locale.i18n)('COUPONS')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
112
+ value: _index.personalInfoType.VOUCHERS
113
+ }, (0, _locale.i18n)('VOUCHERS')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
114
114
  value: _index.personalInfoType.VIEWED
115
115
  }, (0, _locale.i18n)('RECENTLY_VIEWED'))))));
116
116
  };
package/lib/constants/index.js CHANGED
@@ -49,14 +49,14 @@ var orderStatusType = {
49
49
  PAY: 'To Pay',
50
50
  SHIP: 'To Ship',
51
51
  RECEIVE: 'To Receive',
52
- RATING: 'Rating',
53
- RETURN: 'Return'
52
+ DONE: 'Done',
53
+ CANCELLED: 'Cancelled'
54
54
  };
55
55
  exports.orderStatusType = orderStatusType;
56
56
  var personalInfoType = {
57
57
  WISHLIST: 'Wishlist',
58
58
  STORES: 'Stores',
59
- COUPONS: 'Coupons',
59
+ VOUCHERS: 'Vouchers',
60
60
  VIEWED: 'Recently Viewed'
61
61
  };
62
62
  exports.personalInfoType = personalInfoType;
package/lib/locale/en/en.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
- "RETURN": "Return",
3
- "RATING": "Rating",
2
+ "CANCELLED": "Cancelled",
3
+ "DONE": "Done",
4
4
  "TO_RECEIVE": "To Receive",
5
5
  "TO_SHIP": "To ship",
6
6
  "TO_PAY": "To Pay",
7
7
  "VIEW_ALL_ORDERS": "View All Orders",
8
- "ORDERS": "ORDERS",
8
+ "ORDERS": "Orders",
9
9
  "RECENTLY_VIEWED": "Recently Viewed",
10
- "COUPONS": "Coupons",
10
+ "VOUCHERS": "Vouchers",
11
11
  "STORES": "Stores",
12
12
  "WISHLIST": "Wishlist",
13
13
  "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
package/lib/locale/es/es.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
- "RETURN": "Return",
3
- "RATING": "Rating",
2
+ "CANCELLED": "Cancelled",
3
+ "DONE": "Done",
4
4
  "TO_RECEIVE": "To Receive",
5
5
  "TO_SHIP": "To ship",
6
6
  "TO_PAY": "To Pay",
7
7
  "VIEW_ALL_ORDERS": "View All Orders",
8
- "ORDERS": "ORDERS",
8
+ "ORDERS": "Orders",
9
9
  "RECENTLY_VIEWED": "Recently Viewed",
10
- "COUPONS": "Coupons",
10
+ "VOUCHERS": "Vouchers",
11
11
  "STORES": "Stores",
12
12
  "WISHLIST": "Wishlist",
13
13
  "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
package/lib/locale/id/id.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
- "RETURN": "Return",
3
- "RATING": "Rating",
2
+ "CANCELLED": "Cancelled",
3
+ "DONE": "Done",
4
4
  "TO_RECEIVE": "To Receive",
5
5
  "TO_SHIP": "To ship",
6
6
  "TO_PAY": "To Pay",
7
7
  "VIEW_ALL_ORDERS": "View All Orders",
8
- "ORDERS": "ORDERS",
8
+ "ORDERS": "Orders",
9
9
  "RECENTLY_VIEWED": "Recently Viewed",
10
- "COUPONS": "Coupons",
10
+ "VOUCHERS": "Vouchers",
11
11
  "STORES": "Stores",
12
12
  "WISHLIST": "Wishlist",
13
13
  "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
package/lib/utils/commonUtil.js CHANGED
@@ -752,7 +752,7 @@ function pushGA(data, eventName) {
752
752
  elementName: data.elementName
753
753
  };
754
754
  console.log('GA push', eventName, eventData);
755
- window.gtag('event', eventName, eventData);
755
+ if (window.gtag) window.gtag('event', eventName, eventData);
756
756
  }
757
757
  } catch (error) {
758
758
  console.error(error);
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fonixtree/magic-design",
3
3
  "author": "Cylon Team",
4
- "version": "2.0.84",
4
+ "version": "2.0.85",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",