rerobe-js-orm 4.5.1 → 4.5.3

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/lib/form-states/Product/ProductFormState.d.ts

@@ -95,6 +95,28 @@ export default class ProductFormState extends FormState {
         }[];
         toRemove: string[];
     };
+    getVariantIds(): string[];
+    getVariantRows(): VariantInventory[];
+    bulkEditVariantFields(patch: Partial<VariantInventory>, selector?: {
+        ids?: string[];
+        predicate?: (v: VariantInventory) => boolean;
+    }): void;
+    bulkEditVariantLocationAmount(location: {
+        id: string;
+        name: string;
+    }, amount: number, options?: {
+        ids?: string[];
+        predicate?: (v: VariantInventory) => boolean;
+        mode?: 'set' | 'increment';
+        field?: 'availableAmount' | 'incomingAmount';
+    }): void;
+    bulkEditVariantSkus(updates: {
+        id?: string;
+        options?: {
+            [k: string]: string;
+        };
+        sku: string;
+    }[]): void;
     private aggregateInventoryLocationsFromVariants;
     private fieldFactory;
 }

package/lib/form-states/Product/ProductFormState.js

@@ -837,6 +837,128 @@ class ProductFormState extends FormState_1.default {
         const toRemove = curRows.filter((r) => !nextKeySet.has(JSON.stringify(r.options || {}))).map((r) => r.id);
         return { toAdd, toRemove };
     }
