@merchi/sdk 1.42.4 → 1.42.6

package/dist/entities/job.js

@@ -131,7 +131,7 @@ var Job = /** @class */ (function (_super) {
         __metadata("design:type", Object)
     ], Job.prototype, "productionStatus", void 0);
     __decorate([
-        Job.property(),
+        Job.property({ type: String }),
         __metadata("design:type", Object)
     ], Job.prototype, "productionQuotingSpec", void 0);
     __decorate([

package/dist/pricing/estimate.js

@@ -120,6 +120,36 @@ function areaCostFactor(field, sel, groupQuantities) {
     });
     return { setup: setup, unitList: unitList };
 }
+function colourExtractCostFactor(field, sel, groupQuantities) {
+    var _a, _b, _c, _d;
+    var n = groupQuantities.length;
+    var zeros = { setup: 0, unitList: new Array(n).fill(0) };
+    // Extracted colours are not in the static options list. Count them, then
+    // apply the field fee once and the per-colour fee once per colour.
+    var colourCount = (sel === null || sel === void 0 ? void 0 : sel.colourCount) != null
+        ? sel.colourCount
+        : (_b = (_a = sel === null || sel === void 0 ? void 0 : sel.selectedOptionIds) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
+    var active = colourCount > 0 || Boolean(sel === null || sel === void 0 ? void 0 : sel.hasFiles);
+    if (!active)
+        return zeros;
+    var totalQty = groupQuantities.reduce(function (a, b) { return a + b; }, 0);
+    var setup = variationSetupCost(field, totalQty);
+    var unitList = variationUnitCosts(field, groupQuantities);
+    if (colourCount > 0) {
+        var colourSetup = variationSetupCost({
+            variationCost: field.colourVariationCost || 0,
+            variationCostDiscountGroup: (_c = field.colourVariationCostDiscountGroup) !== null && _c !== void 0 ? _c : null,
+        }, totalQty);
+        var colourUnits = variationUnitCosts({
+            variationUnitCost: field.colourVariationUnitCost || 0,
+            variationUnitCostDiscountGroup: (_d = field.colourVariationUnitCostDiscountGroup) !== null && _d !== void 0 ? _d : null,
+        }, groupQuantities);
+        setup += colourSetup * colourCount;
+        for (var i = 0; i < n; i++)
+            unitList[i] += colourUnits[i] * colourCount;
+    }
+    return { setup: setup, unitList: unitList };
+}
 function costFactor(field, sel, groupQuantities) {
     var e_1, _a, e_2, _b;
     var n = groupQuantities.length;
@@ -127,6 +157,9 @@ function costFactor(field, sel, groupQuantities) {
     if (Number(field.fieldType) === FieldType.AREA) {
         return areaCostFactor(field, sel, groupQuantities);
     }
+    if (Number(field.fieldType) === FieldType.COLOUR_EXTRACT) {
+        return colourExtractCostFactor(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,56 @@ test('hidden conditional field is not costed', function () {
     var r = estimateQuote(rules, { quantity: 10, fieldValues: { 2: { selectedOptionIds: [201] } } });
     expect(r.cost).toBe(100);
 });
+function colourExtractField() {
+    return {
+        id: 13, originalId: 13, position: 0, fieldType: 13, independent: true,
+        isSelectable: true, selectedBy: [],
+        variationCost: 180, variationUnitCost: 6.52,
+        variationCostDiscountGroup: null, variationUnitCostDiscountGroup: null,
+        colourVariationCost: 60, colourVariationUnitCost: 0.8,
+        colourVariationCostDiscountGroup: null,
+        colourVariationUnitCostDiscountGroup: null,
+        options: [],
+    };
+}
+test('colour extract with no colours or file does not add a charge', function () {
+    var rules = __assign(__assign({}, base), { product: { unitPrice: 1, minimumPrice: null, discountGroup: null }, fields: [colourExtractField()] });
+    var r = estimateQuote(rules, {
+        quantity: 30,
+        fieldValues: { 13: { selectedOptionIds: [], colourCount: 0, hasFiles: false } },
+    });
+    expect(r.cost).toBe(30);
+    expect(r.totalCost).toBe(33);
+});
+test('colour extract adds the field fee and each selected colour', function () {
+    var rules = __assign(__assign({}, base), { product: { unitPrice: 1, minimumPrice: null, discountGroup: null }, fields: [colourExtractField()] });
+    var r = estimateQuote(rules, {
+        quantity: 30,
+        fieldValues: { 13: { selectedOptionIds: [1, 2, 3], colourCount: 3 } },
+    });
+    // 30*1 + 180 + 6.52*30 + 3*60 + 3*0.80*30 = 657.6
+    expect(r.cost).toBe(657.6);
+    expect(r.taxAmount).toBe(65.76);
+    expect(r.totalCost).toBe(723.36);
+});
+test('colour extract counts selected option ids when colourCount is omitted', function () {
+    var rules = __assign(__assign({}, base), { product: { unitPrice: 1, minimumPrice: null, discountGroup: null }, fields: [colourExtractField()] });
+    var r = estimateQuote(rules, {
+        quantity: 30,
+        fieldValues: { 13: { selectedOptionIds: [9, 8] } },
+    });
+    // 30 + 180 + 195.6 + 2*60 + 2*0.8*30 = 573.6
+    expect(r.cost).toBe(573.6);
+});
+test('colour extract file without colours still charges the field fee', function () {
+    var rules = __assign(__assign({}, base), { product: { unitPrice: 1, minimumPrice: null, discountGroup: null }, fields: [colourExtractField()] });
+    var r = estimateQuote(rules, {
+        quantity: 30,
+        fieldValues: { 13: { colourCount: 0, hasFiles: true } },
+    });
+    // 30 + 180 + 6.52*30 = 405.6
+    expect(r.cost).toBe(405.6);
+});
 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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merchi/sdk",
-  "version": "1.42.4",
+  "version": "1.42.6",
   "main": "dist/index.js",
   "type": "module",
   "repository": {

package/src/entities/job.ts

@@ -66,7 +66,7 @@ export class Job extends Entity {
   @Job.property({type: Number})
   public productionStatus?: number | null;
 
-  @Job.property()
+  @Job.property({type: String})
   public productionQuotingSpec?: string | null;
 
   @Job.property()

package/src/pricing/estimate.test.ts

@@ -79,6 +79,77 @@ test('hidden conditional field is not costed', () => {
   expect(r.cost).toBe(100);
 });
 
+function colourExtractField(): PricingRules['fields'][number] {
+  return {
+    id: 13, originalId: 13, position: 0, fieldType: 13, independent: true,
+    isSelectable: true, selectedBy: [],
+    variationCost: 180, variationUnitCost: 6.52,
+    variationCostDiscountGroup: null, variationUnitCostDiscountGroup: null,
+    colourVariationCost: 60, colourVariationUnitCost: 0.8,
+    colourVariationCostDiscountGroup: null,
+    colourVariationUnitCostDiscountGroup: null,
+    options: [],
+  };
+}
+
+test('colour extract with no colours or file does not add a charge', () => {
+  const rules: PricingRules = {
+    ...base,
+    product: { unitPrice: 1, minimumPrice: null, discountGroup: null },
+    fields: [colourExtractField()],
+  };
+  const r = estimateQuote(rules, {
+    quantity: 30,
+    fieldValues: { 13: { selectedOptionIds: [], colourCount: 0, hasFiles: false } },
+  }) as QuoteResult;
+  expect(r.cost).toBe(30);
+  expect(r.totalCost).toBe(33);
+});
+
+test('colour extract adds the field fee and each selected colour', () => {
+  const rules: PricingRules = {
+    ...base,
+    product: { unitPrice: 1, minimumPrice: null, discountGroup: null },
+    fields: [colourExtractField()],
+  };
+  const r = estimateQuote(rules, {
+    quantity: 30,
+    fieldValues: { 13: { selectedOptionIds: [1, 2, 3], colourCount: 3 } },
+  }) as QuoteResult;
+  // 30*1 + 180 + 6.52*30 + 3*60 + 3*0.80*30 = 657.6
+  expect(r.cost).toBe(657.6);
+  expect(r.taxAmount).toBe(65.76);
+  expect(r.totalCost).toBe(723.36);
+});
+
+test('colour extract counts selected option ids when colourCount is omitted', () => {
+  const rules: PricingRules = {
+    ...base,
+    product: { unitPrice: 1, minimumPrice: null, discountGroup: null },
+    fields: [colourExtractField()],
+  };
+  const r = estimateQuote(rules, {
+    quantity: 30,
+    fieldValues: { 13: { selectedOptionIds: [9, 8] } },
+  }) as QuoteResult;
+  // 30 + 180 + 195.6 + 2*60 + 2*0.8*30 = 573.6
+  expect(r.cost).toBe(573.6);
+});
+
+test('colour extract file without colours still charges the field fee', () => {
+  const rules: PricingRules = {
+    ...base,
+    product: { unitPrice: 1, minimumPrice: null, discountGroup: null },
+    fields: [colourExtractField()],
+  };
+  const r = estimateQuote(rules, {
+    quantity: 30,
+    fieldValues: { 13: { colourCount: 0, hasFiles: true } },
+  }) as QuoteResult;
+  // 30 + 180 + 6.52*30 = 405.6
+  expect(r.cost).toBe(405.6);
+});
+
 test('area field multiplies height/width rate cards when dimensions set', () => {
   const rules: PricingRules = {
     ...base,

package/src/pricing/estimate.ts

@@ -142,6 +142,47 @@ function areaCostFactor(
   return { setup, unitList };
 }
 
+function colourExtractCostFactor(
+  field: PricingField,
+  sel: FieldSelection | undefined,
+  groupQuantities: number[]
+): { setup: number; unitList: number[] } {
+  const n = groupQuantities.length;
+  const zeros = { setup: 0, unitList: new Array(n).fill(0) };
+  // Extracted colours are not in the static options list. Count them, then
+  // apply the field fee once and the per-colour fee once per colour.
+  const colourCount =
+    sel?.colourCount != null
+      ? sel.colourCount
+      : sel?.selectedOptionIds?.length ?? 0;
+  const active = colourCount > 0 || Boolean(sel?.hasFiles);
+  if (!active) return zeros;
+
+  const totalQty = groupQuantities.reduce((a, b) => a + b, 0);
+  let setup = variationSetupCost(field, totalQty);
+  const unitList = variationUnitCosts(field, groupQuantities);
+  if (colourCount > 0) {
+    const colourSetup = variationSetupCost(
+      {
+        variationCost: field.colourVariationCost || 0,
+        variationCostDiscountGroup: field.colourVariationCostDiscountGroup ?? null,
+      },
+      totalQty
+    );
+    const colourUnits = variationUnitCosts(
+      {
+        variationUnitCost: field.colourVariationUnitCost || 0,
+        variationUnitCostDiscountGroup:
+          field.colourVariationUnitCostDiscountGroup ?? null,
+      },
+      groupQuantities
+    );
+    setup += colourSetup * colourCount;
+    for (let i = 0; i < n; i++) unitList[i] += colourUnits[i] * colourCount;
+  }
+  return { setup, unitList };
+}
+
 function costFactor(
   field: PricingField,
   sel: FieldSelection | undefined,
@@ -152,6 +193,9 @@ function costFactor(
   if (Number(field.fieldType) === FieldType.AREA) {
     return areaCostFactor(field, sel, groupQuantities);
   }
+  if (Number(field.fieldType) === FieldType.COLOUR_EXTRACT) {
+    return colourExtractCostFactor(field, sel, groupQuantities);
+  }
   if (isEmpty(field, sel)) {
     return { setup: 0, unitList: new Array(n).fill(0) };
   }

package/src/pricing/types.ts

@@ -45,6 +45,11 @@ export interface PricingField {
   heightVariationUnitCostDiscountGroup?: DiscountGroup | null;
   widthVariationCostDiscountGroup?: DiscountGroup | null;
   widthVariationUnitCostDiscountGroup?: DiscountGroup | null;
+  /** Colour extract (fieldType 13): per selected colour, not a static option. */
+  colourVariationCost?: number;
+  colourVariationUnitCost?: number;
+  colourVariationCostDiscountGroup?: DiscountGroup | null;
+  colourVariationUnitCostDiscountGroup?: DiscountGroup | null;
   options: PricingOption[];
 }
 
@@ -82,6 +87,10 @@ export interface InventoryUnit {
 export interface FieldSelection {
   selectedOptionIds?: number[];
   value?: string | number | null;
+  /** Colour extract: number of chosen colours when ids are not in the rules. */
+  colourCount?: number;
+  /** Colour extract: an artwork file is attached, even if no colour was kept. */
+  hasFiles?: boolean;
 }
 
 export interface GroupSelection {