rerobe-js-orm 4.7.3 → 4.7.5
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.
|
@@ -26,8 +26,8 @@ class OrderFromTraderaEmail {
|
|
|
26
26
|
const html = typeof emailHtml === 'string' ? emailHtml : String((emailHtml === null || emailHtml === void 0 ? void 0 : emailHtml.html) || emailHtml || '');
|
|
27
27
|
const normalized = this.normalizeEmailHtml(html);
|
|
28
28
|
const currencyCode = 'SEK';
|
|
29
|
-
// Extract
|
|
30
|
-
const
|
|
29
|
+
// Extract Tradera order number for traceability tag
|
|
30
|
+
const traderaOrderNumber = this.getMatch(/Order\s+number\s+(\d+)/i, normalized);
|
|
31
31
|
// Total amount and shipping (from email)
|
|
32
32
|
const totalAmountFromEmail = this.parseAmount(this.getMatch(/Total\s+amount:[\s\S]*?SEK\s*([0-9][0-9\s,.]*)/i, normalized));
|
|
33
33
|
// Shipping block parsing (from email)
|
|
@@ -62,6 +62,7 @@ class OrderFromTraderaEmail {
|
|
|
62
62
|
const order = new Order_1.default({
|
|
63
63
|
id: this.utilities.makeRandId(28),
|
|
64
64
|
documentId: this.utilities.makeRandId(28),
|
|
65
|
+
idempotencyKey: traderaOrderNumber ? `traderaOrderNumber:${traderaOrderNumber}` : '',
|
|
65
66
|
name: '',
|
|
66
67
|
currencyCode,
|
|
67
68
|
statusUrl,
|
|
@@ -83,7 +84,7 @@ class OrderFromTraderaEmail {
|
|
|
83
84
|
refunds: [],
|
|
84
85
|
totalRefunded: { amount: 0, currencyCode },
|
|
85
86
|
shippingLine,
|
|
86
|
-
tags: ['source:tradera',
|
|
87
|
+
tags: ['source:tradera', traderaOrderNumber ? `traderaOrderNumber:${traderaOrderNumber}` : null].filter(Boolean),
|
|
87
88
|
state: Order_1.default.ORDER_STATES.completed,
|
|
88
89
|
shippingType: order_constants_1.SHIPPING_TYPES.shipping,
|
|
89
90
|
paymentType: order_constants_1.PAYMENT_TYPES.traderaPayment,
|
package/lib/models/Order.js
CHANGED
|
@@ -462,7 +462,7 @@ class Order extends Base_1.default {
|
|
|
462
462
|
title: item.title,
|
|
463
463
|
originalUnitPriceWithCurrency: item.originalUnitPrice,
|
|
464
464
|
quantity: item.quantity,
|
|
465
|
-
weight: item.variant
|
|
465
|
+
weight: item.variant && item.variant.weight
|
|
466
466
|
? {
|
|
467
467
|
value: item.variant.weight,
|
|
468
468
|
unit: 'GRAMS',
|