+    // UI: expose variant ids and rows
+    getVariantIds() {
+        return this.fields.variantInventory.selectedValues.map((v) => v.id);
+    }
+    getVariantRows() {
+        return this.fields.variantInventory.selectedValues.slice();
+    }
+    // Bulk edit user-mutable variant fields (excludes inventory locations and options/id)
+    bulkEditVariantFields(patch, selector) {
+        const allowedKeys = [
+            'price',
+            'compareAtPrice',
+            'salePrice',
+            'isOnSale',
+            'sku',
+            'taxable',
+            'costPerItem',
+            'continueSellingWhenOutOfStock',
+        ];
+        const rows = this.fields.variantInventory.selectedValues;
+        const shouldEdit = (v) => {
+            if ((selector === null || selector === void 0 ? void 0 : selector.ids) && selector.ids.length)
+                return selector.ids.includes(v.id);
+            if (selector === null || selector === void 0 ? void 0 : selector.predicate)
+                return !!selector.predicate(v);
+            return true; // default: all
+        };
+        rows.forEach((v, idx) => {
+            if (!shouldEdit(v))
+                return;
+            const next = Object.assign({}, v);
+            allowedKeys.forEach((k) => {
+                if (patch[k] !== undefined)
+                    next[k] = patch[k];
+            });
+            this.fields.variantInventory.selectedValues[idx] = next;
+        });
+        // Recompute aggregates (locations unchanged, so totals stay the same but we keep logic consistent)
+        const totalQty = this.fields.variantInventory.selectedValues.reduce((acc, cur) => {
+            const locs = cur.locations;
+            const sum = Array.isArray(locs) ? locs.reduce((a, l) => a + (Number(l === null || l === void 0 ? void 0 : l.availableAmount) || 0), 0) : 0;
+            return acc + sum;
+        }, 0);
+        this.fields.quantity.inputValue = totalQty;
+        this.fields.availableForSale.selectedValue = totalQty > 0;
+        this.aggregateInventoryLocationsFromVariants();
+    }
+    // Bulk edit inventory amount for a specific location across selected variants
+    // mode: 'set' (default) to overwrite, 'increment' to add delta
+    bulkEditVariantLocationAmount(location, amount, options) {
+        const rows = this.fields.variantInventory.selectedValues;
+        const shouldEdit = (v) => {
+            if ((options === null || options === void 0 ? void 0 : options.ids) && options.ids.length)
+                return options.ids.includes(v.id);
+            if (options === null || options === void 0 ? void 0 : options.predicate)
+                return !!options.predicate(v);
+            return true; // default all
+        };
+        const mode = (options === null || options === void 0 ? void 0 : options.mode) || 'set';
+        const targetField = (options === null || options === void 0 ? void 0 : options.field) || 'availableAmount';
+        rows.forEach((v, idx) => {
+            if (!shouldEdit(v))
+                return;
+            const locs = (v.locations || []);
+            const existingIdx = locs.findIndex((l) => l && l.id === location.id);
+            if (existingIdx !== -1) {
+                const current = locs[existingIdx];
+                const nextVal = mode === 'increment' ? Number(current[targetField] || 0) + Number(amount) : Number(amount);
+                const updated = Object.assign(Object.assign({}, current), { [targetField]: nextVal });
+                locs.splice(existingIdx, 1, updated);
+            }
+            else {
+                const base = {
+                    id: location.id,
+                    name: location.name,
+                    availableAmount: 0,
+                    incomingAmount: 0,
+                };
+                base[targetField] = mode === 'increment' ? Number(amount) : Number(amount);
+                locs.push(base);
+            }
+            this.fields.variantInventory.selectedValues[idx] = Object.assign(Object.assign({}, v), { locations: locs });
+        });
+        // Recompute aggregates
+        const totalQty = this.fields.variantInventory.selectedValues.reduce((acc, cur) => {
+            const locs = cur.locations;
+            const sum = Array.isArray(locs) ? locs.reduce((a, l) => a + (Number(l === null || l === void 0 ? void 0 : l.availableAmount) || 0), 0) : 0;
+            return acc + sum;
+        }, 0);
+        this.fields.quantity.inputValue = totalQty;
+        this.fields.availableForSale.selectedValue = totalQty > 0;
+        this.aggregateInventoryLocationsFromVariants();
+    }
+    // Bulk edit SKUs per selected variant individually
+    bulkEditVariantSkus(updates) {
+        if (!Array.isArray(updates) || !updates.length)
+            return;
+        const rows = this.fields.variantInventory.selectedValues;
+        const indexById = {};
+        rows.forEach((v, i) => (indexById[v.id] = i));
+        updates.forEach((u) => {
+            let idx = -1;
+            if (u.id && indexById[u.id] !== undefined) {
+                idx = indexById[u.id];
+            }
+            else if (u.options) {
+                idx = rows.findIndex((v) => this.isSameOptions(v.options, u.options));
+            }
+            if (idx !== -1) {
+                const cur = rows[idx] || {};
+                this.fields.variantInventory.selectedValues[idx] = Object.assign(Object.assign({}, cur), { sku: u.sku });
+            }
+        });
+        // Aggregates unchanged but keep consistent calc
+        const totalQty = this.fields.variantInventory.selectedValues.reduce((acc, cur) => {
+            const locs = cur.locations;
+            const sum = Array.isArray(locs) ? locs.reduce((a, l) => a + (Number(l === null || l === void 0 ? void 0 : l.availableAmount) || 0), 0) : 0;
+            return acc + sum;
+        }, 0);
+        this.fields.quantity.inputValue = totalQty;
+        this.fields.availableForSale.selectedValue = totalQty > 0;
+    }
     aggregateInventoryLocationsFromVariants() {
         var _a;
         const variants = ((_a = this.fields.variantInventory) === null || _a === void 0 ? void 0 : _a.selectedValues) || [];

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

@@ -163,6 +163,9 @@ type VariantInventory = {
     isOnSale?: 'yes' | 'no';
     sku?: string;
     taxable?: 'yes' | 'no';
+    shopifyId?: string;
+    costPerItem?: string;
+    continueSellingWhenOutOfStock?: boolean;
 };
 type ProductSellStatusKeys = 'SELL_REQUEST_REVIEW' | 'REJECTED' | 'HOLD' | 'ACCEPTED' | 'DROP_OFF_AT_REROBE' | 'SHIP_TO_REROBE' | 'AT_HOME_PICK_UP' | 'QUALITY_CONTROL' | 'LISTED' | 'SOLD' | 'RETURNED' | 'SOLD_SELLER_TO_BE_PAID' | 'SOLD_SELLER_PAID' | 'HIDDEN' | 'BOOKED' | 'OPEN';
 type ProductPublishKeys = 'USER_PUBLISHED' | 'MERCHANT_PUBLISHED';

package/package.json

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