rerobe-js-orm 4.3.7 → 4.3.9

package/lib/form-states/Order/RefundFormState.js

@@ -45,20 +45,28 @@ class RefundFormState extends FormState_1.default {
     }
     updateDiscountsAndSubtotals() {
         const calculated = this.fields.refundLineItems.selectedValues.reduce((total, item) => {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             const lineItemPriceAmount = Number(item.lineItem.isOnSale === 'yes' ? item.lineItem.salePrice || 0 : (_a = item.lineItem.originalUnitPrice) === null || _a === void 0 ? void 0 : _a.amount);
             const lineItemPricePresentmentAmount = Number(item.lineItem.isOnSale === 'yes'
                 ? ((_b = item.lineItem.presentmentSalePrice) === null || _b === void 0 ? void 0 : _b.amount) || 0
                 : ((_c = item.lineItem.presentmentUnitPrice) === null || _c === void 0 ? void 0 : _c.amount) || 0);
+            // Calculate tax-adjusted prices if item is taxable
+            const taxAdjustedPriceAmount = item.lineItem.isTaxable && item.lineItem.taxRate
+                ? Number((lineItemPriceAmount * (1 + Number(item.lineItem.taxRate))).toFixed(2))
+                : lineItemPriceAmount;
+            const taxAdjustedPresentmentPriceAmount = item.lineItem.isTaxable && ((_d = item.lineItem.presentmentTaxPrice) === null || _d === void 0 ? void 0 : _d.amount)
+                ? Number((lineItemPricePresentmentAmount +
+                    Number(item.lineItem.presentmentTaxPrice.amount) / Number(item.lineItem.quantity)).toFixed(2))
+                : lineItemPricePresentmentAmount;
             return {
-                refundDiscount: total.refundDiscount + Number((_d = item.discountRefund) === null || _d === void 0 ? void 0 : _d.amount),
-                refundCreditDiscount: total.refundCreditDiscount + Number((_e = item.creditDiscountRefund) === null || _e === void 0 ? void 0 : _e.amount),
-                subtotalRefunded: total.subtotalRefunded + Number(lineItemPriceAmount * (item.quantityRefund + item.quantityCancel)),
+                refundDiscount: total.refundDiscount + Number((_e = item.discountRefund) === null || _e === void 0 ? void 0 : _e.amount),
+                refundCreditDiscount: total.refundCreditDiscount + Number((_f = item.creditDiscountRefund) === null || _f === void 0 ? void 0 : _f.amount),
+                subtotalRefunded: total.subtotalRefunded + Number(taxAdjustedPriceAmount * (item.quantityRefund + item.quantityCancel)),
                 // Presentment:
-                refundDiscountPresentment: total.refundDiscountPresentment + Number((_f = item.discountRefundPresentment) === null || _f === void 0 ? void 0 : _f.amount),
-                refundCreditDiscountPresentment: total.refundCreditDiscountPresentment + Number((_g = item.creditDiscountRefundPresentment) === null || _g === void 0 ? void 0 : _g.amount),
+                refundDiscountPresentment: total.refundDiscountPresentment + Number((_g = item.discountRefundPresentment) === null || _g === void 0 ? void 0 : _g.amount),
+                refundCreditDiscountPresentment: total.refundCreditDiscountPresentment + Number((_h = item.creditDiscountRefundPresentment) === null || _h === void 0 ? void 0 : _h.amount),
                 subtotalRefundedPresentment: total.subtotalRefundedPresentment +
-                    Number(lineItemPricePresentmentAmount * (item.quantityRefund + item.quantityCancel)), // Number(item.subtotalRefundPresentment?.amount || 0) + Number(item.subtotalCanceledPresentment?.amount || 0),
+                    Number(taxAdjustedPresentmentPriceAmount * (item.quantityRefund + item.quantityCancel)),
             };
         }, {
             refundDiscount: 0,

package/lib/helpers/ReRobeProductHelpers.js

@@ -268,17 +268,17 @@ class ReRobeProductHelpers {
     }
     static autoCreateMetaDescription(productObj) {
         var _a;
-        const { color, productType, productStyle, condition, size, standardSize, brand, sizeComment, materialComposition, gender, } = productObj;
+        const { color, productType, productStyle = [], condition, size, standardSize, brand, sizeComment, materialComposition, gender, } = productObj;
         const materials = this.materialCompJoinedString(materialComposition);
         const fit = ((_a = options_1.sizeCommentOptions.find((option) => option.value === sizeComment)) === null || _a === void 0 ? void 0 : _a.label) || '';
-        const joinedProductStyle = productStyle.join(', ');
+        const joinedProductStyle = Array.isArray(productStyle) ? productStyle.join(', ') : '';
         const elements = [
             gender && `Primary segment: ${gender}`,
             brand && `Brand: ${brand}`,
             size && `Size: ${standardSize ? standardSize : size}`,
             color && `Color: ${color}`,
             productType && `Type: ${productType}`,
-            productStyle.length > 0 && `Style: ${joinedProductStyle}`,
+            joinedProductStyle && `Style: ${joinedProductStyle}`,
             condition && `Condition: ${condition}`,
             materials && `Material: ${materials}`,
             fit && `Fit: ${fit}`,
@@ -317,7 +317,7 @@ class ReRobeProductHelpers {
       Vi använder oss av "Tradera betalning" vilket innebär att du som köpare kan välja att betala med Swish, kort eller PayPal. ${merchantName}’s rabatter och erbjudanden gäller endast vid köp på vår hemsida samt via vår app.
       <br>
       <br>
-      Tänk på att produkter kan ligga i flera varukorgar samtidigt. Om din vara står som ”slut/såld” vid utcheckningen beror det på att någon annan hunnit före.
+      Tänk på att produkter kan ligga i flera varukorgar samtidigt. Om din vara står som "slut/såld" vid utcheckningen beror det på att någon annan hunnit före.
     </p>
     
     <p>
@@ -705,13 +705,26 @@ class ReRobeProductHelpers {
             productObj.isOnSale === 'yes' &&
             productObj.salePrice &&
             productObj.clearanceTimestamp;
-        let price = Number(productObj.price).toFixed(2);
-        if (targetMarketTaxRate && productObj.isTaxable === 'yes') {
-            price = (Number(productObj.price) * (1 + targetMarketTaxRate)).toFixed(2);
+        let price = '0.00';
+        let salePrice = '0.00';
+        try {
+            const basePrice = Number(productObj.price);
+            const baseSalePrice = Number(productObj.salePrice || 0);
+            if (!isNaN(basePrice)) {
+                price = (targetMarketTaxRate && productObj.isTaxable === 'yes' ? basePrice * (1 + targetMarketTaxRate) : basePrice).toFixed(2);
+            }
+            if (!isNaN(baseSalePrice) && isOnSale) {
+                salePrice = (targetMarketTaxRate && productObj.isTaxable === 'yes'
+                    ? baseSalePrice * (1 + targetMarketTaxRate)
+                    : baseSalePrice).toFixed(2);
+            }
+        }
+        catch (error) {
+            // Keep default values if parsing fails
         }
         return {
-            id: productObj.documentId,
-            title: productObj.metaDataTitle || productObj.title,
+            id: String(productObj.documentId || ''),
+            title: productObj.metaDataTitle || productObj.title || '',
             description: productObj.description || '',
             link: `https://${primaryDomain}/products/${productObj.handle}`,
             image_link: productObj.imageUrls && productObj.imageUrls.length > 0 ? productObj.imageUrls[0] : '',
@@ -719,7 +732,7 @@ class ReRobeProductHelpers {
             cost_of_goods_sold: productObj.costPerItem
                 ? `${Number(productObj.costPerItem).toFixed(2)} ${currency}`
                 : undefined,
-            sale_price: isOnSale ? `${Number(productObj.salePrice).toFixed(2)} ${currency}` : undefined,
+            sale_price: isOnSale ? `${salePrice} ${currency}` : undefined,
             brand: productObj.brand || 'Unknown',
             condition: 'used',
             availability: availabilityMapper(productObj.status),
@@ -790,20 +803,33 @@ class ReRobeProductHelpers {
             productObj.isOnSale === 'yes' &&
             productObj.salePrice &&
             productObj.clearanceTimestamp;
-        let price = Number(productObj.price).toFixed(2);
-        if (targetMarketTaxRate && productObj.isTaxable === 'yes') {
-            price = (Number(productObj.price) * (1 + targetMarketTaxRate)).toFixed(2);
+        let price = '0.00';
+        let salePrice = '0.00';
+        try {
+            const basePrice = Number(productObj.price);
+            const baseSalePrice = Number(productObj.salePrice || 0);
+            if (!isNaN(basePrice)) {
+                price = (targetMarketTaxRate && productObj.isTaxable === 'yes' ? basePrice * (1 + targetMarketTaxRate) : basePrice).toFixed(2);
+            }
+            if (!isNaN(baseSalePrice) && isOnSale) {
+                salePrice = (targetMarketTaxRate && productObj.isTaxable === 'yes'
+                    ? baseSalePrice * (1 + targetMarketTaxRate)
+                    : baseSalePrice).toFixed(2);
+            }
+        }
+        catch (error) {
+            // Keep default values if parsing fails
         }
         return {
-            id: productObj.documentId,
-            title: productObj.metaDataTitle || productObj.title,
-            description: productObj.metaDataDescription || this.autoCreateMetaDescription(productObj),
+            id: String(productObj.documentId || ''),
+            title: productObj.metaDataTitle || productObj.title || '',
+            description: productObj.metaDataDescription || this.autoCreateMetaDescription(productObj) || '',
             availability: availabilityMapper(productObj.status),
             condition: 'used',
             price: `${price} ${currency}`,
             link: `https://${primaryDomain}/products/${productObj.handle}`,
             image_link: productObj.imageUrls && productObj.imageUrls.length > 0 ? productObj.imageUrls[0] : '',
-            sale_price: isOnSale ? `${Number(productObj.salePrice).toFixed(2)} ${currency}` : undefined,
+            sale_price: isOnSale ? `${salePrice} ${currency}` : undefined,
             brand: productObj.brand || 'Unknown',
             color: productObj.color || 'various',
             gender: genderMapper(productObj.gender),

package/package.json

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