rerobe-js-orm 4.5.1 → 4.5.2

package/lib/factories/Order/OrderFromShopifyWebhook.d.ts

@@ -1,4 +1,5 @@
 import OrderFactory from './OrderFactory';
 export default class OrderFromShopifyWebhook extends OrderFactory {
     createOrder(order: ShopifyRestApiOrderObj): ReRobeOrderObj;
+    createOrderV2(order: any): ReRobeOrderObj;
 }

package/lib/factories/Order/OrderFromShopifyWebhook.js

@@ -277,5 +277,112 @@ class OrderFromShopifyWebhook extends OrderFactory_1.default {
             shippingLine, state: Order_1.default.ORDER_STATES.completed, shippingType: orderHelpers.getShippingTypeFromShopifyObj(shipping_lines), paymentType: orderHelpers.getPaymentTypeUsingTags(tags), salesChannel: orderHelpers.getSalesChannelUsingTags(tags), tags: tags ? tags.split(', ') : [] }));
         return rerobeOrder.toObj();
     }
+    // Aligned with Shopify REST order payload that includes current_* fields
+    createOrderV2(order) {
+        const { id, name, financial_status, fulfillment_status, cancel_reason, created_at, processed_at, updated_at, currency, contact_email, email, 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 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)
+            : { amount: 0, currencyCode: currency || '' };
+        const shippingAddress = shipping_address
+            ? {
+                address1: shipping_address.address1,
+                address2: shipping_address.address2,
+                city: shipping_address.city,
+                country: shipping_address.country,
+                countryCode: shipping_address.country_code,
+                province: shipping_address.province,
+                zip: shipping_address.zip,
+            }
+            : null;
+        const lineItems = line_items.map((item) => ({
+            title: item.title,
+            quantity: item.quantity,
+            variant: {
+                id: item.variant_id ? `gid://shopify/ProductVariant/${item.variant_id}` : '',
+                title: item.variant_title || '',
+                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),
+        }));
+        const discountApplications = discount_applications.map((item) => ({
+            allocationMethod: item.allocation_method ? String(item.allocation_method).toUpperCase() : '',
+            targetSelection: item.target_selection ? String(item.target_selection).toUpperCase() : '',
+            targetType: item.target_type ? String(item.target_type).toUpperCase() : '',
+            value: { amount: item.value },
+        }));
+        const taxLinesV2 = tax_lines.map((item) => ({
+            rate: item.rate,
+            title: item.title,
+            priceSet: { amount: item.price, currencyCode: currency || '' },
+        }));
+        const shippingLine = shipping_lines && shipping_lines.length
+            ? {
+                id: '',
+                title: shipping_lines[0].title,
+                source: shipping_lines[0].source,
+                discountedPrice: moneyFromSet(shipping_lines[0].discounted_price_set),
+                originalPrice: moneyFromSet(shipping_lines[0].price_set),
+                taxLines: (shipping_lines[0].tax_lines || []).map((t) => ({
+                    rate: t.rate,
+                    title: t.title,
+                    priceSet: { amount: t.price, currencyCode: currency || '' },
+                })),
+            }
+            : {
+                id: '',
+                title: '',
+                taxLines: [],
+                discountAllocations: [],
+                discountedPrice: { amount: 0 },
+                originalPrice: { amount: 0 },
+                source: '',
+            };
+        // @ts-ignore
+        const fulfillmentStatus = !fulfillment_status ? '' : fulfillmentStatusRestMapping[fulfillment_status];
+        const rerobeOrder = new Order_1.default({
+            id: orderHelpers.getOrderIdFromShopifyObj(order),
+            shopifyId: `gid://shopify/Order/${id}`,
+            shopifyOrderNumber: name ? Number(String(name).replace('#', '')) : order_number || 0,
+            name: name || '',
+            currencyCode: currency || '',
+            email: contact_email || email || '',
+            financialStatus: financial_status ? String(financial_status).toUpperCase() : '',
+            fulfillmentStatus,
+            cancelReason: cancel_reason ? String(cancel_reason).toUpperCase() : '',
+            createdAt: created_at,
+            processedAt: processed_at,
+            updatedAt: updated_at,
+            canceledAt: cancelled_at,
+            closedAt: closed_at,
+            orderNumber: order_number || 0,
+            shippingAddress,
+            lineItems,
+            subtotalPrice,
+            totalPrice,
+            totalTax,
+            totalShippingPrice,
+            totalDiscount,
+            discountApplications,
+            shippingLine,
+            tags: tags ? String(tags).split(', ').filter(Boolean) : [],
+            state: Order_1.default.ORDER_STATES.completed,
+            shippingType: orderHelpers.getShippingTypeFromShopifyObj(shipping_lines),
+            paymentType: orderHelpers.getPaymentTypeUsingTags(tags),
+            salesChannel: orderHelpers.getSalesChannelUsingTags(tags),
+        });
+        return rerobeOrder.toObj();
+    }
 }
 exports.default = OrderFromShopifyWebhook;

package/package.json

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