fix(api): apply e-conomic discount percentage at line level for customer 35131752

Bug #11: For customer 35131752 ('kd'), the 15% e-conomic discount was
configured on the customer but never applied to the draft invoice line
items. The customer discount was only used in the flag/preview service for
expected price calculations, not when actually building the draft invoice.

Changes:
- economicCustomers.php: log swallowed missing-currency-price errors so
  silently-missing discounts (like customer 35131752) become visible in
  the application log instead of vanishing.
- economic_invoice_draft.php: thread the customer discount percentage
  through addOrderItemLines/addOrderItemLine and apply it at the line
  level (e-conomic's draft invoice line API requires per-line
  discountPercentage; an aggregate TotDiscount line is ignored when the
  customer has a per-line discount configured).
- economic_invoices_draft_endpoint.php: forward the customer discount
  percentage to the draft builder.
- collected_order_invoices_o.php: resolve the customer discount via
  Redis cache + e-conomicCustomers, then pass it to add_orders.
- Tests: new EconomicInvoiceDraftCustomerDiscountTest covering the
  customer 35131752 15% case, plus updates to the existing wiring tests
  to account for the new parameter and the customer-discount guard on
  the aggregate TotDiscount line.

services/nginx/app/modules/economic/customers/economicCustomers.php

@@ -76,9 +76,14 @@ class economicCustomers extends economic_m
         // The discount is global, but e-conomic resolves it through a product-specific
         // invoice-line template. For foreign-currency customers some templates can fail
         // if that product has no price in the customer currency, so try a few products
-        // before falling back to zero.
+        // before falling back to zero. We log every swallowed currency-price failure so
+        // silently-missing discounts (e.g. bug #11 customer 35131752 "kd" 15%) become
+        // visible in the application log instead of vanishing into the void.
         $products = $this->getCustomerProducts($customer_number, 10);
+        $attempted_products = 0;
+        $swallowed_errors = 0;
         foreach ($this->extractCustomerProductNumbers($products) as $product_number) {
+            $attempted_products++;
             try {
                 $discount = $this->getCustomerProductDiscount($customer_number, $product_number);
                 return (int)($discount->discountPercentage ?? 0);
@@ -86,9 +91,24 @@ class economicCustomers extends economic_m
                 if (!$this->isMissingCurrencyPriceLookupError($exception)) {
                     throw $exception;
                 }
+                $swallowed_errors++;
+                error_log(sprintf(
+                    '[economicCustomers] Swallowed missing-currency-price error while resolving discount for customer %d product %d: %s',
+                    $customer_number,
+                    $product_number,
+                    $exception->getMessage()
+                ));
             }
         }
 
+        if ($attempted_products > 0 && $swallowed_errors === $attempted_products) {
+            error_log(sprintf(
+                '[economicCustomers] All %d invoice-line template probes failed with missing currency prices for customer %d; falling back to 0%% discount. Verify "economic_customer_discount_percentage" in e-conomic for this customer.',
+                $attempted_products,
+                $customer_number
+            ));
+        }
+
         return 0;
     }
 

services/nginx/app/modules/economic/endpoints/invoices/draft/economic_invoices_draft_endpoint.php

@@ -72,7 +72,7 @@ class economic_invoices_draft_endpoint
      * @return array{order_count:int,orders_with_invoice_lines:int,line_count:int,batch_count:int,batch_sizes:array<int,int>}
      * @throws Exception If the request fails
      */
-    public function add_orders(int $invoiceDraftId, array $orders, string $currency = 'DKK', int $line_batch_size = 500, bool $use_itemized_discounts = false): array
+    public function add_orders(int $invoiceDraftId, array $orders, string $currency = 'DKK', int $line_batch_size = 500, bool $use_itemized_discounts = false, int $customer_discount_percentage = 0): array
     {
         $draftInvoice = (new economic())->getInvoiceDraft($invoiceDraftId, strtoupper($currency), true);
         $orders_with_invoice_lines = 0;
@@ -89,8 +89,8 @@ class economic_invoices_draft_endpoint
             $orders_with_invoice_lines++;
             // Add the transaction header (Timestamp, department, etc.)
             $draftInvoice->addNewTransactionHeader($order);
-            // Add the order lines
-            $draftInvoice->addOrderItemLines($order, $use_itemized_discounts);
+            // Add the order lines (including the customer-level e-conomic discount, if any).
+            $draftInvoice->addOrderItemLines($order, $use_itemized_discounts, $customer_discount_percentage);
             // Add an empty line, so the invoice is not empty
             $draftInvoice->addTextLine('');
         }

