rerobe-js-orm 4.6.7 → 4.6.9

package/lib/models/Product.d.ts

@@ -11,7 +11,7 @@ export default class Product extends Base {
     toObj(): CompleteProduct;
     toProductInputObjForShopify(location?: string): any;
     toProductInputObjForShopifyV2(locationId: string, weightUnit?: string): any[];
-    toProductInputObjForShopifyV3(locationId: string, weightUnit?: string): {
+    toProductInputObjForShopifyV3(locationId: string, weightUnit?: string, taxRate?: number): {
         productOptions: {
             name: string;
             values: {

package/lib/models/Product.js

@@ -295,7 +295,7 @@ class Product extends Base_1.default {
         }
         return [productInputObj];
     }
-    toProductInputObjForShopifyV3(locationId, weightUnit) {
+    toProductInputObjForShopifyV3(locationId, weightUnit, taxRate) {
         var _a;
         const title = this.attributes.title || `Ribbn Product ${this.attributes.handle || this.filterAttributes.documentId}`;
         const inInventoryStatuses = [
@@ -324,6 +324,14 @@ class Product extends Base_1.default {
             compareAtPrice: this.attributes.price || '0',
             taxable: this.attributes.isTaxable === 'yes' ? true : false,
         });
+        const applyTaxIfNeeded = (price, taxable) => {
+            const rate = typeof taxRate === 'number' && taxRate > 0 ? taxRate : 0;
+            const base = Number(price || 0);
+            if (!taxable || !rate)
+                return String(price !== null && price !== void 0 ? price : '0');
+            const adjusted = Number((base * (1 + rate)).toFixed(2));
+            return String(adjusted);
+        };
         const passedTags = ((_a = this.filterAttributes.tags) === null || _a === void 0 ? void 0 : _a.length) ? this.filterAttributes.tags : [];
         const tags = [
             this.filterAttributes.documentId ? `ribbnId:${this.filterAttributes.documentId}` : null,
@@ -365,6 +373,9 @@ class Product extends Base_1.default {
                 variant.price = this.consignmentAttributes.salePrice;
                 variant.compareAtPrice = this.attributes.price || variant.compareAtPrice;
             }
+            // Apply tax to price and compareAtPrice if taxable
+            variant.price = applyTaxIfNeeded(variant.price, Boolean(variant.taxable));
+            variant.compareAtPrice = applyTaxIfNeeded(variant.compareAtPrice, Boolean(variant.taxable));
             return Object.assign(Object.assign({ title }, (statusToInclude ? { status: statusToInclude } : {})), { productOptions: [{ name: 'Variant', values: [{ name: title }] }], descriptionHtml: this.attributes.description, vendor: this.filterAttributes.brand, tags,
                 files, variants: [variant] });
         }
@@ -440,6 +451,9 @@ class Product extends Base_1.default {
                 variant.price = salePrice;
                 variant.compareAtPrice = basePrice;
             }
+            // Apply tax to price and compareAtPrice if taxable
+            variant.price = applyTaxIfNeeded(variant.price, Boolean(variant.taxable));
+            variant.compareAtPrice = applyTaxIfNeeded(variant.compareAtPrice, Boolean(variant.taxable));
             return variant;
         });
         return Object.assign(Object.assign({ title }, (statusToInclude ? { status: statusToInclude } : {})), { productOptions, descriptionHtml: this.attributes.description, vendor: this.filterAttributes.brand, tags,
@@ -580,18 +594,8 @@ class Product extends Base_1.default {
             stockTakeFirstTimestamp: null,
         };
         const stockDerivations = this.deriveStockTimestampsFromSystemTags();
-        stagedObj.stockStatusTimestamp = this.utilities.sanitizeMillisTimeStamp(stockDerivations.stockStatusTimestamp);
-        // Derive stockStatus string from timestamps (no mutation performed inside derive)
-        if (stagedObj.stockStatusTimestamp &&
-            stagedObj.stockStatusTimestamp === stockDerivations.stockTakeLatestTimestamp) {
-            stagedObj.stockStatus = 'In stock';
-        }
-        else if (stagedObj.stockStatusTimestamp) {
-            stagedObj.stockStatus = 'In transit';
-        }
-        else {
-            stagedObj.stockStatus = '';
-        }
+        stagedObj.stockStatus = this.utilities.sanitizeString(this.filterAttributes.stockStatus);
+        stagedObj.stockStatusTimestamp = this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.stockStatusTimestamp);
         stagedObj.stockTakeFirstTimestamp = this.utilities.sanitizeMillisTimeStamp(stockDerivations.stockTakeFirstTimestamp);
         stagedObj.stockTakeLatestTimestamp = this.utilities.sanitizeMillisTimeStamp(stockDerivations.stockTakeLatestTimestamp);
         if (((_a = this.consignmentAttributes) === null || _a === void 0 ? void 0 : _a.inventoryLocations) &&
@@ -641,25 +645,15 @@ class Product extends Base_1.default {
         const stockTakeLatest = parseLatestAndFirstTs(stockTakeTags).latest;
         const inTransitLatest = parseLatestAndFirstTs(inTransitTags).latest;
         const stockTakeLatestSan = stockTakeLatest ? this.utilities.sanitizeMillisTimeStamp(stockTakeLatest) : null;
+        const inTransitLatestSan = inTransitLatest ? this.utilities.sanitizeMillisTimeStamp(inTransitLatest) : null;
         const stockTakeFirstRaw = stockTakeTags.length ? parseLatestAndFirstTs(stockTakeTags).first : 0;
         const stockTakeFirstSan = stockTakeFirstRaw ? this.utilities.sanitizeMillisTimeStamp(stockTakeFirstRaw) : null;
-        let stockStatusTimestamp = null;
-        if (stockTakeLatest === 0 && inTransitLatest === 0) {
-            stockStatusTimestamp = null;
-        }
-        else if (stockTakeLatest >= inTransitLatest) {
-            stockStatusTimestamp = stockTakeLatestSan;
-        }
-        else {
-            stockStatusTimestamp = this.utilities.sanitizeMillisTimeStamp(inTransitLatest);
-        }
-        this.timestampAttributes.stockStatusTimestamp = stockStatusTimestamp;
         this.timestampAttributes.stockTakeFirstTimestamp = stockTakeFirstSan;
         this.timestampAttributes.stockTakeLatestTimestamp = stockTakeLatestSan;
         return {
             stockTakeFirstTimestamp: stockTakeFirstSan,
             stockTakeLatestTimestamp: stockTakeLatestSan,
-            stockStatusTimestamp,
+            inTransitLatestTimestamp: inTransitLatestSan,
         };
     }
     buildUpdatedFieldsForSalesChannel() {

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

@@ -371,7 +371,7 @@ type TypesenseProductObj = {
     description: string;
     discountType: string;
     discountValue: number;
-    stockStatus: 'In stock' | 'In transit' | '';
+    stockStatus: string;
     stockStatusTimestamp: number | null;
     id: string;
     documentId: string;

package/package.json

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