@fonixtree/magic-design 2.0.158 → 2.0.160

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 (13) hide show
  1. package/es/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.less +0 -1
  2. package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +1 -1
  3. package/es/locale/en/en.json +2 -2
  4. package/es/locale/es/es.json +2 -2
  5. package/es/locale/mn/mn.json +4 -4
  6. package/es/utils/currencyUtil.js +7 -2
  7. package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.less +0 -1
  8. package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +1 -1
  9. package/lib/locale/en/en.json +2 -2
  10. package/lib/locale/es/es.json +2 -2
  11. package/lib/locale/mn/mn.json +4 -4
  12. package/lib/utils/currencyUtil.js +7 -2
  13. package/package.json +1 -1
package/es/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.less CHANGED
@@ -28,7 +28,6 @@
28
28
  border-radius: 0.52rem;
29
29
  font-size: 0.24rem;
30
30
  font-weight: 400;
31
- width: fit-content;
32
31
  flex-shrink: 0;
33
32
  }
34
33
  .searchCondWrap .sortItem .filterText {
package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js CHANGED
@@ -245,7 +245,7 @@ var defaultData = [{
245
245
  coupons: [{
246
246
  couponId: '1',
247
247
  discountMethod: 'DISC',
248
- discountAmount: 30
248
+ discountAmount: 3000
249
249
  }, {
250
250
  couponId: '2',
251
251
  discountMethod: 'AMT',
package/es/locale/en/en.json CHANGED
@@ -140,11 +140,12 @@
140
140
  "RATINGS": "Ratings",
141
141
  "STAR": "Star",
142
142
  "SORT_BY": "Sort by",
143
- "PROMOTION": "Promotion",
144
143
  "HIGHEST_RATED": "Highest rated",
145
144
  "MOST_SOLD": "Most sold",
146
145
  "LOWEST_PRICE": "Lowest price",
147
146
  "EARLIEST": "Earliest",
147
+ "FILTER": "Filter",
148
+ "PROMOTION": "Promotion",
148
149
  "BUY_NOW": "Buy Now",
149
150
  "TOTAL": "Total",
150
151
  "RECENTLY": "Recently",
@@ -155,7 +156,6 @@
155
156
  "DISCOUNT_LABEL": "Discount Label",
156
157
  "SESSION_TIME": "Session Time",
157
158
  "COUNTDOWN": "Countdown",
158
- "FILTER": "Filter",
159
159
  "SOLD": "Sold",
160
160
  "EVALUATION_SCORE": "Evaluation Score",
161
161
  "SEARCH_BAR_KEYWORD": "Search Bar Keyword",
package/es/locale/es/es.json CHANGED
@@ -140,11 +140,12 @@
140
140
  "RATINGS": "Ratings",
141
141
  "STAR": "Star",
142
142
  "SORT_BY": "Sort by",
143
- "PROMOTION": "Promotion",
144
143
  "HIGHEST_RATED": "Highest rated",
145
144
  "MOST_SOLD": "Most sold",
146
145
  "LOWEST_PRICE": "Lowest price",
147
146
  "EARLIEST": "Earliest",
147
+ "FILTER": "Filter",
148
+ "PROMOTION": "Promotion",
148
149
  "BUY_NOW": "Buy Now",
149
150
  "TOTAL": "Total",
150
151
  "RECENTLY": "Recently",
@@ -155,7 +156,6 @@
155
156
  "DISCOUNT_LABEL": "Discount Label",
156
157
  "SESSION_TIME": "Session Time",
157
158
  "COUNTDOWN": "Countdown",
158
- "FILTER": "Filter",
159
159
  "SOLD": "Sold",
160
160
  "EVALUATION_SCORE": "Evaluation Score",
161
161
  "SEARCH_BAR_KEYWORD": "Search Bar Keyword",
package/es/locale/mn/mn.json CHANGED
@@ -140,11 +140,12 @@
140
140
  "RATINGS": "Үнэлгээ",
141
141
  "STAR": "Од",
142
142
  "SORT_BY": "Эрэмбэлэх",
143
- "PROMOTION": "Урамшуулал",
144
143
  "HIGHEST_RATED": "Хамгийн өндөр үнэлгээтэй",
145
- "MOST_SOLD": "Хамгийн өндөр үнэлгээтэй",
146
- "LOWEST_PRICE": "Хамгийн бага үнэ",
144
+ "MOST_SOLD": "Хамгийн их зарагдсан",
145
+ "LOWEST_PRICE": "Хамгийн хямд",
147
146
  "EARLIEST": "Хамгийн эрт",
147
+ "FILTER": "Шүүлт",
148
+ "PROMOTION": "Урамшуулал",
148
149
  "BUY_NOW": "Төлөх",
149
150
  "TOTAL": "Нийт",
150
151
  "RECENTLY": "Саяхан",
@@ -155,7 +156,6 @@
155
156
  "DISCOUNT_LABEL": "Хөнгөлөлтийн шошго",
156
157
  "SESSION_TIME": "Сеанс цаг",
157
158
  "COUNTDOWN": "Countdown",
158
- "FILTER": "Шүүлтүүр",
159
159
  "SOLD": "Sold",
160
160
  "EVALUATION_SCORE": "Үнэлгээний оноо",
161
161
  "SEARCH_BAR_KEYWORD": "Хайлтын мөрний түлхүүр үг",
package/es/utils/currencyUtil.js CHANGED
@@ -78,7 +78,7 @@ var formatBackendCurrency = function formatBackendCurrency(num) {
78
78
 
79
79
  exports.formatBackendCurrency = formatBackendCurrency;
80
80
 
81
- var formatCurrency = function formatCurrency(num) {
81
+ var formatCurrency = function formatCurrency(num, initPercision) {
82
82
  var displayPrecision = (0, _commonUtil.ensure)(function () {
83
83
  return window.systemParams.displayCurrencyPrecision;
84
84
  }, '0');
@@ -88,14 +88,19 @@ var formatCurrency = function formatCurrency(num) {
88
88
  var pricePrefix = (0, _commonUtil.ensure)(function () {
89
89
  return window.systemParams.prefix;
90
90
  }, 'Rp');
91
+ var newPercision = initPercision || precision;
91
92
  var numVal = num;
92
93
 
93
94
  if (Number.isNaN(num) || !Number.isFinite(num)) {
94
95
  numVal = 0;
95
96
  }
96
97
 
98
+ if (newPercision <= 0) {
99
+ return addSeparators(numVal, ',', '.');
100
+ }
101
+
97
102
  var displayNum = displayPrecision != null && displayPrecision !== '' ? displayPrecision : precision;
98
- var ret = numVal / Math.pow(10, precision);
103
+ var ret = numVal / Math.pow(10, newPercision);
99
104
  return addSeparators(ret.toFixed(displayNum), pricePrefix === "IDR" || pricePrefix === "Rp" ? '.' : ',', '.');
100
105
  };
101
106
 
package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.less CHANGED
@@ -28,7 +28,6 @@
28
28
  border-radius: 0.52rem;
29
29
  font-size: 0.24rem;
30
30
  font-weight: 400;
31
- width: fit-content;
32
31
  flex-shrink: 0;
33
32
  }
34
33
  .searchCondWrap .sortItem .filterText {
package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js CHANGED
@@ -245,7 +245,7 @@ var defaultData = [{
245
245
  coupons: [{
246
246
  couponId: '1',
247
247
  discountMethod: 'DISC',
248
- discountAmount: 30
248
+ discountAmount: 3000
249
249
  }, {
250
250
  couponId: '2',
251
251
  discountMethod: 'AMT',
package/lib/locale/en/en.json CHANGED
@@ -140,11 +140,12 @@
140
140
  "RATINGS": "Ratings",
141
141
  "STAR": "Star",
142
142
  "SORT_BY": "Sort by",
143
- "PROMOTION": "Promotion",
144
143
  "HIGHEST_RATED": "Highest rated",
145
144
  "MOST_SOLD": "Most sold",
146
145
  "LOWEST_PRICE": "Lowest price",
147
146
  "EARLIEST": "Earliest",
147
+ "FILTER": "Filter",
148
+ "PROMOTION": "Promotion",
148
149
  "BUY_NOW": "Buy Now",
149
150
  "TOTAL": "Total",
150
151
  "RECENTLY": "Recently",
@@ -155,7 +156,6 @@
155
156
  "DISCOUNT_LABEL": "Discount Label",
156
157
  "SESSION_TIME": "Session Time",
157
158
  "COUNTDOWN": "Countdown",
158
- "FILTER": "Filter",
159
159
  "SOLD": "Sold",
160
160
  "EVALUATION_SCORE": "Evaluation Score",
161
161
  "SEARCH_BAR_KEYWORD": "Search Bar Keyword",
package/lib/locale/es/es.json CHANGED
@@ -140,11 +140,12 @@
140
140
  "RATINGS": "Ratings",
141
141
  "STAR": "Star",
142
142
  "SORT_BY": "Sort by",
143
- "PROMOTION": "Promotion",
144
143
  "HIGHEST_RATED": "Highest rated",
145
144
  "MOST_SOLD": "Most sold",
146
145
  "LOWEST_PRICE": "Lowest price",
147
146
  "EARLIEST": "Earliest",
147
+ "FILTER": "Filter",
148
+ "PROMOTION": "Promotion",
148
149
  "BUY_NOW": "Buy Now",
149
150
  "TOTAL": "Total",
150
151
  "RECENTLY": "Recently",
@@ -155,7 +156,6 @@
155
156
  "DISCOUNT_LABEL": "Discount Label",
156
157
  "SESSION_TIME": "Session Time",
157
158
  "COUNTDOWN": "Countdown",
158
- "FILTER": "Filter",
159
159
  "SOLD": "Sold",
160
160
  "EVALUATION_SCORE": "Evaluation Score",
161
161
  "SEARCH_BAR_KEYWORD": "Search Bar Keyword",
package/lib/locale/mn/mn.json CHANGED
@@ -140,11 +140,12 @@
140
140
  "RATINGS": "Үнэлгээ",
141
141
  "STAR": "Од",
142
142
  "SORT_BY": "Эрэмбэлэх",
143
- "PROMOTION": "Урамшуулал",
144
143
  "HIGHEST_RATED": "Хамгийн өндөр үнэлгээтэй",
145
- "MOST_SOLD": "Хамгийн өндөр үнэлгээтэй",
146
- "LOWEST_PRICE": "Хамгийн бага үнэ",
144
+ "MOST_SOLD": "Хамгийн их зарагдсан",
145
+ "LOWEST_PRICE": "Хамгийн хямд",
147
146
  "EARLIEST": "Хамгийн эрт",
147
+ "FILTER": "Шүүлт",
148
+ "PROMOTION": "Урамшуулал",
148
149
  "BUY_NOW": "Төлөх",
149
150
  "TOTAL": "Нийт",
150
151
  "RECENTLY": "Саяхан",
@@ -155,7 +156,6 @@
155
156
  "DISCOUNT_LABEL": "Хөнгөлөлтийн шошго",
156
157
  "SESSION_TIME": "Сеанс цаг",
157
158
  "COUNTDOWN": "Countdown",
158
- "FILTER": "Шүүлтүүр",
159
159
  "SOLD": "Sold",
160
160
  "EVALUATION_SCORE": "Үнэлгээний оноо",
161
161
  "SEARCH_BAR_KEYWORD": "Хайлтын мөрний түлхүүр үг",
package/lib/utils/currencyUtil.js CHANGED
@@ -78,7 +78,7 @@ var formatBackendCurrency = function formatBackendCurrency(num) {
78
78
 
79
79
  exports.formatBackendCurrency = formatBackendCurrency;
80
80
 
81
- var formatCurrency = function formatCurrency(num) {
81
+ var formatCurrency = function formatCurrency(num, initPercision) {
82
82
  var displayPrecision = (0, _commonUtil.ensure)(function () {
83
83
  return window.systemParams.displayCurrencyPrecision;
84
84
  }, '0');
@@ -88,14 +88,19 @@ var formatCurrency = function formatCurrency(num) {
88
88
  var pricePrefix = (0, _commonUtil.ensure)(function () {
89
89
  return window.systemParams.prefix;
90
90
  }, 'Rp');
91
+ var newPercision = initPercision || precision;
91
92
  var numVal = num;
92
93
 
93
94
  if (Number.isNaN(num) || !Number.isFinite(num)) {
94
95
  numVal = 0;
95
96
  }
96
97
 
98
+ if (newPercision <= 0) {
99
+ return addSeparators(numVal, ',', '.');
100
+ }
101
+
97
102
  var displayNum = displayPrecision != null && displayPrecision !== '' ? displayPrecision : precision;
98
- var ret = numVal / Math.pow(10, precision);
103
+ var ret = numVal / Math.pow(10, newPercision);
99
104
  return addSeparators(ret.toFixed(displayNum), pricePrefix === "IDR" || pricePrefix === "Rp" ? '.' : ',', '.');
100
105
  };
101
106
 
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.158",
4
+ "version": "2.0.160",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",