rerobe-js-orm 4.5.8 → 4.5.9

package/lib/factories/Order/OrderFromShopifyWebhook.js

@@ -5,6 +5,11 @@ const Order_1 = require("../../models/Order");
 const OrderHelpers_1 = require("../../helpers/OrderHelpers");
 const order_constants_1 = require("../../constants/order-constants");
 const orderHelpers = new OrderHelpers_1.default();
+// Helper: build MoneyBag with defaults; if presentment missing, copy from shop, and vice versa
+const buildMoneyBagFromAmount = (amount, currency) => ({
+    shopMoney: { amount: amount !== undefined ? amount : 0, currencyCode: currency || '' },
+    presentmentMoney: { amount: amount !== undefined ? amount : 0, currencyCode: currency || '' },
+});
 const fulfillmentStatusRestMapping = {
     fulfilled: 'FULFILLED',
     null: '',
@@ -327,7 +332,7 @@ class OrderFromShopifyWebhook extends OrderFactory_1.default {
         const taxLinesV2 = tax_lines.map((item) => ({
             rate: item.rate,
             title: item.title,
-            priceSet: { amount: item.price, currencyCode: currency || '' },
+            priceSet: buildMoneyBagFromAmount(item.price, currency || ''),
         }));
         const shippingLine = shipping_lines && shipping_lines.length
             ? {
@@ -438,10 +443,7 @@ class OrderFromShopifyWebhook extends OrderFactory_1.default {
         const taxLinesV3 = (tax_lines || []).map((item) => ({
             rate: item.rate,
             title: item.title,
-            priceSet: {
-                shopMoney: { amount: item.price, currencyCode: currency || '' },
-                presentmentMoney: { amount: item.price, currencyCode: currency || '' },
-            },
+            priceSet: buildMoneyBagFromAmount(item.price, currency || ''),
         }));
         const shippingLine = shipping_lines && shipping_lines.length
             ? {

package/lib/models/Order.js

@@ -99,33 +99,46 @@ class Order extends Base_1.default {
         this.customerName = (props === null || props === void 0 ? void 0 : props.customerName) || '';
         this.merchantId = (props === null || props === void 0 ? void 0 : props.merchantId) || '';
         this.refunds = (props === null || props === void 0 ? void 0 : props.refunds) || [];
-        this.subtotalPricePresentment = (props === null || props === void 0 ? void 0 : props.subtotalPricePresentment) || {
-            amount: 0,
-        };
-        this.totalDiscountPresentment = (props === null || props === void 0 ? void 0 : props.totalDiscountPresentment) || {
-            amount: 0,
-        };
-        this.totalPricePresentment = (props === null || props === void 0 ? void 0 : props.totalPricePresentment) || {
-            amount: 0,
-        };
-        this.totalRefundedPresentment = (props === null || props === void 0 ? void 0 : props.totalRefundedPresentment) || {
-            amount: 0,
-        };
-        this.totalShippingPricePresentment = (props === null || props === void 0 ? void 0 : props.totalShippingPricePresentment) || {
-            amount: 0,
-        };
-        this.totalTaxPresentment = (props === null || props === void 0 ? void 0 : props.totalTaxPresentment) || {
-            amount: 0,
-        };
-        this.creditDiscountPresentment = (props === null || props === void 0 ? void 0 : props.creditDiscountPresentment) || {
-            amount: 0,
-        };
-        this.saleDiscountPresentment = (props === null || props === void 0 ? void 0 : props.saleDiscountPresentment) || {
-            amount: 0,
-        };
-        this.additionalDiscountPresentment = (props === null || props === void 0 ? void 0 : props.additionalDiscountPresentment) || {
-            amount: 0,
+        const defaultPresentmentFrom = (present, base) => {
+            const coerceAmount = (val) => {
+                const num = Number(val);
+                if (!Number.isFinite(num))
+                    return NaN;
+                const rounded = Math.round((num + Number.EPSILON) * 100) / 100;
+                return Number(rounded.toFixed(2));
+            };
+            // Try presentment first
+            if (present && typeof present === 'object' && 'amount' in present) {
+                const amt = coerceAmount(present.amount);
+                if (!Number.isNaN(amt)) {
+                    return {
+                        amount: amt,
+                        currencyCode: present.currencyCode || (base === null || base === void 0 ? void 0 : base.currencyCode) || this.currencyCode || '',
+                    };
+                }
+            }
+            // Fallback to base
+            if (base && typeof base === 'object' && 'amount' in base) {
+                const amt = coerceAmount(base.amount);
+                if (!Number.isNaN(amt)) {
+                    return {
+                        amount: amt,
+                        currencyCode: base.currencyCode || this.currencyCode || '',
+                    };
+                }
+            }
+            // Final default
+            return { amount: 0, currencyCode: this.currencyCode || '' };
         };
+        this.subtotalPricePresentment = defaultPresentmentFrom(props === null || props === void 0 ? void 0 : props.subtotalPricePresentment, this.subtotalPrice);
+        this.totalDiscountPresentment = defaultPresentmentFrom(props === null || props === void 0 ? void 0 : props.totalDiscountPresentment, this.totalDiscount);
+        this.totalPricePresentment = defaultPresentmentFrom(props === null || props === void 0 ? void 0 : props.totalPricePresentment, this.totalPrice);
+        this.totalRefundedPresentment = defaultPresentmentFrom(props === null || props === void 0 ? void 0 : props.totalRefundedPresentment, this.totalRefunded);
+        this.totalShippingPricePresentment = defaultPresentmentFrom(props === null || props === void 0 ? void 0 : props.totalShippingPricePresentment, this.totalShippingPrice);
+        this.totalTaxPresentment = defaultPresentmentFrom(props === null || props === void 0 ? void 0 : props.totalTaxPresentment, this.totalTax);
+        this.creditDiscountPresentment = defaultPresentmentFrom(props === null || props === void 0 ? void 0 : props.creditDiscountPresentment, this.creditDiscount);
+        this.saleDiscountPresentment = defaultPresentmentFrom(props === null || props === void 0 ? void 0 : props.saleDiscountPresentment, this.saleDiscount);
+        this.additionalDiscountPresentment = defaultPresentmentFrom(props === null || props === void 0 ? void 0 : props.additionalDiscountPresentment, this.additionalDiscount);
         this.createdAtTimestamp = (props === null || props === void 0 ? void 0 : props.createdAtTimestamp) || 0;
         this.updatedAtTimestamp = (props === null || props === void 0 ? void 0 : props.updatedAtTimestamp) || 0;
         this.adjustments = (props === null || props === void 0 ? void 0 : props.adjustments) || [];

package/lib/models/Product.d.ts

@@ -12,8 +12,6 @@ export default class Product extends Base {
     toProductInputObjForShopify(location?: string): any;
     toProductInputObjForShopifyV2(locationId: string, weightUnit?: string): any[];
     toProductInputObjForShopifyV3(locationId: string, weightUnit?: string): {
-        title: string;
-        status: string;
         productOptions: {
             name: string;
             values: {
@@ -21,14 +19,14 @@ export default class Product extends Base {
             }[];
         }[];
         descriptionHtml: string;
-        productType: string;
-        vendor: string;
         tags: (string | null)[];
         files: {
             originalSource: string;
             contentType: string;
         }[];
         variants: any[];
+        status?: string | undefined;
+        title: string;
     };
     toObjForTextTranslation(): TranslatableAttributes;
     toObjForTypesense(isCanonicalMerchant?: boolean): TypesenseProductObj;

package/lib/models/Product.js

@@ -333,6 +333,9 @@ class Product extends Base_1.default {
         const variantsFromInventory = Array.isArray(this.attributes.variantInventory)
             ? this.attributes.variantInventory
             : [];
+        const hasShopifyId = !!this.attributes.shopifyId;
+        const currentStatus = String(this.consignmentAttributes.status || '').toUpperCase();
+        const statusToInclude = !hasShopifyId || currentStatus.includes('SOLD') ? 'DRAFT' : undefined;
         if (variantsFromInventory.length === 0) {
             // Fallback: single-variant product (legacy behavior)
             const variant = Object.assign(Object.assign({ id: '' }, baseVariantFields()), { inventoryQuantities: [
@@ -351,17 +354,8 @@ class Product extends Base_1.default {
                 variant.price = this.consignmentAttributes.salePrice;
                 variant.compareAtPrice = this.attributes.price || variant.compareAtPrice;
             }
-            return {
-                title,
-                status: 'DRAFT',
-                productOptions: [{ name: 'Variant', values: [{ name: title }] }],
-                descriptionHtml: this.attributes.description,
-                productType: this.filterAttributes.productType,
-                vendor: this.attributes.vendorId,
-                tags,
-                files,
-                variants: [variant],
-            };
+            return Object.assign(Object.assign({ title }, (statusToInclude ? { status: statusToInclude } : {})), { productOptions: [{ name: 'Variant', values: [{ name: title }] }], descriptionHtml: this.attributes.description, tags,
+                files, variants: [variant] });
         }
         // Multi-variant: derive axes and values from variantInventory
         const axisOrder = [];
@@ -437,17 +431,9 @@ class Product extends Base_1.default {
             }
             return variant;
         });
-        return {
-            title,
-            status: 'DRAFT',
-            productOptions,
-            descriptionHtml: this.attributes.description,
-            productType: this.filterAttributes.productType,
-            vendor: this.attributes.vendorId,
-            tags,
+        return Object.assign(Object.assign({ title }, (statusToInclude ? { status: statusToInclude } : {})), { productOptions, descriptionHtml: this.attributes.description, tags,
             files,
-            variants,
-        };
+            variants });
     }
     toObjForTextTranslation() {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rerobe-js-orm",
-  "version": "4.5.8",
+  "version": "4.5.9",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",