rerobe-js-orm 4.6.1 → 4.6.3

package/lib/factories/Order/OrderFromShopifyWebhook.js

@@ -396,19 +396,21 @@ class OrderFromShopifyWebhook extends OrderFactory_1.default {
     }
     // Aligned with Shopify REST order payload that includes current_* fields and statusUrl
     createOrderV3(order) {
-        const { id, name, financial_status, fulfillment_status, cancel_reason, created_at, processed_at, updated_at, currency, contact_email, email, order_status_url, shipping_address, line_items = [], discount_applications = [], shipping_lines = [], tax_lines = [], tags = '', cancelled_at, closed_at, order_number, current_subtotal_price_set, current_total_price_set, current_total_tax_set, current_total_discounts_set, current_shipping_price_set, } = order || {};
+        const { id, name, financial_status, fulfillment_status, cancel_reason, created_at, processed_at, updated_at, currency, contact_email, email, order_status_url, shipping_address, line_items = [], discount_applications = [], shipping_lines = [], tax_lines = [], tags = '', cancelled_at, closed_at, order_number, 
+        // Prefer non-current fields; fall back to current_* when needed
+        subtotal_price_set, total_price_set, total_tax_set, total_discounts_set, shipping_price_set, current_subtotal_price_set, current_total_price_set, current_total_tax_set, current_total_discounts_set, current_shipping_price_set, } = order || {};
         const moneyFromSet = (setObj) => {
             const shop = setObj === null || setObj === void 0 ? void 0 : setObj.shop_money;
             return shop
                 ? { amount: shop.amount, currencyCode: shop.currency_code }
                 : { amount: 0, currencyCode: currency || '' };
         };
-        const subtotalPrice = moneyFromSet(current_subtotal_price_set);
-        const totalPrice = moneyFromSet(current_total_price_set);
-        const totalTax = moneyFromSet(current_total_tax_set);
-        const totalShippingPrice = moneyFromSet(current_shipping_price_set);
-        const totalDiscount = current_total_discounts_set
-            ? moneyFromSet(current_total_discounts_set)
+        const subtotalPrice = moneyFromSet(subtotal_price_set || current_subtotal_price_set);
+        const totalPrice = moneyFromSet(total_price_set || current_total_price_set);
+        const totalTax = moneyFromSet(total_tax_set || current_total_tax_set);
+        const totalShippingPrice = moneyFromSet(shipping_price_set || current_shipping_price_set);
+        const totalDiscount = total_discounts_set || current_total_discounts_set
+            ? moneyFromSet(total_discounts_set || current_total_discounts_set)
             : { amount: 0, currencyCode: currency || '' };
         const shippingAddress = shipping_address
             ? {
@@ -421,19 +423,58 @@ class OrderFromShopifyWebhook extends OrderFactory_1.default {
                 zip: shipping_address.zip,
             }
             : null;
-        const lineItems = (line_items || []).map((item) => ({
-            title: item.title,
-            quantity: item.quantity,
-            variant: {
-                id: '',
-                shopifyId: item.variant_id ? `gid://shopify/ProductVariant/${item.variant_id}` : '',
-                title: item.variant_title || '',
+        const lineItems = (line_items || []).map((item) => {
+            var _a, _b, _c, _d;
+            const quantityNum = Number(item.quantity || 1);
+            const unitShop = (_a = item.price_set) === null || _a === void 0 ? void 0 : _a.shop_money;
+            const unitPresent = (_b = item.price_set) === null || _b === void 0 ? void 0 : _b.presentment_money;
+            const discountShopTotal = (_c = item.total_discount_set) === null || _c === void 0 ? void 0 : _c.shop_money;
+            const discountPresentTotal = (_d = item.total_discount_set) === null || _d === void 0 ? void 0 : _d.presentment_money;
+            const taxLine = (item.tax_lines && item.tax_lines[0]) || undefined;
+            const toNum = (v) => Number(v || 0);
+            const perUnitDiscountShop = quantityNum > 0 ? toNum(discountShopTotal === null || discountShopTotal === void 0 ? void 0 : discountShopTotal.amount) / quantityNum : 0;
+            const perUnitDiscountPresent = quantityNum > 0 ? toNum(discountPresentTotal === null || discountPresentTotal === void 0 ? void 0 : discountPresentTotal.amount) / quantityNum : 0;
+            const originalUnitPrice = unitShop
+                ? { amount: unitShop.amount, currencyCode: unitShop.currency_code || currency || '' }
+                : { amount: 0, currencyCode: currency || '' };
+            const presentmentUnitPrice = unitPresent
+                ? { amount: unitPresent.amount, currencyCode: unitPresent.currency_code || currency || '' }
+                : { amount: 0, currencyCode: currency || '' };
+            const saleUnitAmount = (toNum(originalUnitPrice.amount) - perUnitDiscountShop).toFixed(2);
+            const presentmentSaleUnitAmount = (toNum(presentmentUnitPrice.amount) - perUnitDiscountPresent).toFixed(2);
+            const isOnSale = toNum(discountShopTotal === null || discountShopTotal === void 0 ? void 0 : discountShopTotal.amount) > 0 ? 'yes' : '';
+            const taxRate = taxLine ? Number(taxLine.rate || 0) : 0;
+            const presentmentTaxPrice = taxLine
+                ? { amount: String(taxLine.price || 0), currencyCode: presentmentUnitPrice.currencyCode }
+                : { amount: 0, currencyCode: presentmentUnitPrice.currencyCode };
+            return {
+                title: item.title,
+                quantity: quantityNum,
+                variant: {
+                    id: '',
+                    shopifyId: item.variant_id ? `gid://shopify/ProductVariant/${item.variant_id}` : '',
+                    title: item.variant_title || '',
+                    image: { id: '', originalSrc: '' },
+                },
                 image: { id: '', originalSrc: '' },
-            },
-            shopifyProductId: item.product_id ? `gid://shopify/Product/${item.product_id}` : null,
-            originalTotalPrice: moneyFromSet(item.price_set),
-            discountedTotalPrice: moneyFromSet(item.total_discount_set),
-        }));
+                brand: item.vendor || '',
+                shopifyProductId: item.product_id ? `gid://shopify/Product/${item.product_id}` : null,
+                originalTotalPrice: moneyFromSet(item.price_set),
+                discountedTotalPrice: moneyFromSet(item.total_discount_set),
+                // Fields used by web client
+                originalUnitPrice,
+                presentmentUnitPrice,
+                salePrice: saleUnitAmount,
+                presentmentSalePrice: {
+                    amount: presentmentSaleUnitAmount,
+                    currencyCode: presentmentUnitPrice.currencyCode,
+                },
+                isOnSale,
+                isTaxable: Boolean(item.taxable),
+                taxRate,
+                presentmentTaxPrice,
+            };
+        });
         const discountApplications = discount_applications.map((item) => ({
             allocationMethod: item.allocation_method ? String(item.allocation_method).toUpperCase() : '',
             targetSelection: item.target_selection ? String(item.target_selection).toUpperCase() : '',

package/lib/models/Order.d.ts

@@ -135,4 +135,5 @@ export default class Order extends Base {
         name: string;
     };
     toObjForTypesense(): TypesenseOrderObj;
+    toOrderInputObj(): any;
 }

package/lib/models/Order.js

@@ -430,6 +430,66 @@ class Order extends Base_1.default {
         };
         return stagedObj;
     }
+    toOrderInputObj() {
+        var _a, _b, _c, _d;
+        const toFixedPriceString = (val) => {
+            const num = Number(val || 0);
+            if (!Number.isFinite(num))
+                return '0.00';
+            return num.toFixed(2);
+        };
+        const lineItems = (this.lineItems || []).map((item) => {
+            var _a, _b;
+            return ({
+                quantity: Number(item.quantity || 1),
+                variantId: item.shopifyVariantId ||
+                    ((_a = item.variant) === null || _a === void 0 ? void 0 : _a.shopifyId) ||
+                    item.shopifyProductId ||
+                    ((_b = item.variant) === null || _b === void 0 ? void 0 : _b.id) ||
+                    '',
+            });
+        });
+        const tagsArray = Array.isArray(this.tags)
+            ? this.tags
+            : typeof this.tags === 'string' && this.tags
+                ? String(this.tags)
+                    .split(',')
+                    .map((t) => t.trim())
+                    .filter(Boolean)
+                : [];
+        const ribbnTag = 'source:ribbn';
+        if (!tagsArray.includes(ribbnTag)) {
+            tagsArray.push(ribbnTag);
+        }
+        const shippingAddress = this.shippingAddress
+            ? {
+                address1: this.shippingAddress.address1 || '',
+                address2: this.shippingAddress.address2 || '',
+                city: this.shippingAddress.city || '',
+                country: this.shippingAddress.country || this.shippingAddress.countryCode || '',
+                province: this.shippingAddress.province || '',
+                zip: this.shippingAddress.zip || '',
+            }
+            : undefined;
+        const shippingLine = this.shippingLine
+            ? {
+                title: this.shippingLine.title || 'Shipping fee',
+                price: toFixedPriceString((_d = (_b = (_a = this.shippingLine.originalPrice) === null || _a === void 0 ? void 0 : _a.amount) !== null && _b !== void 0 ? _b : (_c = this.totalShippingPrice) === null || _c === void 0 ? void 0 : _c.amount) !== null && _d !== void 0 ? _d : 0),
+            }
+            : undefined;
+        const orderInput = {
+            email: this.email || undefined,
+            phone: this.phone || undefined,
+            note: this.notes || undefined,
+            tags: tagsArray,
+            lineItems,
+            shippingAddress,
+            shippingLine,
+        };
+        // Remove undefined props to match GraphQL input expectations
+        Object.keys(orderInput).forEach((k) => orderInput[k] === undefined && delete orderInput[k]);
+        return orderInput;
+    }
 }
 Order.SHIPPING_TYPES = order_constants_1.SHIPPING_TYPES;
 Order.PAYMENT_TYPES = order_constants_1.PAYMENT_TYPES;

package/lib/models/Product.js

@@ -383,7 +383,7 @@ class Product extends Base_1.default {
             values: Array.from(axisValuesMap[axis] || new Set()).map((name) => ({ name })),
         }));
         const variants = variantsFromInventory.map((v) => {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e;
             const optionValues = limitedAxes.map((axis) => ({
                 optionName: axis,
                 name: String(v.options[axis] || ''),
@@ -431,9 +431,9 @@ class Product extends Base_1.default {
             variant.compareAtPrice = ((_c = v.compareAtPrice) !== null && _c !== void 0 ? _c : basePrice);
             const onSale = ((_d = v.isOnSale) !== null && _d !== void 0 ? _d : this.consignmentAttributes.isOnSale);
             const salePrice = ((_e = v.salePrice) !== null && _e !== void 0 ? _e : this.consignmentAttributes.salePrice);
-            if (salePrice && Boolean(this.timestampAttributes.clearanceTimestamp) && onSale === 'yes') {
+            if (salePrice && onSale === 'yes') {
                 variant.price = salePrice;
-                variant.compareAtPrice = ((_g = (_f = v.compareAtPrice) !== null && _f !== void 0 ? _f : this.attributes.price) !== null && _g !== void 0 ? _g : basePrice);
+                variant.compareAtPrice = basePrice;
             }
             return variant;
         });

package/lib/types/rerobe-order-types.d.ts

@@ -1740,18 +1740,29 @@ type ShopifyOrdersCreateRefund = {
     refund_line_items: ShopifyOrdersCreateRefundLineItem[];
 };
 type GadgetRefundLineItem = {
-    line_item?: {
-        price?: string | number;
-        product_id?: string | number;
-    };
+    id?: string | number;
+    line_item_id?: string | number;
     quantity: number;
     location_id?: string | number | null;
+    restock_type?: string;
     subtotal?: string | number;
+    subtotal_set?: MoneyBagRest;
+    total_tax?: string | number;
+    total_tax_set?: MoneyBagRest;
+    line_item?: GadgetLineItem & {
+        id?: string | number;
+        admin_graphql_api_id?: string;
+    };
 };
 type GadgetRefund = {
     id: string | number;
     created_at?: string;
+    processed_at?: string;
     note?: string;
+    order_id?: string | number;
+    user_id?: string | number;
+    restock?: boolean;
+    total_duties_set?: MoneyBagRest;
     order_adjustments: any[];
     transactions: any[];
     refund_line_items: GadgetRefundLineItem[];
@@ -1760,10 +1771,30 @@ type GadgetLineItem = {
     title: string;
     quantity: number;
     variant_id?: string | number | null;
-    variant_title?: string;
+    variant_title?: string | null;
     product_id?: string | number | null;
     price_set?: MoneyBagRest;
     total_discount_set?: MoneyBagRest;
+    id?: string | number;
+    admin_graphql_api_id?: string;
+    current_quantity?: number;
+    fulfillable_quantity?: number;
+    fulfillment_service?: string | null;
+    fulfillment_status?: string | null;
+    gift_card?: boolean;
+    grams?: number;
+    name?: string;
+    price?: number | string;
+    product_exists?: boolean;
+    requires_shipping?: boolean;
+    sales_line_item_group_id?: number | string | null;
+    sku?: string | null;
+    taxable?: boolean;
+    total_discount?: number | string;
+    variant_inventory_management?: string | null;
+    vendor?: string;
+    discount_allocations?: DiscountAllocationRest[];
+    tax_lines?: TaxLineRest[];
 };
 type GadgetTaxLine = {
     price: string | number;
@@ -1772,12 +1803,19 @@ type GadgetTaxLine = {
 };
 type GadgetFulfillment = {
     id: string | number;
+    admin_graphql_api_id?: string;
     created_at: string;
     updated_at?: string;
     name: string;
-    status?: string;
-    tracking_company?: string;
+    location_id?: string | number;
+    order_id?: string | number;
+    service?: string | null;
+    shipment_status?: string | null;
+    status?: string | null;
+    tracking_company?: string | null;
+    tracking_number?: string | number | null;
     tracking_numbers?: (string | number)[];
+    tracking_url?: string | null;
     tracking_urls?: string[];
     line_items?: GadgetLineItem[];
 };

package/package.json

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