merchi_sdk_ts 1.27.0 → 1.28.0

package/dist/entities/variation_field.js

@@ -340,6 +340,10 @@ var VariationField = /** @class */ (function (_super) {
         VariationField.property(),
         __metadata("design:type", String)
     ], VariationField.prototype, "areaInputType", void 0);
+    __decorate([
+        VariationField.property({ type: Number }),
+        __metadata("design:type", Object)
+    ], VariationField.prototype, "areaStep", void 0);
     __decorate([
         VariationField.property(),
         __metadata("design:type", Boolean)

package/dist/pricing/estimate.js

@@ -12,12 +12,27 @@ var __values = (this && this.__values) || function(o) {
 import { applyDiscount } from './discount.js';
 import { roundHalfEven } from './round.js';
 import { resolveVisibleFields } from './visibility.js';
+import { FieldType } from '../constants/field_types.js';
 /** Form inputs often supply quantities as strings. Coerce before any arithmetic
  * so `reduce((a,b)=>a+b)` cannot concatenate ("100"+"1" → "01001" → 1001). */
 function toQuantity(value) {
     var n = Number(value);
     return Number.isFinite(n) ? n : 0;
 }
+function parseAreaMm(value) {
+    if (value === undefined || value === null || value === '')
+        return null;
+    var parts = String(value).split(',').map(function (p) { return p.trim(); });
+    if (parts.length !== 2)
+        return null;
+    var heightMm = Number(parts[0]);
+    var widthMm = Number(parts[1]);
+    if (!Number.isFinite(heightMm) || !Number.isFinite(widthMm))
+        return null;
+    if (heightMm <= 0 || widthMm <= 0)
+        return null;
+    return { heightMm: heightMm, widthMm: widthMm };
+}
 function unitPriceAt(rules, qty) {
     var unitPrice = applyDiscount(rules.product.unitPrice, qty, rules.product.discountGroup);
     var mop = rules.product.minimumPrice;
@@ -65,9 +80,53 @@ function isEmpty(field, sel) {
         sel.value === '' ||
         sel.value === 0);
 }
+function areaCostFactor(field, sel, groupQuantities) {
+    var _a, _b, _c, _d, _e;
+    var n = groupQuantities.length;
+    var parsed = parseAreaMm((_a = sel === null || sel === void 0 ? void 0 : sel.value) !== null && _a !== void 0 ? _a : null);
+    if (!parsed) {
+        return { setup: 0, unitList: new Array(n).fill(0) };
+    }
+    var totalQty = groupQuantities.reduce(function (a, b) { return a + b; }, 0);
+    var heightSetup = variationSetupCost({
+        variationCost: field.heightVariationCost || 0,
+        variationCostDiscountGroup: (_b = field.heightVariationCostDiscountGroup) !== null && _b !== void 0 ? _b : null,
+    }, totalQty);
+    var widthSetup = variationSetupCost({
+        variationCost: field.widthVariationCost || 0,
+        variationCostDiscountGroup: (_c = field.widthVariationCostDiscountGroup) !== null && _c !== void 0 ? _c : null,
+    }, totalQty);
+    var heightUcs = variationUnitCosts({
+        variationUnitCost: field.heightVariationUnitCost || 0,
+        variationUnitCostDiscountGroup: (_d = field.heightVariationUnitCostDiscountGroup) !== null && _d !== void 0 ? _d : null,
+    }, groupQuantities);
+    var widthUcs = variationUnitCosts({
+        variationUnitCost: field.widthVariationUnitCost || 0,
+        variationUnitCostDiscountGroup: (_e = field.widthVariationUnitCostDiscountGroup) !== null && _e !== void 0 ? _e : null,
+    }, groupQuantities);
+    var areaUnit = (field.areaUnit || 'mm').toLowerCase();
+    var mmPerUnit = areaUnit === 'm' ? 1000
+        : areaUnit === 'cm' ? 10
+            : areaUnit === 'in' || areaUnit === 'inch' || areaUnit === 'inches' ? 25.4
+                : areaUnit === 'ft' || areaUnit === 'foot' || areaUnit === 'feet' ? 304.8
+                    : 1;
+    var heightU = parsed.heightMm / mmPerUnit;
+    var widthU = parsed.widthMm / mmPerUnit;
+    var area = heightU * widthU;
+    // onceOff/unit = rateH × rateW × height_u × width_u (in field areaUnit)
+    var setup = roundHalfEven(heightSetup * widthSetup * area, 3);
+    var unitList = heightUcs.map(function (hu, i) {
+        return roundHalfEven(hu * widthUcs[i] * area, 3);
+    });
+    return { setup: setup, unitList: unitList };
+}
 function costFactor(field, sel, groupQuantities) {
     var e_1, _a, e_2, _b;
     var n = groupQuantities.length;
+    // Coerce: JSON/APIs occasionally deliver fieldType as a string.
+    if (Number(field.fieldType) === FieldType.AREA) {
+        return areaCostFactor(field, sel, groupQuantities);
+    }
     if (isEmpty(field, sel)) {
         return { setup: 0, unitList: new Array(n).fill(0) };
     }

package/dist/pricing/estimate.test.js

@@ -72,6 +72,35 @@ test('hidden conditional field is not costed', function () {
     var r = estimateQuote(rules, { quantity: 10, fieldValues: { 2: { selectedOptionIds: [201] } } });
     expect(r.cost).toBe(100);
 });
+test('area field multiplies height/width rate cards when dimensions set', function () {
+    var rules = __assign(__assign({}, base), { product: { unitPrice: 1, minimumPrice: null, discountGroup: null }, fields: [{
+                id: 14, originalId: 14, position: 0, fieldType: 14, independent: true,
+                isSelectable: false, selectedBy: [],
+                variationCost: 0, variationUnitCost: 0,
+                variationCostDiscountGroup: null, variationUnitCostDiscountGroup: null,
+                areaUnit: 'mm',
+                heightVariationCost: 2, widthVariationCost: 2,
+                heightVariationUnitCost: 3, widthVariationUnitCost: 4,
+                heightVariationCostDiscountGroup: null,
+                heightVariationUnitCostDiscountGroup: null,
+                widthVariationCostDiscountGroup: null,
+                widthVariationUnitCostDiscountGroup: null,
+                options: [],
+            }] });
+    var empty = estimateQuote(rules, {
+        quantity: 1, fieldValues: { 14: { value: '' } },
+    });
+    expect(empty.cost).toBe(1);
+    var priced = estimateQuote(rules, {
+        quantity: 1, fieldValues: { 14: { value: '2,5' } },
+    });
+    // area 2*5=10; onceOff 2*2*10=40; unit 3*4*10=120 → cost = 1 + 40 + 120 = 161
+    expect(priced.cost).toBe(161);
+    expect(priced.totalCost).toBe(177.1); // +10% tax
+    // String fieldType (some JSON paths) must still hit the area calculator.
+    var asString = estimateQuote(__assign(__assign({}, rules), { fields: [__assign(__assign({}, rules.fields[0]), { fieldType: '14' })] }), { quantity: 1, fieldValues: { 14: { value: '2,5' } } });
+    expect(asString.cost).toBe(161);
+});
 test('non-selectable field with value adds field cost; empty adds nothing', function () {
     var mk = function (sel) {
         var rules = __assign(__assign({}, base), { fields: [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merchi_sdk_ts",
-  "version": "1.27.0",
+  "version": "1.28.0",
   "main": "dist/index.js",
   "type": "module",
   "repository": "git@github.com:merchisdk/merchi_sdk_ts.git",

package/src/entities/variation_field.ts

@@ -174,6 +174,9 @@ export class VariationField extends Entity {
   @VariationField.property()
   public areaInputType?: string;
 
+  @VariationField.property({type: Number})
+  public areaStep?: number | null;
+
   @VariationField.property()
   public aspectRatioLock?: boolean;
 

package/src/pricing/estimate.test.ts

@@ -79,6 +79,47 @@ test('hidden conditional field is not costed', () => {
   expect(r.cost).toBe(100);
 });
 
+test('area field multiplies height/width rate cards when dimensions set', () => {
+  const rules: PricingRules = {
+    ...base,
+    product: { unitPrice: 1, minimumPrice: null, discountGroup: null },
+    fields: [{
+      id: 14, originalId: 14, position: 0, fieldType: 14, independent: true,
+      isSelectable: false, selectedBy: [],
+      variationCost: 0, variationUnitCost: 0,
+      variationCostDiscountGroup: null, variationUnitCostDiscountGroup: null,
+      areaUnit: 'mm',
+      heightVariationCost: 2, widthVariationCost: 2,
+      heightVariationUnitCost: 3, widthVariationUnitCost: 4,
+      heightVariationCostDiscountGroup: null,
+      heightVariationUnitCostDiscountGroup: null,
+      widthVariationCostDiscountGroup: null,
+      widthVariationUnitCostDiscountGroup: null,
+      options: [],
+    }],
+  };
+  const empty = estimateQuote(rules, {
+    quantity: 1, fieldValues: { 14: { value: '' } },
+  }) as QuoteResult;
+  expect(empty.cost).toBe(1);
+  const priced = estimateQuote(rules, {
+    quantity: 1, fieldValues: { 14: { value: '2,5' } },
+  }) as QuoteResult;
+  // area 2*5=10; onceOff 2*2*10=40; unit 3*4*10=120 → cost = 1 + 40 + 120 = 161
+  expect(priced.cost).toBe(161);
+  expect(priced.totalCost).toBe(177.1); // +10% tax
+
+  // String fieldType (some JSON paths) must still hit the area calculator.
+  const asString = estimateQuote(
+    {
+      ...rules,
+      fields: [{ ...rules.fields[0], fieldType: '14' as unknown as number }],
+    },
+    { quantity: 1, fieldValues: { 14: { value: '2,5' } } },
+  ) as QuoteResult;
+  expect(asString.cost).toBe(161);
+});
+
 test('non-selectable field with value adds field cost; empty adds nothing', () => {
   const mk = (sel: any) => {
     const rules: PricingRules = {

package/src/pricing/estimate.ts

@@ -5,6 +5,7 @@ import {
 import { applyDiscount } from './discount.js';
 import { roundHalfEven } from './round.js';
 import { resolveVisibleFields } from './visibility.js';
+import { FieldType } from '../constants/field_types.js';
 
 /** Form inputs often supply quantities as strings. Coerce before any arithmetic
  * so `reduce((a,b)=>a+b)` cannot concatenate ("100"+"1" → "01001" → 1001). */
@@ -13,6 +14,19 @@ function toQuantity(value: unknown): number {
   return Number.isFinite(n) ? n : 0;
 }
 
+function parseAreaMm(
+  value: string | number | null | undefined
+): { heightMm: number; widthMm: number } | null {
+  if (value === undefined || value === null || value === '') return null;
+  const parts = String(value).split(',').map((p) => p.trim());
+  if (parts.length !== 2) return null;
+  const heightMm = Number(parts[0]);
+  const widthMm = Number(parts[1]);
+  if (!Number.isFinite(heightMm) || !Number.isFinite(widthMm)) return null;
+  if (heightMm <= 0 || widthMm <= 0) return null;
+  return { heightMm, widthMm };
+}
+
 function unitPriceAt(rules: PricingRules, qty: number): number {
   let unitPrice = applyDiscount(rules.product.unitPrice, qty, rules.product.discountGroup);
   const mop = rules.product.minimumPrice;
@@ -69,12 +83,75 @@ function isEmpty(field: PricingField, sel: FieldSelection | undefined): boolean
   );
 }
 
+function areaCostFactor(
+  field: PricingField,
+  sel: FieldSelection | undefined,
+  groupQuantities: number[]
+): { setup: number; unitList: number[] } {
+  const n = groupQuantities.length;
+  const parsed = parseAreaMm(sel?.value ?? null);
+  if (!parsed) {
+    return { setup: 0, unitList: new Array(n).fill(0) };
+  }
+  const totalQty = groupQuantities.reduce((a, b) => a + b, 0);
+  const heightSetup = variationSetupCost(
+    {
+      variationCost: field.heightVariationCost || 0,
+      variationCostDiscountGroup: field.heightVariationCostDiscountGroup ?? null,
+    },
+    totalQty
+  );
+  const widthSetup = variationSetupCost(
+    {
+      variationCost: field.widthVariationCost || 0,
+      variationCostDiscountGroup: field.widthVariationCostDiscountGroup ?? null,
+    },
+    totalQty
+  );
+  const heightUcs = variationUnitCosts(
+    {
+      variationUnitCost: field.heightVariationUnitCost || 0,
+      variationUnitCostDiscountGroup:
+        field.heightVariationUnitCostDiscountGroup ?? null,
+    },
+    groupQuantities
+  );
+  const widthUcs = variationUnitCosts(
+    {
+      variationUnitCost: field.widthVariationUnitCost || 0,
+      variationUnitCostDiscountGroup:
+        field.widthVariationUnitCostDiscountGroup ?? null,
+    },
+    groupQuantities
+  );
+  const areaUnit = (field.areaUnit || 'mm').toLowerCase();
+  const mmPerUnit =
+    areaUnit === 'm' ? 1000
+    : areaUnit === 'cm' ? 10
+    : areaUnit === 'in' || areaUnit === 'inch' || areaUnit === 'inches' ? 25.4
+    : areaUnit === 'ft' || areaUnit === 'foot' || areaUnit === 'feet' ? 304.8
+    : 1;
+  const heightU = parsed.heightMm / mmPerUnit;
+  const widthU = parsed.widthMm / mmPerUnit;
+  const area = heightU * widthU;
+  // onceOff/unit = rateH × rateW × height_u × width_u (in field areaUnit)
+  const setup = roundHalfEven(heightSetup * widthSetup * area, 3);
+  const unitList = heightUcs.map((hu, i) =>
+    roundHalfEven(hu * widthUcs[i] * area, 3)
+  );
+  return { setup, unitList };
+}
+
 function costFactor(
   field: PricingField,
   sel: FieldSelection | undefined,
   groupQuantities: number[]
 ): { setup: number; unitList: number[] } {
   const n = groupQuantities.length;
+  // Coerce: JSON/APIs occasionally deliver fieldType as a string.
+  if (Number(field.fieldType) === FieldType.AREA) {
+    return areaCostFactor(field, sel, groupQuantities);
+  }
   if (isEmpty(field, sel)) {
     return { setup: 0, unitList: new Array(n).fill(0) };
   }

package/src/pricing/types.ts

@@ -35,6 +35,16 @@ export interface PricingField {
   variationUnitCost: number;
   variationCostDiscountGroup: DiscountGroup | null;
   variationUnitCostDiscountGroup: DiscountGroup | null;
+  /** Area field (type 14): once-off and per-edge unit costs. */
+  areaUnit?: 'mm' | 'cm' | 'm' | string;
+  heightVariationCost?: number;
+  heightVariationUnitCost?: number;
+  widthVariationCost?: number;
+  widthVariationUnitCost?: number;
+  heightVariationCostDiscountGroup?: DiscountGroup | null;
+  heightVariationUnitCostDiscountGroup?: DiscountGroup | null;
+  widthVariationCostDiscountGroup?: DiscountGroup | null;
+  widthVariationUnitCostDiscountGroup?: DiscountGroup | null;
   options: PricingOption[];
 }