services/nginx/app/modules/economic/helpers/economic_invoice_draft.php

@@ -249,7 +249,7 @@ class economic_invoice_draft
      * @throws Exception if the order is not found
      * @throws Exception if the order is not valid
      */
-    public function addOrderItemLines(orders_o $order, bool $use_itemized_discounts = false): void
+    public function addOrderItemLines(orders_o $order, bool $use_itemized_discounts = false, int $customer_discount_percentage = 0): void
     {
         // Get the order items
         $order_items = $order->getOrderItems($order->id);
@@ -268,18 +268,25 @@ class economic_invoice_draft
         });
         // Define the total discount applied to the order
         $total_discount = 0;
+        // Normalize the customer discount percentage (clamp to 0..100)
+        $customer_discount_percentage = max(0, min(100, $customer_discount_percentage));
+        // Force itemized discount mode when the customer has a global e-conomic discount
+        // so the discount is applied at the line level (e-conomic line API requires per-line
+        // discountPercentage; an aggregate TotDiscount line would be ignored when the
+        // customer does not have a per-line discount configured for the customer).
+        $effective_itemized_discounts = $use_itemized_discounts || $customer_discount_percentage > 0;
         // Loop through the order items
         foreach ( $order_items as $order_item ) {
             if ($this->shouldSkipOrderItemLine($order_item)) {
                 continue;
             }
             // Add the order item to the draft invoice
-            self::addOrderItemLine($order_item, $department, false, $use_itemized_discounts);
+            self::addOrderItemLine($order_item, $department, false, $effective_itemized_discounts, $customer_discount_percentage);
             // Add the line discount to the total discount
             $total_discount += ($order_item['product']['price'] - $order_item['price']) * $order_item['quantity'];
         }
         // If the total discount is greater than 0, add it to the invoice
