rerobe-js-orm 3.9.6 → 3.9.8

package/lib/factories/ProductCollection/ProductCollectionFromFormState.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ProductCollectionFactory_1 = require("./ProductCollectionFactory");
 const ProductCollection_1 = require("../../models/ProductCollection");
-// @ts-ignore
-const lodash_1 = require("lodash");
+const slug = require("slug");
 class ProductCollectionFromFormState extends ProductCollectionFactory_1.default {
     createProductCollection(fs) {
         var _a;
         let collectionId = fs.fields.collectionId.inputValue;
         if (!collectionId) {
-            collectionId = (0, lodash_1.camelCase)(fs.fields.title.inputValue) + new Date().toISOString().split('T')[0];
+            collectionId = slug(fs.fields.title.inputValue);
         }
         const productCollectionAttributes = {
             documentId: ((_a = fs.props) === null || _a === void 0 ? void 0 : _a.documentId) || '',
@@ -23,6 +22,7 @@ class ProductCollectionFromFormState extends ProductCollectionFactory_1.default
             refinements: fs.fields.refinements.selectedValue || {},
             tags: fs.fields.tags.selectedValues || [],
             collectionId,
+            isExclusive: fs.fields.isExclusive.selectedValue || '',
         };
         return new ProductCollection_1.default(Object.assign({}, productCollectionAttributes));
     }

package/lib/form-states/ProductCollection/ProductCollectionFormState.js

@@ -4,6 +4,7 @@ const FormState_1 = require("../FormState");
 const ProductCollection_1 = require("../../models/ProductCollection");
 const ProductCollectionFromFormState_1 = require("../../factories/ProductCollection/ProductCollectionFromFormState");
 const slug = require("slug");
+const options_1 = require("../Product/options");
 class ProductCollectionFormState extends FormState_1.default {
     constructor(props, opts) {
         super();
@@ -19,6 +20,7 @@ class ProductCollectionFormState extends FormState_1.default {
         this.fields.refinements = this.fieldFactory('singleSelect', 'refinements');
         this.fields.tags = this.fieldFactory('multiSelect', 'tags', []);
         this.fields.collectionId = this.fieldFactory('textInput', 'collectionId');
+        this.fields.isExclusive = this.fieldFactory('singleSelect', 'isExclusive', options_1.productYesNoOptions);
     }
     createProductCollection() {
         const productCollectionFactory = new ProductCollectionFromFormState_1.default();

package/lib/helpers/OrderHelpers.d.ts

@@ -26,7 +26,7 @@ export default class OrderHelpers {
         currency: string;
     }): string;
     getSubtotalWithoutSalePrice(productsFullInfoWithQuantity?: ProductsFullInfoWithQuantity): number;
-    getSubtotalWithSalePriceIncluded(productsFullInfoWithQuantity?: ProductsFullInfoWithQuantity): number;
+    getSubtotalWithSalePriceIncluded(productsFullInfoWithQuantity?: ProductsFullInfoWithQuantity, orderDiscount?: number): number;
     getSaleDiscountAmount(productsFullInfoWithQuantity: ProductsFullInfoWithQuantity): number;
     preparePresentmentData({ merchantName, merchantCurrency, presentmentCurrencyCode, productsFullInfoWithQuantity, currencyConverter, saleDiscountAmount, creditDiscountAmount, additionalDiscount, shippingPrice, itemsTax, shippingFeeTax, subTotalWithSalePriceIncluded, totalIncludingShipping, totalIncludingShippingAndTaxes, }: {
         merchantName: string;

package/lib/helpers/OrderHelpers.js

@@ -351,23 +351,30 @@ class OrderHelpers {
             .reduce((a, b) => a + b, 0);
         return Number(this.toFixedPointPrice(cumsum));
     }
-    getSubtotalWithSalePriceIncluded(productsFullInfoWithQuantity) {
+    getSubtotalWithSalePriceIncluded(productsFullInfoWithQuantity, orderDiscount = 0) {
         if (!productsFullInfoWithQuantity || productsFullInfoWithQuantity.length === 0) {
             return 0;
         }
-        const cumsum = productsFullInfoWithQuantity
+        // Step 1: Calculate the total before applying the order-wide discount
+        const totalBeforeDiscount = productsFullInfoWithQuantity
             .map((item) => {
             // Determine if the product is on sale and set the price accordingly
             const price = item.product.isOnSale && item.product.clearanceTimestamp ? item.product.salePrice : item.product.price;
+            // Base price for this item before tax and discounts
             const basePrice = Number(price || 0) * Number(item.quantity);
+            let totalPrice = basePrice;
+            // Apply tax if the item is taxable
             if (item.isTaxable && item.taxRate) {
-                const taxAmount = basePrice * Number(item.taxRate); // Calculate the tax based on the base price
-                return basePrice + taxAmount; // Return the total including tax
+                const taxAmount = basePrice * Number(item.taxRate); // Calculate tax based on base price
+                totalPrice += taxAmount; // Add tax to the base price
             }
-            return basePrice; // Return the price without tax for non-taxable items
+            return totalPrice; // Return the total price (including tax if applicable)
         })
-            .reduce((a, b) => a + b, 0);
-        return Number(this.toFixedPointPrice(cumsum));
+            .reduce((a, b) => a + b, 0); // Sum up the totals for all items
+        // Step 2: Apply the order-wide discount, ensuring it doesn't exceed the total before discount
+        const totalAfterDiscount = Math.max(totalBeforeDiscount - orderDiscount, 0);
+        // Step 3: Return the final subtotal, rounded to fixed decimal points
+        return Number(this.toFixedPointPrice(totalAfterDiscount));
     }
     getSaleDiscountAmount(productsFullInfoWithQuantity) {
         return productsFullInfoWithQuantity

package/lib/models/ProductCollection.d.ts

@@ -13,6 +13,7 @@ export default class ProductCollection extends Base {
     refinements: ProductRefinements;
     tags: string[];
     collectionId: string;
+    isExclusive: string;
     constructor(props?: any);
     toObj(): ProductCollectionType;
     generateSchemaForTypesense(name?: string): {

package/lib/models/ProductCollection.js

@@ -17,6 +17,7 @@ class ProductCollection extends Base_1.default {
         this.tags = (props === null || props === void 0 ? void 0 : props.tags) || [];
         this.collectionId = (props === null || props === void 0 ? void 0 : props.collectionId) || '';
         this.imageUrls = (props === null || props === void 0 ? void 0 : props.imageUrls) || [];
+        this.isExclusive = (props === null || props === void 0 ? void 0 : props.isExclusive) || '';
     }
     toObj() {
         const productCollectionObj = {
@@ -33,6 +34,7 @@ class ProductCollection extends Base_1.default {
             tags: this.tags,
             collectionId: this.collectionId,
             imageUrls: this.imageUrls,
+            isExclusive: this.isExclusive,
         };
         return productCollectionObj;
     }
@@ -185,6 +187,11 @@ class ProductCollection extends Base_1.default {
                     name: 'collectionId',
                     type: 'string',
                 },
+                {
+                    facet: true,
+                    name: 'isExclusive',
+                    type: 'string',
+                },
             ],
             name: 'dev_productCollections_20220726',
         };
@@ -218,6 +225,7 @@ class ProductCollection extends Base_1.default {
             tags: this.utilities.sanitzeStringArr(this.tags),
             imageUrls: this.utilities.sanitzeStringArr(this.imageUrls),
             collectionId: this.utilities.sanitizeString(this.collectionId),
+            isExclusive: this.utilities.sanitizeString(this.isExclusive),
         };
         return stagedObj;
     }

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

@@ -49,6 +49,7 @@ type ProductCollectionType = {
     tags: string[];
     collectionId: string;
     imageUrls: string[];
+    isExclusive: string;
 };
 type CompleteProductCollection = ProductCollectionType & {
     [key: string]: any;
@@ -64,6 +65,7 @@ type ProductCollectionFormFields = {
     tags: MultiSelectFormField<string>;
     imageUrls: MultiSelectFormField<string>;
     collectionId: TextInputFormField<string>;
+    isExclusive: SingleSelectFormField<string>;
 };
 type TypesenseProductCollectionObj = {
     id: string;
@@ -93,4 +95,5 @@ type TypesenseProductCollectionObj = {
     tags: string[];
     imageUrls: string[];
     collectionId: string;
+    isExclusive: string;
 };

package/package.json

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