@things-factory/worksheet-base 4.3.578 → 4.3.580

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.
@@ -91,7 +91,8 @@ async function renderInvoices({ req, timezoneOffSet }, context) {
91
91
  });
92
92
  const sumProductTotalPaidPrice = product_list.reduce((total, item) => total + item.product_total_paid_price, 0);
93
93
  let date = datetime_util_1.DateTimeConverter.date(new Date((record.iv_issued_on || record.iv_created_at) - timezoneOffSet));
94
- let shipping_discount = Math.abs(parseFloat(record.mos_actual_shipping_fee || 0) - parseFloat(record.mos_shipping_fee || 0));
94
+ let shipping_discount = Math.abs(parseFloat(record.mos_actual_shipping_fee || record.iv_actual_shipping_fee || 0) -
95
+ parseFloat(record.mos_shipping_fee || record.iv_shipping_fee || 0));
95
96
  const data = {
96
97
  order_no: record.rg_name,
97
98
  ref_no: record.rg_ref_no,
@@ -139,19 +140,19 @@ async function renderInvoices({ req, timezoneOffSet }, context) {
139
140
  .join(' '),
140
141
  fulfillment_center: record.fc_name,
141
142
  voucher_amount: getRoundedValue(parseFloat(record.mo_voucher_amount || 0)),
142
- actual_shipping_fee: getRoundedValue(parseFloat(record.mos_shipping_fee || 0)),
143
+ actual_shipping_fee: getRoundedValue(parseFloat(record.mos_shipping_fee || record.iv_shipping_fee || 0)),
143
144
  shipping_discount: getRoundedValue(shipping_discount),
144
- seller_voucher_amount: getRoundedValue(parseFloat(record.mo_seller_voucher_amount || 0)),
145
- platform_voucher_amount: getRoundedValue(parseFloat(record.mo_platform_voucher_amount || 0)),
146
- seller_discount: getRoundedValue(parseFloat(record.mo_seller_discount || 0)),
147
- platform_coins: getRoundedValue(parseFloat(record.mo_platform_coins || 0)),
145
+ seller_voucher_amount: getRoundedValue(parseFloat(record.mo_seller_voucher_amount || record.iv_seller_voucher_amount || 0)),
146
+ platform_voucher_amount: getRoundedValue(parseFloat(record.mo_platform_voucher_amount || record.iv_platform_voucher_amount || 0)),
147
+ seller_discount: getRoundedValue(parseFloat(record.mo_seller_discount || record.iv_seller_discount || 0)),
148
+ platform_coins: getRoundedValue(parseFloat(record.mo_platform_coins || record.iv_platform_coins || 0)),
148
149
  sub_total: sumProductTotalPaidPrice,
149
150
  grand_total: getRoundedValue(sumProductTotalPaidPrice -
150
- parseFloat(record.mo_seller_voucher_amount || 0) -
151
- parseFloat(record.mo_platform_voucher_amount || 0) -
152
- parseFloat(record.mo_seller_discount || 0) -
153
- parseFloat(record.mo_platform_coins || 0) +
154
- parseFloat(record.mos_shipping_fee || 0) -
151
+ parseFloat(record.mo_seller_voucher_amount || record.iv_seller_voucher_amount || 0) -
152
+ parseFloat(record.mo_platform_voucher_amount || record.mo_platform_voucher_amount || 0) -
153
+ parseFloat(record.mo_seller_discount || record.mo_seller_discount || 0) -
154
+ parseFloat(record.mo_platform_coins || record.mo_platform_coins || 0) +
155
+ parseFloat(record.mos_shipping_fee || record.iv_shipping_fee || 0) -
155
156
  shipping_discount || 0),
156
157
  product_list
157
158
  };
@@ -1 +1 @@
1
- {"version":3,"file":"render-invoices.js","sourceRoot":"","sources":["../../server/controllers/render-invoices.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-invoices.js","sourceRoot":"","sources":["../../server/controllers/render-invoices.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "4.3.578",
3
+ "version": "4.3.580",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -36,7 +36,7 @@
36
36
  "@things-factory/integration-sftp": "^4.3.563",
37
37
  "@things-factory/marketplace-base": "^4.3.563",
38
38
  "@things-factory/notification": "^4.3.563",
39
- "@things-factory/sales-base": "^4.3.577",
39
+ "@things-factory/sales-base": "^4.3.580",
40
40
  "@things-factory/setting-base": "^4.3.563",
41
41
  "@things-factory/shell": "^4.3.535",
42
42
  "@things-factory/transport-base": "^4.3.563",
@@ -45,5 +45,5 @@
45
45
  "puppeteer": "21.0.3",
46
46
  "uuid": "^9.0.0"
47
47
  },
48
- "gitHead": "f746ab64ad59419c75be48d2604c78213cfcf45b"
48
+ "gitHead": "ffa0fa6e0a7f1c959932c4adeeab65bd84fc6c85"
49
49
  }
@@ -110,7 +110,8 @@ export async function renderInvoices({ req, timezoneOffSet }, context: any) {
110
110
 
111
111
  let date = DateTimeConverter.date(new Date((record.iv_issued_on || record.iv_created_at) - timezoneOffSet))
112
112
  let shipping_discount = Math.abs(
113
- parseFloat(record.mos_actual_shipping_fee || 0) - parseFloat(record.mos_shipping_fee || 0)
113
+ parseFloat(record.mos_actual_shipping_fee || record.iv_actual_shipping_fee || 0) -
114
+ parseFloat(record.mos_shipping_fee || record.iv_shipping_fee || 0)
114
115
  )
115
116
  const data = {
116
117
  order_no: record.rg_name,
@@ -161,20 +162,24 @@ export async function renderInvoices({ req, timezoneOffSet }, context: any) {
161
162
  .join(' '),
162
163
  fulfillment_center: record.fc_name,
163
164
  voucher_amount: getRoundedValue(parseFloat(record.mo_voucher_amount || 0)),
164
- actual_shipping_fee: getRoundedValue(parseFloat(record.mos_shipping_fee || 0)),
165
+ actual_shipping_fee: getRoundedValue(parseFloat(record.mos_shipping_fee || record.iv_shipping_fee || 0)),
165
166
  shipping_discount: getRoundedValue(shipping_discount),
166
- seller_voucher_amount: getRoundedValue(parseFloat(record.mo_seller_voucher_amount || 0)),
167
- platform_voucher_amount: getRoundedValue(parseFloat(record.mo_platform_voucher_amount || 0)),
168
- seller_discount: getRoundedValue(parseFloat(record.mo_seller_discount || 0)),
169
- platform_coins: getRoundedValue(parseFloat(record.mo_platform_coins || 0)),
167
+ seller_voucher_amount: getRoundedValue(
168
+ parseFloat(record.mo_seller_voucher_amount || record.iv_seller_voucher_amount || 0)
169
+ ),
170
+ platform_voucher_amount: getRoundedValue(
171
+ parseFloat(record.mo_platform_voucher_amount || record.iv_platform_voucher_amount || 0)
172
+ ),
173
+ seller_discount: getRoundedValue(parseFloat(record.mo_seller_discount || record.iv_seller_discount || 0)),
174
+ platform_coins: getRoundedValue(parseFloat(record.mo_platform_coins || record.iv_platform_coins || 0)),
170
175
  sub_total: sumProductTotalPaidPrice,
171
176
  grand_total: getRoundedValue(
172
177
  sumProductTotalPaidPrice -
173
- parseFloat(record.mo_seller_voucher_amount || 0) -
174
- parseFloat(record.mo_platform_voucher_amount || 0) -
175
- parseFloat(record.mo_seller_discount || 0) -
176
- parseFloat(record.mo_platform_coins || 0) +
177
- parseFloat(record.mos_shipping_fee || 0) -
178
+ parseFloat(record.mo_seller_voucher_amount || record.iv_seller_voucher_amount || 0) -
179
+ parseFloat(record.mo_platform_voucher_amount || record.mo_platform_voucher_amount || 0) -
180
+ parseFloat(record.mo_seller_discount || record.mo_seller_discount || 0) -
181
+ parseFloat(record.mo_platform_coins || record.mo_platform_coins || 0) +
182
+ parseFloat(record.mos_shipping_fee || record.iv_shipping_fee || 0) -
178
183
  shipping_discount || 0
179
184
  ),
180
185
  product_list