@isoftdata/svelte-ecommerce 1.0.0-beta.4 → 1.0.0-beta.6

package/dist/helpers/listing.js

@@ -1,4 +1,5 @@
 import { convertAndApplyTemplate, validateInventoryListingDetails } from './index.js';
+import financialNumber from 'financial-number';
 import { klona } from 'klona';
 const newInventoryListingDetailTemplate = Object.freeze({
     active: false,
@@ -79,9 +80,7 @@ export const buildEbayListing = (buildEbayListingInput) => {
         return;
     }
     // Check if part type + category configuration is inactive
-    if (shouldSkipListingDueToInactiveConfiguration(inventoryRow, inventoryTypeListingDefaults)) {
-        return; // Part type configuration set to inactive, do not create listing row
-    }
+    const { shouldSkip, reason } = shouldSkipListingDueToInactiveConfiguration(inventoryRow, inventoryTypeListingDefaults);
     // TODO: consider the possibility of an override flag on the listing details
     // Pull out the various levels of defaults, if they exist
     const globalDefaults = ecommercePartnerConfiguration.defaults?.global;
@@ -110,10 +109,10 @@ export const buildEbayListing = (buildEbayListingInput) => {
     }
     // Static
     listingDetails.ecommercePartnerId = ecommercePartnerId;
-    listingDetails.partnerSpecificDetails.merchantLocationKey ??
+    listingDetails.partnerSpecificDetails.merchantLocationKey =
         listingDetails.partnerSpecificDetails.merchantLocationKey ??
-        matchingStoreConfig?.merchantLocationKey ??
-        null;
+            matchingStoreConfig?.merchantLocationKey ??
+            null;
     // Mapped
     listingDetails.ecommerceCategoryId = listingDetails.ecommerceCategoryId
         ? listingDetails.ecommerceCategoryId
@@ -124,13 +123,21 @@ export const buildEbayListing = (buildEbayListingInput) => {
     listingDetails.inventoryId = inventoryRow.inventoryId;
     listingDetails.storeId = listingDetails.storeId || inventoryRow.storeId;
     listingDetails.sku = listingDetails.sku || inventoryRow.tagNumber;
-    listingDetails.price = listingDetails.price || inventoryRow.retailPrice || null;
+    //listingDetails.price = listingDetails.price || inventoryRow.retailPrice || null
     listingDetails.upc = listingDetails.upc ?? inventoryRow.upc ?? null;
     listingDetails.weight = listingDetails.weight ?? inventoryRow.weight ?? null;
     listingDetails.shippingHeight = listingDetails.shippingHeight ?? inventoryRow.shippingHeight ?? null;
     listingDetails.shippingLength = listingDetails.shippingLength ?? inventoryRow.shippingLength ?? null;
     listingDetails.shippingWidth = listingDetails.shippingWidth ?? inventoryRow.shippingWidth ?? null;
     listingDetails.inventoryDescription = listingDetails.inventoryDescription ?? inventoryRow.description ?? null;
+    // Calculate price adjustments, if appropriate
+    listingDetails.price = computeAdjustedPrice({
+        existingListingPrice: listingDetails.price,
+        partTypeDefaults,
+        storeDefaults,
+        globalDefaults,
+        inventoryRow
+    });
     // For this MVP, we'll default to the existing listing info first (this would include any edits on the part config page, then part type, store, finally global or nothing)
     // TODO: I suppose we could've made this easier by also having a defaults-shaped stringified json column on inventorylistingdetail
     listingDetails.ecommerceConditionId = getFirstValidValue(listingDetails.ecommerceConditionId, partTypeDefaults?.conditionId, storeDefaults?.conditionId, globalDefaults?.conditionId);
@@ -160,8 +167,16 @@ export const buildEbayListing = (buildEbayListingInput) => {
     }
     // With all known fields set, validate for errors
     const validationErrors = validateInventoryListingDetails(listingDetails);
-    // Set active, status and message props depending on validation result
-    if (validationErrors.length) {
+    if (shouldSkip && reason) { // Set active, status and message props if matching configuration set to inActive
+        listingDetails.listingStatus = 'cancelled';
+        const errObj = {
+            type: 'inactive',
+            messages: [reason]
+        };
+        listingDetails.message = [errObj];
+        listingDetails.active = false;
+    }
+    else if (validationErrors.length) { // Set active, status and message props depending on validation result
         listingDetails.listingStatus = 'error';
         const errObj = {
             type: 'validation',
@@ -180,6 +195,66 @@ export const buildEbayListing = (buildEbayListingInput) => {
     // TODO: In the old func there's an explicit reassignment for convertedListingDetails but shouldn't matter if we're cloning?
     return listingDetails;
 };
+/**
+ * Maps PriceLevel string to the corresponding inventory price field
+ */
+const getPriceFromInventory = (priceType, inventoryRow) => {
+    switch (priceType) {
+        case 'Retail':
+            return inventoryRow.retailPrice;
+        case 'Wholesale':
+            return inventoryRow.wholesalePrice;
+        case 'Cost':
+            return inventoryRow.cost;
+        case 'List':
+            return inventoryRow.listPrice;
+        default:
+            return inventoryRow.retailPrice;
+    }
+};
+/**
+ * Computes the adjusted price for a listing based on the following priority:
+ * 1. If existingListingPrice is set (not null/undefined/0), return it as-is (user has manually adjusted)
+ * 2. Otherwise, determine base price from defaultPriceType in priority order:
+ *    - partTypeDefaults.defaultPriceType
+ *    - storeDefaults.defaultPriceType
+ *    - globalDefaults.defaultPriceType
+ *    - Ultimate fallback: inventoryRow.retailPrice
+ * 3. Apply pricingModifier (with same priority fallback, default 100 = no change)
+ * 4. Formula: basePrice * (pricingModifier / 100)
+ */
+export const computeAdjustedPrice = ({ existingListingPrice, partTypeDefaults, storeDefaults, globalDefaults, inventoryRow, }) => {
+    // Step 1: If existing listing price is set (not null/undefined/0), return it as-is
+    // User has manually adjusted the price, so don't apply any modifiers
+    if (existingListingPrice != null && existingListingPrice !== 0) {
+        return existingListingPrice;
+    }
+    // Step 2: Determine the base price to use from inventory
+    // Check for defaultPriceType in priority order
+    const priceType = getFirstValidValue(partTypeDefaults?.defaultPriceType, storeDefaults?.defaultPriceType, globalDefaults?.defaultPriceType);
+    // Get price from inventory based on the price type
+    let basePrice = getPriceFromInventory(priceType, inventoryRow);
+    // Ultimate fallback to retailPrice if basePrice is still null
+    if (basePrice == null) {
+        basePrice = inventoryRow.retailPrice;
+    }
+    // If we still don't have a price, return retailPrice as is
+    if (basePrice == null) {
+        return inventoryRow.retailPrice;
+    }
+    // Step 3: Determine the pricing modifier with priority fallback
+    const pricingModifier = partTypeDefaults?.pricingModifier ??
+        storeDefaults?.pricingModifier ??
+        globalDefaults?.pricingModifier ??
+        100;
+    // Step 4: Calculate adjusted price
+    // Formula: basePrice * (pricingModifier / 100)
+    // Using financialNumber for precision
+    const adjustedPriceStr = financialNumber(basePrice.toString())
+        .times(financialNumber(pricingModifier.toString()).times('0.01'))
+        .toString(2);
+    return parseFloat(adjustedPriceStr);
+};
 const getFirstValidArray = (...arrays) => {
     return arrays.find(arr => arr != null && arr.length > 0) ?? [];
 };
@@ -291,32 +366,53 @@ function findMatchingPartTypeConfig(inventoryRow, inventoryTypeListingDetails) {
     }
     return inventoryTypeListingDetails.find(config => config.categoryName === '');
 }
+// TODO: this needs a unit test
 // Needed a separate method to check what I think are all of the ways we'd need to check
 // part type
 function shouldSkipListingDueToInactiveConfiguration(inventoryRow, inventoryTypeListingDetails) {
     // Early return if no configurations to check
     if (!inventoryTypeListingDetails || inventoryTypeListingDetails.length === 0) {
-        return false; // No restrictions, continue processing
+        return { shouldSkip: false }; // No restrictions, continue processing
     }
     // Early return if inventory has no category
     if (!inventoryRow.category) {
-        return true; // No category to match against, continue processing
+        return { shouldSkip: false }; // No category to match against, continue processing
     }
     // Scenario 1: Single config with no category (applies to all categories)
     if (inventoryTypeListingDetails.length === 1 && !inventoryTypeListingDetails[0].categoryId) {
-        return !inventoryTypeListingDetails[0].active; // Skip if inactive
+        const isInactive = !inventoryTypeListingDetails[0].active;
+        return {
+            shouldSkip: isInactive,
+            reason: isInactive
+                ? 'Matching single inventory type configuration with no category is set to inactive'
+                : undefined,
+        };
     }
     // Scenario 2 & 3: Multiple configs or single config with category
     // Try to find exact category match first
     const categoryMatch = inventoryTypeListingDetails.find(config => config.categoryName === inventoryRow.category);
     if (categoryMatch) {
-        return !categoryMatch.active; // Skip if category match is inactive
+        const isInactive = !categoryMatch.active;
+        return {
+            shouldSkip: isInactive,
+            reason: isInactive
+                ? `Inventory type configuration for category "${inventoryRow.category}" is set to inactive`
+                : undefined,
+        };
     }
+    // TODO: I'm the least certain on this one
+    // We've gotten this far, now check if there's an inventorytype with an empty categoryid and it's set to inactive
     // No exact category match - check if there's a "no category" fallback
     const noCategoryConfig = inventoryTypeListingDetails.find(config => !config.categoryId);
     if (noCategoryConfig) {
-        return !noCategoryConfig.active; // Skip if fallback is inactive
+        const isInactive = !noCategoryConfig.active;
+        return {
+            shouldSkip: isInactive,
+            reason: isInactive
+                ? 'Override inventory type configuration (no category) is set to inactive'
+                : undefined,
+        };
     }
-    // No matching configuration found, continue processing
-    return false;
+    // No matching configuration found that is explicitly set to inactive, continue processing
+    return { shouldSkip: false };
 }

package/dist/utils.d.ts

@@ -90,7 +90,8 @@ export type EcommerceSharedDefaults = {
     oemNumberMapping?: string;
     packageType?: string;
     paymentPolicies?: Array<string>;
-    pricingModifier?: number;
+    pricingModifier: number;
+    defaultPriceType: string | null;
     returnPolicies?: Array<string>;
     shippingLengthUnit?: string;
     shippingWeightUnit?: string;

package/package.json

@@ -1,17 +1,6 @@
 {
   "name": "@isoftdata/svelte-ecommerce",
-  "version": "1.0.0-beta.4",
-  "scripts": {
-    "dev": "vite dev",
-    "build": "vite build && npm run prepack",
-    "preview": "vite preview",
-    "prepare": "svelte-kit sync || echo ''",
-    "prepack": "svelte-kit sync && svelte-package && publint",
-    "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
-    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
-    "lint": "eslint . && prettier --check .",
-    "format": "prettier --write ."
-  },
+  "version": "1.0.0-beta.6",
   "files": [
     "dist",
     "!dist/**/*.test.*",
@@ -57,6 +46,7 @@
     "publint": "^0.3.2",
     "svelte": "^5.0.0",
     "svelte-check": "^4.0.0",
+    "tsx": "^4.21.0",
     "typescript": "^5.0.0",
     "typescript-eslint": "^8.44.1",
     "vite": "^6.0.0"
@@ -81,8 +71,19 @@
     "@isoftdata/utility-string": "^2.2.0",
     "@lukeed/uuid": "2.0.1",
     "camelcase": "^9.0.0",
+    "financial-number": "^5.0.0",
     "klona": "^2.0.6",
     "svelte": "^5.23.2",
     "to-title-case": "^1.0.0"
+  },
+  "scripts": {
+    "dev": "vite dev",
+    "build": "vite build && npm run prepack",
+    "preview": "vite preview",
+    "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
+    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
+    "lint": "eslint . && prettier --check .",
+    "format": "prettier --write .",
+    "test": "node --import tsx --test src/lib/helpers/listing.test.ts"
   }
-}
+}