-        if (!$use_itemized_discounts && $total_discount > 0) {
+        if (!$use_itemized_discounts && $customer_discount_percentage === 0 && $total_discount > 0) {
             // Add the discount to the invoice
             self::addProductDiscountLine($total_discount, $department['economic_department_id'] ?? 0, $department['dimension'] ?? 0);
         }
@@ -295,7 +302,7 @@ class economic_invoice_draft
      * @throws Exception if the order item is not found
      * @throws Exception if the order item is not valid
      */
-    public function addOrderItemLine(array $order_item, array $department, bool $show_discount = false, bool $use_itemized_discount = false): void
+    public function addOrderItemLine(array $order_item, array $department, bool $show_discount = false, bool $use_itemized_discount = false, int $customer_discount_percentage = 0): void
     {
         // Check if the order item is valid
         if (!isset($order_item['id'])) {
@@ -309,9 +316,18 @@ class economic_invoice_draft
         // Get the dimension id
         $economic_dimension_id = $department['economic_dimension_id'] ?? 0;
         $pricing = self::resolveOrderItemInvoicePricing($order_item);
-        $discount_percentage = $use_itemized_discount
+        // The customer discount (e.g. kd customer 35131752 with 15% global e-conomic discount)
+        // is applied at the line level. Combined with per-item discounts using max() so the
+        // biggest discount wins, and so we never accidentally apply a 15% discount on top of
+        // an already-discounted per-item price.
+        $customer_discount_percentage = max(0, min(100, $customer_discount_percentage));
+        $itemized_discount_percentage = $use_itemized_discount
             ? $this->resolveItemizedDiscountPercentageForInvoiceCurrency($pricing)
-            : 0;
+            : 0.0;
+        $discount_percentage = (float)max(
+            $itemized_discount_percentage,
+            (float)$customer_discount_percentage
+        );
         // Add the order item to the draft invoice
         self::addProductLine(
             (string)$order_item['product']['economic_product_id'],

services/nginx/app/objects/collected_order_invoices_o.php

@@ -725,6 +725,52 @@ class collected_order_invoices_o extends db
         return false;
     }
 
+    /**
+     * Resolve the e-conomic customer discount percentage that should be applied at the
+     * line level when building the invoice draft. Caches via Redis to avoid hammering
+     * the e-conomic templates endpoint on every draft sync.
+     */
+    private static function resolveCustomerDiscountPercentageForDraft(int $customer_number): int
+    {
+        if ($customer_number <= 0) {
+            return 0;
+        }
+
+        $user = (new users_o())->getUserByCustomerNumber($customer_number);
+        $userId = (int)$user->id;
+        if ($userId > 0 && defined('redis')) {
+            try {
+                $cached = constant('redis')->get_economic_customer_discount_percentage($userId);
+                if ($cached !== null) {
+                    return max(0, min(100, (int)$cached));
+                }
+            } catch (\Throwable $e) {
+                // Fall through to the live lookup.
+            }
+        }
+
+        try {
+            $discount = (int)(new \customers\economicCustomers())->getCustomerDiscountPercentage($customer_number);
+        } catch (\Throwable $e) {
+            error_log(sprintf(
+                '[collected_order_invoices_o] Failed to resolve e-conomic customer discount for customer %d: %s',
+                $customer_number,
+                $e->getMessage()
+            ));
+            return 0;
+        }
+
+        if ($userId > 0 && defined('redis')) {
+            try {
+                constant('redis')->cache_economic_customer_discount_percentage($userId, $discount);
+            } catch (\Throwable $e) {
+                // Cache failures are non-fatal.
+            }
+        }
+
+        return max(0, min(100, $discount));
+    }
+
     /**
      * Require the invoice draft to not already exist
      * @throws Exception If the request was not successful
@@ -964,7 +1010,18 @@ class collected_order_invoices_o extends db
                 break;
             }
         }
-        $metrics = (new economic())->invoices->draft->add_orders($draft_id, $order_objects, $currency, 500, $use_itemized_discounts);
+        // Look up the customer-level e-conomic discount (e.g. bug #11 customer 35131752
+        // "kd" 15%). This is applied at the line level so the draft invoice carries the
+        // discount percentage that e-conomic expects for the customer.
+        $customer_discount_percentage = self::resolveCustomerDiscountPercentageForDraft((int)$this->customer_number->value());
+        $metrics = (new economic())->invoices->draft->add_orders(
+            $draft_id,
+            $order_objects,
+            $currency,
+            500,
+            $use_itemized_discounts,
+            $customer_discount_percentage
+        );
         $this->last_economic_transfer_metrics = [
             'draft_invoice_id' => $draft_id,
             'currency' => (string)$currency,

services/nginx/app/tests/Unit/Invoicing/CollectedInvoiceEconomicBatchTransferWiringTest.php

@@ -14,7 +14,11 @@ it('routes collected invoice draft line uploads through the multi-order batch en
 
     $methodBlock = substr($content, (int)$start, (int)$end - (int)$start);
     expect($methodBlock)->toContain('$order_objects = [];')
-        ->and($methodBlock)->toContain('$metrics = (new economic())->invoices->draft->add_orders($draft_id, $order_objects, $currency, 500, $use_itemized_discounts);')
+        // Bug #11 customer 35131752 — the customer discount is threaded through add_orders
+        // so the line-level discountPercentage is applied to each line item.
+        ->and($methodBlock)->toContain('$customer_discount_percentage = self::resolveCustomerDiscountPercentageForDraft')
+        ->and($methodBlock)->toContain('$metrics = (new economic())->invoices->draft->add_orders(')
+        ->and($methodBlock)->toContain('$customer_discount_percentage')
         ->and($methodBlock)->toContain('...$metrics')
         ->and($methodBlock)->not->toContain('self::addInvoiceToDraft($order[\'id\'], true, $draft_id, $currency);');
 });
@@ -36,7 +40,7 @@ it('keeps single-order draft uploads as a wrapper around the batch endpoint', fu
 
     $batchBlock = substr($content, (int)$singleEnd);
     expect($batchBlock)->toContain('$draftInvoice->flushLinesInBatches($line_batch_size);')
-        ->and($batchBlock)->toContain('$draftInvoice->addOrderItemLines($order, $use_itemized_discounts);')
+        ->and($batchBlock)->toContain('$draftInvoice->addOrderItemLines($order, $use_itemized_discounts, $customer_discount_percentage);')
         ->and($batchBlock)->toContain("'orders_with_invoice_lines' => \$orders_with_invoice_lines");
 });
 
@@ -50,7 +54,7 @@ it('selects itemized discount mode for collected invoice batch transfers', funct
         ->and($content)->toContain('invoice_discount_layout')
         ->and($content)->toContain('hasDiscountedIncludedInvoiceItems')
         ->and($content)->toContain('orderItemHasBillableDiscount')
-        ->and($content)->toContain('$metrics = (new economic())->invoices->draft->add_orders($draft_id, $order_objects, $currency, 500, $use_itemized_discounts);');
+        ->and($content)->toContain('$customer_discount_percentage');
 });
 
 it('includes collected invoice batch transfer metrics in queue results when available', function (): void {

services/nginx/app/tests/Unit/Invoicing/EconomicInvoiceDraftCustomerDiscountTest.php

@@ -0,0 +1,182 @@
+<?php
+
+/**
+ * Tests for the e-conomic customer-level discount being applied at the line level.
+ *
+ * Regression coverage for bug #11 — E-conomic 15% discount not applied on
+ * customer 35131752 ("kd"). The customer has a 15% global discount configured in
+ * e-conomic, but the invoice was being sent without any discount on the line items.
+ *
+ * The fix threads the customer discount percentage through the draft builder so it
+ * is applied at the line level via the `discountPercentage` field that e-conomic
+ * expects on each line.
+ */
+
+app_require('modules/economic/helpers/economic_invoice_draft.php');
+
+use helpers\economic_invoice_draft;
+
+if (!class_exists('EconomicInvoiceDraftCustomerDiscountProbe')) {
+    class EconomicInvoiceDraftCustomerDiscountProbe extends economic_invoice_draft
+    {
+        public array $sentBatches = [];
+
+        public function __construct()
+        {
+            $this->draft_invoice_number = 35131752;
+            $this->currency = 'DKK';
+            $this->conversion_rate = 1.0;
+            $this->draft_invoice_data = (object)['draftInvoiceNumber' => 35131752];
+        }
+
+        protected function sendDraftLines(array $draft_lines): object
+        {
+            $this->sentBatches[] = $draft_lines;
+            return (object)['lines' => $draft_lines];
+        }
+    }
+}
+
+function economic_customer_discount_order_item(float $price, float $product_price, array $overrides = []): array
+{
+    return array_replace_recursive([
+        'id' => 9001,
+        'quantity' => 1,
+        'price' => $price,
+        'reference' => '',
+        'notes' => '',
+        'include_in_invoice' => true,
+        'product' => [
+            'economic_product_id' => '5',
+            'name' => 'Wash',
+            'price' => $product_price,
+        ],
+    ], $overrides);
+}
+
+it('applies the 15% customer discount to a line item for customer 35131752 "kd"', function (): void {
+    $draft = new EconomicInvoiceDraftCustomerDiscountProbe();
+
+    // Order item is at full price (no per-item discount) — exactly the customer 35131752
+    // case where the 15% global e-conomic discount was silently dropped.
+    $draft->addOrderItemLine(
+        economic_customer_discount_order_item(100.0, 100.0),
+        [
+            'economic_department_id' => 75,
+            'economic_dimension_id' => 1,
+        ],
+        false,
+        false,
+        15
+    );
+    $draft->flushLinesInBatches();
+
+    $line = $draft->sentBatches[0][0];
+    expect($line['product']['productNumber'])->toBe('5')
+        ->and($line['description'])->toBe('Wash')
+        ->and($line['quantity'])->toBe(1.0)
+        ->and($line['unitNetPrice'])->toBe(100.0)
+        ->and($line['discountPercentage'])->toBe(15.0);
+});
+
+it('uses the larger discount when both per-item and customer discounts are present', function (): void {
+    $draft = new EconomicInvoiceDraftCustomerDiscountProbe();
+
+    // Per-item discount = 10%, customer discount = 15% → max(15, 10) = 15.
+    $draft->addOrderItemLine(
+        economic_customer_discount_order_item(90.0, 100.0),
+        [
+            'economic_department_id' => 75,
+            'economic_dimension_id' => 1,
+        ],
+        false,
+        true,
+        15
+    );
+    $draft->flushLinesInBatches();
+
+    $line = $draft->sentBatches[0][0];
+    expect($line['unitNetPrice'])->toBe(100.0)
+        ->and($line['discountPercentage'])->toBe(15.0);
+});
+
+it('uses the per-item discount when it is larger than the customer discount', function (): void {
+    $draft = new EconomicInvoiceDraftCustomerDiscountProbe();
+
+    // Per-item discount = 25%, customer discount = 15% → max(25, 15) = 25.
+    $draft->addOrderItemLine(
+        economic_customer_discount_order_item(75.0, 100.0),
+        [
+            'economic_department_id' => 75,
+            'economic_dimension_id' => 1,
+        ],
+        false,
+        true,
+        15
+    );
+    $draft->flushLinesInBatches();
+
+    $line = $draft->sentBatches[0][0];
+    expect($line['unitNetPrice'])->toBe(100.0)
+        ->and($line['discountPercentage'])->toBe(25.0);
+});
+
+it('clamps the customer discount percentage to the 0..100 range', function (): void {
+    $draft = new EconomicInvoiceDraftCustomerDiscountProbe();
+
+    $draft->addOrderItemLine(
+        economic_customer_discount_order_item(100.0, 100.0),
+        [
+            'economic_department_id' => 75,
+            'economic_dimension_id' => 1,
+        ],
+        false,
+        false,
+        150
+    );
+    $draft->flushLinesInBatches();
+
+    $line = $draft->sentBatches[0][0];
+    expect($line['discountPercentage'])->toBe(100.0);
+});
+
+it('emits no line discount when both per-item and customer discounts are zero', function (): void {
+    $draft = new EconomicInvoiceDraftCustomerDiscountProbe();
+
+    $draft->addOrderItemLine(
+        economic_customer_discount_order_item(100.0, 100.0),
+        [
+            'economic_department_id' => 75,
+            'economic_dimension_id' => 1,
+        ],
+        false,
+        false,
+        0
+    );
+    $draft->flushLinesInBatches();
+
+    $line = $draft->sentBatches[0][0];
+    expect($line['unitNetPrice'])->toBe(100.0)
+        ->and($line['discountPercentage'])->toBe(0.0);
+});
+
+it('keeps base behavior unchanged when the customer discount is zero', function (): void {
+    $draft = new EconomicInvoiceDraftCustomerDiscountProbe();
+
+    // No customer discount, no per-item discount — unit price should be the final price.
+    $draft->addOrderItemLine(
+        economic_customer_discount_order_item(100.0, 100.0),
+        [
+            'economic_department_id' => 75,
+            'economic_dimension_id' => 1,
+        ],
+        false,
+        false,
+        0
+    );
+    $draft->flushLinesInBatches();
+
+    $line = $draft->sentBatches[0][0];
+    expect($line['unitNetPrice'])->toBe(100.0)
+        ->and($line['discountPercentage'])->toBe(0.0);
+});

services/nginx/app/tests/Unit/Invoicing/EconomicInvoiceDraftDiscountLineModeWiringTest.php

@@ -1,6 +1,6 @@
 <?php
 
-it('only adds TotDiscount aggregate line when itemized discounts are disabled', function (): void {
+it('only adds TotDiscount aggregate line when itemized discounts are disabled and no customer discount is set', function (): void {
     $content = file_get_contents(app_path('modules/economic/helpers/economic_invoice_draft.php'));
 
     expect($content)->not->toBeFalse();
@@ -13,7 +13,11 @@ it('only adds TotDiscount aggregate line when itemized discounts are disabled',
     expect($end)->toBeGreaterThan($start);
 
     $block = substr($content, (int)$start, (int)$end - (int)$start);
+    // The aggregate TotDiscount line is only added when neither itemized discounts
+    // nor a customer-level e-conomic discount is in effect. The customer discount
+    // (e.g. bug #11 customer 35131752 "kd" 15%) is applied at the line level instead.
     expect($block)
-        ->toContain('if (!$use_itemized_discounts && $total_discount > 0)')
+        ->toContain('if (!$use_itemized_discounts && $customer_discount_percentage === 0 && $total_discount > 0)')
         ->toContain('self::addProductDiscountLine($total_discount');
 });
+