Scope monthly invoice split endpoint

openapi.yaml

@@ -13388,6 +13388,7 @@ components:
         - expected
         - actual
         - data_collection_accepted
+        - screenshot
       properties:
         before_error:
           type: string
@@ -13403,11 +13404,10 @@ components:
           description: What actually happened
         data_collection_accepted:
           type: boolean
-          description: Required acceptance of collecting diagnostic error data and a screenshot when one can be attached
+          description: Required acceptance of collecting screenshot and diagnostic error data
         screenshot:
           type: string
-          nullable: true
-          description: Optional PNG, JPEG, or WebP data URI of the current app viewport. Reports are accepted without an attachment when capture or upload fails.
+          description: PNG, JPEG, or WebP data URI of the current app viewport
         route_path:
           type: string
           nullable: true
@@ -13518,7 +13518,6 @@ components:
           nullable: true
         screenshot:
           type: object
-          nullable: true
           additionalProperties: true
         answers:
           type: object

scripts/edge-gateway-e2e.mjs

@@ -928,20 +928,22 @@ async function main() {
       { timeoutMs: 20_000, message: "Browser shell never closed cleanly." }
     );
 
-    await waitForCondition(
-      async () => {
-        const logsAfterShell = await apiRequest(baseUrl, "GET", `/edge-gateways/${gatewayId}/logs`, {
-          token: authToken,
-        });
-        const shellTranscripts = Array.isArray(logsAfterShell?.data?.shell_sessions)
-          ? logsAfterShell.data.shell_sessions.map((session) => String(session?.transcript || ""))
-          : [];
-        const timelineMessages = collectMessages(logsAfterShell?.data?.timeline || []);
+    const logsAfterShell = await apiRequest(baseUrl, "GET", `/edge-gateways/${gatewayId}/logs`, {
+      token: authToken,
+    });
+    const shellTranscripts = Array.isArray(logsAfterShell?.data?.shell_sessions)
+      ? logsAfterShell.data.shell_sessions.map((session) => String(session?.transcript || ""))
+      : [];
 
-        return shellTranscripts.some((transcript) => transcript.includes("edge-e2e-shell"))
-          && timelineMessages.includes("GATEWAY_SHELL_SESSION_CLOSED");
-      },
-      { timeoutMs: 30_000, message: "Gateway logs page did not persist the shell transcript and close audit event." }
+    assert.ok(
+      shellTranscripts.some((transcript) => transcript.includes("edge-e2e-shell")),
+      "Gateway logs page did not persist the shell transcript."
+    );
+
+    const timelineMessages = collectMessages(logsAfterShell?.data?.timeline || []);
+    assert.ok(
+      timelineMessages.includes("GATEWAY_SHELL_SESSION_CLOSED"),
+      "Gateway logs page did not include the shell close audit event."
     );
 
     process.stdout.write("Edge gateway E2E smoke completed successfully.\n");

services/nginx/app/classes/customer_product_rule_service.php

@@ -1,158 +0,0 @@
-<?php
-
-namespace classes;
-
-use objects\orders_o;
-use objects\products_o;
-use objects\users_o;
-
-class customer_product_rule_service
-{
-    public const BLOCK_MESSAGE = 'This product is not allowed for the selected customer';
-
-    private const ADDON_CATEGORY_ID = 4;
-    private const TANK_CLEANING_CATEGORY_ID = 5;
-
-    /**
-     * @return array{rule:string,message:string}|null
-     */
-    public function firstViolationForOrderItem(int $orderId, int $productId, ?int $relatedItemId): ?array
-    {
-        $order = (new orders_o())->getOrderById($orderId);
-        if (!$order->exists()) {
-            return null;
-        }
-
-        $product = (new products_o())->getProductById($productId);
-        if (!$product->exists()) {
-            return null;
-        }
-
-        $customer = (new users_o())->getUserByCustomerNumber((int)$order->customer_id->value());
-        if (!$customer->exists()) {
-            return null;
-        }
-
-        $categoryId = (int)$product->category->value();
-        $categoryName = $this->categoryName($categoryId);
-        $searchableProduct = $this->searchableProductText($product, $categoryName);
-        $isTankCleaningProduct = $this->isTankCleaningProduct($categoryId, $searchableProduct);
-
-        if ($customer->doesUserHaveAttribute('restrictAdditionalServices')
-            && $this->isAdditionalServiceProduct($orderId, $relatedItemId, $categoryId, $searchableProduct)) {
-            return $this->violation('restrictAdditionalServices');
-        }
-
-        if ($customer->doesUserHaveAttribute('restrictTankCleaning') && $isTankCleaningProduct) {
-            return $this->violation('restrictTankCleaning');
-        }
-
-        if ($customer->doesUserHaveAttribute('onlyTankCleaning') && !$isTankCleaningProduct) {
-            return $this->violation('onlyTankCleaning');
-        }
-
-        if ($customer->doesUserHaveAttribute('restrictSpotFree')
-            && $this->containsAny($searchableProduct, ['spot free', 'spotfree'])) {
-            return $this->violation('restrictSpotFree');
-        }
-
-        if ($customer->doesUserHaveAttribute('restrictInteriorCleaning')
-            && $this->containsAny($searchableProduct, ['interior', 'indvendig'])) {
-            return $this->violation('restrictInteriorCleaning');
-        }
-
-        return null;
-    }
-
-    /**
-     * @return array{rule:string,message:string}
-     */
-    private function violation(string $rule): array
-    {
-        return [
-            'rule' => $rule,
-            'message' => self::BLOCK_MESSAGE,
-        ];
-    }
-
-    private function isAdditionalServiceProduct(int $orderId, ?int $relatedItemId, int $categoryId, string $searchableProduct): bool
-    {
-        if ($relatedItemId !== null && $relatedItemId > 0) {
-            return true;
-        }
-
-        if ($categoryId === self::ADDON_CATEGORY_ID) {
-            return true;
-        }
-
-        if ($this->containsAny($searchableProduct, ['add-on', 'add on', 'addon', 'tilvalg'])) {
-            return true;
-        }
-
-        return $this->countStandaloneOrderItems($orderId) > 0;
-    }
-
-    private function isTankCleaningProduct(int $categoryId, string $searchableProduct): bool
-    {
-        if ($categoryId === self::TANK_CLEANING_CATEGORY_ID) {
-            return true;
-        }
-
-        return $this->containsAny($searchableProduct, ['tank cleaning', 'tankcleaning', 'tankrens', 'tank rens']);
-    }
-
-    private function searchableProductText(products_o $product, string $categoryName): string
-    {
-        return strtolower(trim((string)$product->name->value() . ' ' . $categoryName));
-    }
-
-    /**
-     * @param array<int, string> $terms
-     */
-    private function containsAny(string $value, array $terms): bool
-    {
-        foreach ($terms as $term) {
-            if ($term !== '' && str_contains($value, $term)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private function categoryName(int $categoryId): string
-    {
-        global $db;
-
-        if ($categoryId <= 0) {
-            return '';
-        }
-
-        $result = $db->query('SELECT name FROM categories WHERE id = ' . $categoryId . ' LIMIT 1');
-        if (!$result || $result->num_rows === 0) {
-            return '';
-        }
-
-        $row = $result->fetch_assoc();
-        return strtolower((string)($row['name'] ?? ''));
-    }
-
-    private function countStandaloneOrderItems(int $orderId): int
-    {
-        global $db;
-
-        $result = $db->query(
-            'SELECT COUNT(*) AS item_count
-             FROM order_items
-             WHERE order_id = ' . $orderId . '
-               AND deleted_at IS NULL
-               AND (related_item_id IS NULL OR related_item_id = 0)'
-        );
-        if (!$result) {
-            return 0;
-        }
-
-        $row = $result->fetch_assoc();
-        return (int)($row['item_count'] ?? 0);
-    }
-}

services/nginx/app/classes/departments_schema_bootstrap.php

@@ -34,14 +34,6 @@ class departments_schema_bootstrap
             );
         }
 
-        if (!self::columnExists($db, 'departments', 'custom_pricing_only')) {
-            $db->query(
-                "ALTER TABLE departments
-                    ADD COLUMN custom_pricing_only TINYINT(1) NOT NULL DEFAULT 0
-                    AFTER archived"
-            );
-        }
-
         if (!self::indexExists($db, 'departments', self::ARCHIVED_INDEX)) {
             $db->query(
                 "ALTER TABLE departments

services/nginx/app/classes/error_report_service.php

@@ -92,17 +92,12 @@ class error_report_service
             throw new RuntimeException('Data collection acceptance is required.');
         }
 
+        $screenshot = self::decodeScreenshotDataUri((string)($payload['screenshot'] ?? ''));
+        $storedScreenshot = $this->store->storeScreenshot($screenshot['mime_type'], $screenshot['contents']);
         $context = is_array($payload['context'] ?? null) ? $payload['context'] : [];
-        $storedScreenshot = $this->storeOptionalScreenshot($payload['screenshot'] ?? null, $context);
         $requestErrors = $this->boundedArray($payload['request_errors'] ?? ($context['request_errors'] ?? []), 25);
         $vueErrors = $this->boundedArray($payload['vue_errors'] ?? ($context['vue_errors'] ?? []), 25);
         $runtimeContext = $this->runtimeContext($payload, $context);
-        $runtimeContext['screenshot_attachment'] = [
-            'status' => $storedScreenshot['status'],
-            'attached' => $storedScreenshot['key'] !== '',
-            'mime_type' => $storedScreenshot['mime_type'] !== '' ? $storedScreenshot['mime_type'] : null,
-            'size_bytes' => (int)$storedScreenshot['size_bytes'],
-        ];
 
         $this->execute(
             "INSERT INTO error_reports (
@@ -300,67 +295,6 @@ class error_report_service
         return $value === true || $value === 1 || $value === '1' || $value === 'true';
     }
 
-    private function storeOptionalScreenshot(mixed $value, array $context): array
-    {
-        if (!is_scalar($value) && !$value instanceof \Stringable && $value !== null) {
-            return $this->emptyScreenshotAttachment('invalid');
-        }
-
-        $dataUri = trim((string)($value ?? ''));
-        if ($dataUri === '') {
-            return $this->emptyScreenshotAttachment($this->contextScreenshotStatus($context) ?? 'not_provided');
-        }
-
-        try {
-            $screenshot = self::decodeScreenshotDataUri($dataUri);
-        } catch (RuntimeException $exception) {
-            $message = strtolower($exception->getMessage());
-            return $this->emptyScreenshotAttachment(str_contains($message, 'too large') ? 'too_large' : 'invalid');
-        }
-
-        try {
-            $storedScreenshot = $this->store->storeScreenshot($screenshot['mime_type'], $screenshot['contents']);
-        } catch (Throwable) {
-            return $this->emptyScreenshotAttachment('storage_failed');
-        }
-
-        return [
-            'key' => (string)($storedScreenshot['key'] ?? ''),
-            'mime_type' => (string)($storedScreenshot['mime_type'] ?? $screenshot['mime_type']),
-            'size_bytes' => (int)($storedScreenshot['size_bytes'] ?? $screenshot['size_bytes']),
-            'status' => 'stored',
-        ];
-    }
-
-    private function emptyScreenshotAttachment(string $status): array
-    {
-        return [
-            'key' => '',
-            'mime_type' => '',
-            'size_bytes' => 0,
-            'status' => $status,
-        ];
-    }
-
-    private function contextScreenshotStatus(array $context): ?string
-    {
-        $attachment = $context['screenshot_attachment'] ?? null;
-        $status = is_array($attachment) ? ($attachment['status'] ?? null) : null;
-        $status ??= $context['screenshot_capture_status'] ?? $context['screenshot_status'] ?? null;
-
-        return $this->normalizeEmptyScreenshotStatus($status);
-    }
-
-    private function normalizeEmptyScreenshotStatus(mixed $status): ?string
-    {
-        $status = strtolower(trim((string)$status));
-        if (in_array($status, ['capture_failed', 'not_provided'], true)) {
-            return $status;
-        }
-
-        return null;
-    }
-
     private function runtimeContext(array $payload, array $context): array
     {
         return [
@@ -498,10 +432,6 @@ class error_report_service
 
     private function publicReport(array $row, bool $includeDetail): array
     {
-        $screenshotMimeType = trim((string)($row['screenshot_mime_type'] ?? ''));
-        $screenshotSizeBytes = isset($row['screenshot_size_bytes']) ? (int)$row['screenshot_size_bytes'] : 0;
-        $hasScreenshot = $screenshotMimeType !== '' && $screenshotSizeBytes > 0;
-
         $report = [
             'id' => (int)$row['id'],
             'status' => (string)$row['status'],
@@ -519,10 +449,10 @@ class error_report_service
             'release_trace_id' => $row['release_trace_id'] ?? null,
             'frontend_version' => $row['frontend_version'] ?? null,
             'api_version' => $row['api_version'] ?? null,
-            'screenshot' => $hasScreenshot ? [
-                'mime_type' => $screenshotMimeType,
-                'size_bytes' => $screenshotSizeBytes,
-            ] : null,
+            'screenshot' => [
+                'mime_type' => $row['screenshot_mime_type'] ?? null,
+                'size_bytes' => isset($row['screenshot_size_bytes']) ? (int)$row['screenshot_size_bytes'] : 0,
+            ],
             'answers' => [
                 'before_error' => $row['before_error'] ?? '',
                 'expected' => $row['expected'] ?? '',
@@ -537,11 +467,8 @@ class error_report_service
         ];
 
         if ($includeDetail) {
-            if ($hasScreenshot) {
-                $objectKey = trim((string)($row['screenshot_object_key'] ?? ''));
-                $report['screenshot']['url'] = $this->store->screenshotUrl($objectKey);
-                $report['screenshot']['object_key'] = $objectKey !== '' ? $objectKey : null;
-            }
+            $report['screenshot']['url'] = $this->store->screenshotUrl((string)($row['screenshot_object_key'] ?? ''));
+            $report['screenshot']['object_key'] = $row['screenshot_object_key'] ?? null;
             $report['request_errors'] = $this->jsonDecode($row['request_errors_json'] ?? null);
             $report['vue_errors'] = $this->jsonDecode($row['vue_errors_json'] ?? null);
             $report['runtime_context'] = $this->jsonDecode($row['runtime_context_json'] ?? null);

services/nginx/app/classes/invoice_period_flag_service.php

@@ -688,7 +688,6 @@ class invoice_period_flag_service
                 o.po AS order_po,
                 o.notes AS order_notes,
                 o.department_id,
-                d.custom_pricing_only AS department_custom_pricing_only,
                 o.reg_1,
                 o.invoice_collection_id,
                 o.wash_id,
@@ -721,7 +720,6 @@ class invoice_period_flag_service
                 GROUP BY customer_number
             ) u ON u.customer_number = o.customer_id
             LEFT JOIN order_items oi ON oi.order_id = o.id AND (oi.deleted_at IS NULL OR oi.deleted_at = '')
-            LEFT JOIN departments d ON d.id = o.department_id
             LEFT JOIN products p ON p.id = oi.product_id
             LEFT JOIN categories c ON c.id = p.category
             LEFT JOIN product_department_prices pdp ON pdp.department_id = o.department_id AND pdp.product_id = p.id
@@ -1923,26 +1921,19 @@ class invoice_period_flag_service
 
     private function calculateExpectedPrice(array $row): int
     {
-        $customMissingPrice = $this->isCustomMissingDepartmentPrice($row);
-        $base = $row['department_price'] !== null
-            ? (int)$row['department_price']
-            : ($customMissingPrice ? \objects\products_o::CUSTOM_PRICING_MISSING_PRICE : (int)($row['product_base_price'] ?? 0));
-        $discount = $customMissingPrice ? 0 : $this->discountBreakdown($row)['applied_discount_percentage'];
+        $base = $row['department_price'] !== null ? (int)$row['department_price'] : (int)($row['product_base_price'] ?? 0);
+        $discount = $this->discountBreakdown($row)['applied_discount_percentage'];
         return (int)round($base * (1 - ($discount / 100)));
     }
 
     private function priceBreakdown(array $row, int $expected): array
     {
         $departmentPrice = $row['department_price'] !== null ? (int)$row['department_price'] : null;
-        $customMissingPrice = $this->isCustomMissingDepartmentPrice($row);
-        $base = $departmentPrice ?? ($customMissingPrice ? \objects\products_o::CUSTOM_PRICING_MISSING_PRICE : (int)($row['product_base_price'] ?? 0));
+        $base = $departmentPrice ?? (int)($row['product_base_price'] ?? 0);
         $discount = $this->discountBreakdown($row);
-        if ($customMissingPrice) {
-            $discount['applied_discount_percentage'] = 0;
-        }
 
         return [
-            'product_price' => $customMissingPrice ? \objects\products_o::CUSTOM_PRICING_MISSING_PRICE : (int)($row['product_base_price'] ?? 0),
+            'product_price' => (int)($row['product_base_price'] ?? 0),
             'department_price' => $departmentPrice,
             'effective_base_price' => $base,
             'product_discount_percentage' => $discount['product_discount_percentage'],
@@ -1953,11 +1944,6 @@ class invoice_period_flag_service
         ];
     }
 
-    private function isCustomMissingDepartmentPrice(array $row): bool
-    {
-        return $row['department_price'] === null && (bool)(int)($row['department_custom_pricing_only'] ?? 0);
-    }
-
     private function discountBreakdown(array $row): array
     {
         $productDiscount = (int)($row['product_discount_percentage'] ?? 0);

services/nginx/app/classes/limited_backoffice_service.php

@@ -3,7 +3,6 @@
 namespace classes;
 
 use mysqli;
-use objects\products_o;
 use objects\users_o;
 
 class limited_backoffice_service
@@ -248,7 +247,6 @@ class limited_backoffice_service
 
     public function __construct()
     {
-        departments_schema_bootstrap::ensureTables();
         limited_backoffice_schema_bootstrap::ensureTables();
     }
 
@@ -358,7 +356,7 @@ class limited_backoffice_service
 
         $in = implode(',', array_map('intval', $departmentIds));
         $sql = "
-            SELECT `id`, `name`, `description`, `visible`, `archived`, `custom_pricing_only`
+            SELECT `id`, `name`, `description`, `visible`, `archived`
             FROM `departments`
             WHERE `id` IN ($in)
             ORDER BY `order_priority` ASC, `name` ASC, `id` ASC
@@ -373,7 +371,6 @@ class limited_backoffice_service
             'description' => (string)($row['description'] ?? ''),
             'visible' => (bool)($row['visible'] ?? false),
             'archived' => (bool)($row['archived'] ?? false),
-            'custom_pricing_only' => (bool)(int)($row['custom_pricing_only'] ?? 0),
         ], $rows);
     }
 
@@ -389,9 +386,8 @@ class limited_backoffice_service
             throw new limited_backoffice_exception('Department not found', 404);
         }
 
-        $customPricingOnly = (bool)($department['custom_pricing_only'] ?? false);
-        $catalog = $this->departmentProductCatalog($departmentId, $customPricingOnly);
-        if (!$customPricingOnly && $catalog['missing_products'] !== []) {
+        $catalog = $this->departmentProductCatalog($departmentId);
+        if ($catalog['missing_products'] !== []) {
             throw new limited_backoffice_exception('Department price setup is incomplete.', 409, [
                 'message' => 'Department price setup is incomplete.',
                 'code' => 'department_price_setup_required',
@@ -423,8 +419,7 @@ class limited_backoffice_service
             throw new limited_backoffice_exception('Department not found', 404);
         }
 
-        $customPricingOnly = (bool)($department['custom_pricing_only'] ?? false);
-        $catalog = $this->departmentProductCatalog($departmentId, $customPricingOnly);
+        $catalog = $this->departmentProductCatalog($departmentId);
         if ($catalog['required_product_ids'] === []) {
             throw new limited_backoffice_exception('Department has no products configured.', 409);
         }
@@ -441,7 +436,7 @@ class limited_backoffice_service
         sort($providedProductIds);
         $missingProductIds = array_values(array_diff($requiredProductIds, $providedProductIds));
 
-        if (!$customPricingOnly && $missingProductIds !== []) {
+        if ($missingProductIds !== []) {
             throw new limited_backoffice_exception('Price is required for every department product.', 400, [
                 'message' => 'Price is required for every department product.',
                 'missing_product_ids' => $missingProductIds,
@@ -794,13 +789,13 @@ class limited_backoffice_service
     }
 
     /**
-     * @return array{id:int,name:string,description:string,custom_pricing_only:bool}
+     * @return array{id:int,name:string,description:string}
      */
     private function fetchDepartment(int $departmentId): ?array
     {
         global $db;
         $statement = $this->mysqli()->prepare(
-            'SELECT `id`, `name`, `description`, `custom_pricing_only` FROM `departments` WHERE `id` = ? LIMIT 1'
+            'SELECT `id`, `name`, `description` FROM `departments` WHERE `id` = ? LIMIT 1'
         );
         if ($statement === false) {
             throw new limited_backoffice_exception('Unable to load department.', 500);
@@ -819,14 +814,13 @@ class limited_backoffice_service
             'id' => (int)$row['id'],
             'name' => (string)$row['name'],
             'description' => (string)($row['description'] ?? ''),
-            'custom_pricing_only' => (bool)(int)($row['custom_pricing_only'] ?? 0),
         ];
     }
 
     /**
      * @return array{categories:array<int,array<string,mixed>>,missing_products:array<int,array<string,mixed>>,required_product_ids:array<int,int>}
      */
-    private function departmentProductCatalog(int $departmentId, bool $customPricingOnly = false): array
+    private function departmentProductCatalog(int $departmentId): array
     {
         global $db;
 
@@ -887,12 +881,10 @@ class limited_backoffice_service
                 'id' => $productId,
                 'name' => (string)$row['product_name'],
                 'description' => (string)($row['product_description'] ?? ''),
-                'price' => $row['department_price'] === null
-                    ? ($customPricingOnly ? products_o::CUSTOM_PRICING_MISSING_PRICE : null)
-                    : (int)$row['department_price'],
+                'price' => $row['department_price'] === null ? null : (int)$row['department_price'],
             ];
 
-            if ($row['department_price_id'] === null && !$customPricingOnly) {
+            if ($row['department_price_id'] === null) {
                 $missing[] = [
                     'id' => $productId,
                     'name' => (string)$row['product_name'],

services/nginx/app/objects/departments_o.php

@@ -22,7 +22,6 @@ class departments_o extends db
     public object_property $dimension; // The dimension of the department
     public object_property $visible; // The visibility of the department
     public object_property $archived; // Whether the department is archived
-    public object_property $custom_pricing_only; // Whether missing department prices must not fall back to defaults
     public object_property $branding; // The branding of the department
     public object_property $longitude; // The longitude of the department (Can be null)
     public object_property $latitude; // The latitude of the department (Can be null)
@@ -108,7 +107,6 @@ class departments_o extends db
         $this->branding = new object_property($this->table, $this->id, 'branding', 'int', false);
         $this->visible = new object_property($this->table, $this->id, 'visible', 'int', false);
         $this->archived = new object_property($this->table, $this->id, 'archived', 'boolean', false);
-        $this->custom_pricing_only = new object_property($this->table, $this->id, 'custom_pricing_only', 'boolean', false);
         $this->longitude = new object_property($this->table, $this->id, 'longitude', 'float', false);
         $this->latitude = new object_property($this->table, $this->id, 'latitude', 'float', false);
         $this->order_priority = new object_property($this->table, $this->id, 'order_priority', 'int', false);
@@ -187,12 +185,6 @@ class departments_o extends db
         return $department;
     }
 
-    public function isCustomPricingOnly(int $department_id): bool
-    {
-        $department = $this->getDepartmentById($department_id);
-        return (bool)(int)($department['custom_pricing_only'] ?? 0);
-    }
-
     /**
      * Get the price of a product in a department
      * @param int $department_id

services/nginx/app/objects/order_items_o.php

@@ -168,14 +168,12 @@ class order_items_o extends db
             // Get the order
             $order = (new orders_o())->getOrderById($order_id);
             // Get the product price
-            $product = (new products_o())->getProductById($product_id);
-            $priceResolution = $product->getDepartmentPriceResolution((int)$order->department_id->value());
-            $price = $priceResolution['price'];
+            $price = (new products_o())->getProductById($product_id)->getDepartmentPrice((int)$order->department_id->value());
 
             // Check if the user has a discount on the product, or category
             $customer = (new orders_o())->getOrderCustomer($order_id);
             $discount = $customer->getCustomPrice($product_id, false);
-            if ($discount && !products_o::priceResolutionIsCustomMissing($priceResolution)) {
+            if ($discount) {
                 $price = $price - ($price * $discount / 100);
             }
 
@@ -356,4 +354,4 @@ class order_items_o extends db
     {
         return (new products_o())->select((int)$this->product_id->value());
     }
-}
+}

services/nginx/app/objects/orders_o.php

@@ -1428,8 +1428,7 @@ class orders_o extends db
             $order_item->product_id->set((int)$product->id); // Set the product ID to the product ID from the wash item
             $order_item->reference->set('');
             // Get the product price based on the department
-            $priceResolution = $product->getDepartmentPriceResolution((int)$this->department_id->value());
-            $product_price = (int)$priceResolution['price']; // Get the department price for the product
+            $product_price = (int)$product->getDepartmentPrice((int)$this->department_id->value()); // Get the department price for the product
             // Get the customers custom price discount percentage
             $user = $xlvask_usage_log->getUser(); // Get the user from the usage log
             if (!$user->exists()) {
@@ -1437,9 +1436,7 @@ class orders_o extends db
             }
             $product_price_discount_percentage = (int)$user->getProductDiscountPercentage((int)$order_item->product_id->value()); // Get the custom price discount percentage for the product
             // Apply the discount percentage to the product price
-            if (!products_o::priceResolutionIsCustomMissing($priceResolution)) {
-                $product_price = (int)round($product_price * (1 - ($product_price_discount_percentage / 100))); // Apply the discount percentage to the product price
-            }
+            $product_price = (int)round($product_price * (1 - ($product_price_discount_percentage / 100))); // Apply the discount percentage to the product price
             $order_item->notes->set(null); // Set notes for the simulated order item
             $order_item->price->set((int)$product_price); // Set the price based on the product price and discount percentage
             $order_item->quantity->set((int)$washItem->Count); // Set the quantity based on the wash item
@@ -1506,14 +1503,10 @@ class orders_o extends db
         if (!$current_user->exists()) {
             throw new Exception('No current user found');
         }
-        $priceResolution = $product->getDepartmentPriceResolution((int)$this->department_id->value());
-        $price = (int)$priceResolution['price']; // Get the department price for the product
+        $price = (int)$product->getDepartmentPrice((int)$this->department_id->value()); // Get the department price for the product
         $discount_percentage = (int)$current_user->getProductDiscountPercentage((int)$product->id); // Get the custom price discount percentage for the product
         // Apply the discount percentage to the product price
         // Apply the discount percentage to the product price
-        if (products_o::priceResolutionIsCustomMissing($priceResolution)) {
-            return $price;
-        }
         return (int)round($price * (1 - ($discount_percentage / 100)));
     }
 
@@ -1596,17 +1589,13 @@ class orders_o extends db
             $product_id = (int)$item['product_id'];
             if (!isset($department_price_cache[$product_id])) {
                 $product = (new products_o())->select($product_id);
-                $department_price_cache[$product_id] = $product->getDepartmentPriceResolution($department_id);
+                $department_price_cache[$product_id] = (int)$product->getDepartmentPrice($department_id);
             }
             if ($tmp_user === null) {
                 $tmp_user = (new users_o())->getUserByCustomerNumber((int)$this->customer_id->value());
             }
             $discount = $tmp_user->getCustomPrice($product_id, false);
-            $unitPrice = (int)$department_price_cache[$product_id]['price'];
-            if (!products_o::priceResolutionIsCustomMissing($department_price_cache[$product_id])) {
-                $unitPrice = (int)round($unitPrice * (1 - ($discount / 100)));
-            }
-            $post_discount = $unitPrice * $quantity;
+            $post_discount = (int)round($department_price_cache[$product_id] * (1 - ($discount / 100))) * $quantity;
             $total += $post_discount;
         }
 

services/nginx/app/objects/products_o.php

@@ -13,11 +13,6 @@ class products_o extends db
 
     public const EXTRAORDINARY_CHEMISTRY_PRODUCT_ID = 27;
     public const EXTRAORDINARY_CHEMISTRY_PRODUCT_NAME = 'Ekstraordinær pr. 10 min inkl. kemi';
-    public const CUSTOM_PRICING_MISSING_PRICE = 999999;
-    public const PRICE_SOURCE_DEPARTMENT = 'department';
-    public const PRICE_SOURCE_DEFAULT = 'default';
-    public const PRICE_SOURCE_CUSTOM_MISSING = 'custom_missing';
-    public const PRICE_SOURCE_KEY = '_department_price_source';
 
     /**
      * The name of the product
@@ -260,41 +255,24 @@ class products_o extends db
      * @param int $department_id
      * @return array
      */
-    public function applyDepartmentPricing(array $products, int $department_id, bool $includePriceSource = false): array
+    public function applyDepartmentPricing(array $products, int $department_id): array
     {
         global $db;
         $department_id = $db->escape_string($department_id);
         $sql = "SELECT * FROM product_department_prices WHERE department_id = $department_id";
         $result = $db->query($sql);
         $prices = $db->fetch_all($result);
-        $priceLookup = [];
-        foreach ($prices as $price) {
-            $priceLookup[(int)$price['product_id']] = (int)$price['price'];
-        }
-
-        $customPricingOnly = (new departments_o())->isCustomPricingOnly((int)$department_id);
         foreach ( $products as $key => $product ) {
-            $productId = (int)($product['id'] ?? 0);
-            $source = self::PRICE_SOURCE_DEFAULT;
-            if (array_key_exists($productId, $priceLookup)) {
-                $products[$key]['price'] = $priceLookup[$productId];
-                $source = self::PRICE_SOURCE_DEPARTMENT;
-            } elseif ($customPricingOnly) {
-                $products[$key]['price'] = self::CUSTOM_PRICING_MISSING_PRICE;
-                $source = self::PRICE_SOURCE_CUSTOM_MISSING;
-            }
-
-            if ($includePriceSource) {
-                $products[$key][self::PRICE_SOURCE_KEY] = $source;
+            foreach ( $prices as $price ) {
+                if ((int)$product['id'] === (int)$price['product_id']) {
+                    $products[$key]['price'] = $price['price'];
+                }
             }
         }
         return $products;
     }
 
-    /**
-     * @return array{price:int,source:string}
-     */
-    public function getDepartmentPriceResolution(int $department_id): array
+    public function getDepartmentPrice(int $department_id): int
     {
         global $db;
         $department_id = $db->escape_string($department_id);
@@ -303,27 +281,10 @@ class products_o extends db
         $prices = $db->fetch_all($result);
         // Check if the product has a department price
         if (count($prices) > 0) {
-            return [
-                'price' => (int)$prices[0]['price'],
-                'source' => self::PRICE_SOURCE_DEPARTMENT,
-            ];
-        }
-        if ((new departments_o())->isCustomPricingOnly((int)$department_id)) {
-            return [
-                'price' => self::CUSTOM_PRICING_MISSING_PRICE,
-                'source' => self::PRICE_SOURCE_CUSTOM_MISSING,
-            ];
+            return $prices[0]['price'];
         }
         // Return the default price
-        return [
-            'price' => (int)$this->price->value(),
-            'source' => self::PRICE_SOURCE_DEFAULT,
-        ];
-    }
-
-    public function getDepartmentPrice(int $department_id): int
-    {
-        return $this->getDepartmentPriceResolution($department_id)['price'];
+        return $this->price->value();
     }
 
     public function applyCustomerDiscounts(array $products, users_o $customer): array
@@ -342,26 +303,12 @@ class products_o extends db
         // Get the customer's discount percentage
         $discount_percentage = $customer->getProductDiscountPercentage($product['id']);
         // Apply the discount to the product price
-        if ($discount_percentage > 0 && ($product[self::PRICE_SOURCE_KEY] ?? null) !== self::PRICE_SOURCE_CUSTOM_MISSING) {
+        if ($discount_percentage > 0) {
             $product['price'] = (int)(round($product['price'] * (1 - ($discount_percentage / 100))));
         }
-        unset($product[self::PRICE_SOURCE_KEY]);
         return $product;
     }
 
-    public static function stripDepartmentPriceSources(array $products): array
-    {
-        return array_map(static function (array $product): array {
-            unset($product[self::PRICE_SOURCE_KEY]);
-            return $product;
-        }, $products);
-    }
-
-    public static function priceResolutionIsCustomMissing(array $resolution): bool
-    {
-        return ($resolution['source'] ?? null) === self::PRICE_SOURCE_CUSTOM_MISSING;
-    }
-
     public function getSubscriptionMonthlyPrice(): int
     {
         // Subscription price (for 2 washes per month) is 1.2 times the normal price

services/nginx/app/openapi.yaml

@@ -13388,6 +13388,7 @@ components:
         - expected
         - actual
         - data_collection_accepted
+        - screenshot
       properties:
         before_error:
           type: string
@@ -13403,11 +13404,10 @@ components:
           description: What actually happened
         data_collection_accepted:
           type: boolean
-          description: Required acceptance of collecting diagnostic error data and a screenshot when one can be attached
+          description: Required acceptance of collecting screenshot and diagnostic error data
         screenshot:
           type: string
-          nullable: true
-          description: Optional PNG, JPEG, or WebP data URI of the current app viewport. Reports are accepted without an attachment when capture or upload fails.
+          description: PNG, JPEG, or WebP data URI of the current app viewport
         route_path:
           type: string
           nullable: true
@@ -13518,7 +13518,6 @@ components:
           nullable: true
         screenshot:
           type: object
-          nullable: true
           additionalProperties: true
         answers:
           type: object

services/nginx/app/routes/InvoicingPeriodRoute.php

@@ -1730,16 +1730,12 @@ class InvoicingPeriodRoute
                             $product_cache[$product_id] = (new products_o())->select($product_id);
                         }
                         if (!isset($department_price_cache[$department_id][$product_id])) {
-                            $department_price_cache[$department_id][$product_id] = $product_cache[$product_id]->getDepartmentPriceResolution($department_id);
+                            $department_price_cache[$department_id][$product_id] = (int)$product_cache[$product_id]->getDepartmentPrice($department_id);
                         }
                         if (!array_key_exists($product_id, $discount_cache)) {
                             $discount_cache[$product_id] = $user->getCustomPrice($product_id, false);
                         }
-                        $unit_price = (int)$department_price_cache[$department_id][$product_id]['price'];
-                        if (!products_o::priceResolutionIsCustomMissing($department_price_cache[$department_id][$product_id])) {
-                            $unit_price = (int)round($unit_price * (1 - ($discount_cache[$product_id] / 100)));
-                        }
-                        $post_discount = $unit_price * $quantity;
+                        $post_discount = (int)round($department_price_cache[$department_id][$product_id] * (1 - ($discount_cache[$product_id] / 100))) * $quantity;
                         $transaction_original_prices[$order_id] = (int)(($transaction_original_prices[$order_id] ?? 0) + $post_discount);
                     }
 

services/nginx/app/routes/departmentsRoute.php

@@ -103,7 +103,6 @@ class departmentsRoute
                             'economic_department_id',
                             'visible',
                             'archived',
-                            'custom_pricing_only',
                             'longitude',
                             'latitude',
                         ])
@@ -124,12 +123,6 @@ class departmentsRoute
                                     'latitude' => (float)$department['latitude'],
                                     'order_priority' => (int)$department['order_priority'],
                                 ];
-                                if (
-                                    $user->hasPermission('superuser_fetch_department')
-                                    || $user->hasPermission('edit_department')
-                                ) {
-                                    $tmp_department['custom_pricing_only'] = (bool)(int)($department['custom_pricing_only'] ?? 0);
-                                }
                                 // If the user has the permission to view the slack webhook, add it to the response
                                 if ($user->hasPermission('view_slack_webhook')) {
                                     $tmp_department['slack_webhook'] = $department['slack_webhook'];
@@ -227,9 +220,6 @@ class departmentsRoute
                 if (self::isParametersSet(['archived'])) {
                     $department->archived->set(self::isTruthyBooleanValue(self::getParameter('archived')));
                 }
-                if (self::isParametersSet(['custom_pricing_only'])) {
-                    $department->custom_pricing_only->set(self::isTruthyBooleanValue(self::getParameter('custom_pricing_only')));
-                }
                 $department->objectChanged();
                 // Log the incident
                 (new logs_o())->add('departments', (int)self::getParameter('id'), 1, $user->id, 'EDIT_DEPARTMENT', 'Successfully edited a department');

services/nginx/app/routes/orderInvoicesRoute.php

@@ -612,21 +612,46 @@ class orderInvoicesRoute
                     $preview ? 'User previewed splitting collected order invoices by month' : 'User split collected order invoices by order month'
                 );
 
-                $date_from = $db->escape_string($date_range['dateFrom']);
-                $date_to = $db->escape_string($date_range['dateTo']);
-                $sql = "SELECT DISTINCT invoice_collection_id
-                        FROM orders
-                        WHERE created_at BETWEEN '$date_from' AND '$date_to'
-                        AND invoice_collection_id IS NOT NULL
-                        AND invoice_collection_id > 0
-                        AND deleted_at IS NULL";
-                $query_result = $db->query($sql);
                 $invoice_collection_ids = [];
-                while ($row = $query_result->fetch_assoc()) {
-                    $invoice_collection_id = (int)($row['invoice_collection_id'] ?? 0);
-                    if ($invoice_collection_id > 0) {
+                if (self::isParametersSet(['invoice_collection_ids'])) {
+                    $invoice_collection_ids_raw = self::getParameter('invoice_collection_ids');
+                    if (!is_array($invoice_collection_ids_raw)) {
+                        $response->error('invoice_collection_ids must be an array', 400);
+                    }
+
+                    foreach ($invoice_collection_ids_raw as $invoice_collection_id_raw) {
+                        if (is_array($invoice_collection_id_raw) || is_object($invoice_collection_id_raw) || !is_numeric($invoice_collection_id_raw)) {
+                            $response->error('invoice_collection_ids must contain only positive integer ids', 400);
+                        }
+
+                        $invoice_collection_id = (int)$invoice_collection_id_raw;
+                        if ($invoice_collection_id < 1 || $invoice_collection_id > 999999999) {
+                            $response->error('invoice_collection_ids must contain only positive integer ids', 400);
+                        }
+
                         $invoice_collection_ids[] = $invoice_collection_id;
                     }
+
+                    $invoice_collection_ids = array_values(array_unique($invoice_collection_ids));
+                    if (empty($invoice_collection_ids)) {
+                        $response->error('invoice_collection_ids must contain at least one id', 400);
+                    }
+                } else {
+                    $date_from = $db->escape_string($date_range['dateFrom']);
+                    $date_to = $db->escape_string($date_range['dateTo']);
+                    $sql = "SELECT DISTINCT invoice_collection_id
+                            FROM orders
+                            WHERE created_at BETWEEN '$date_from' AND '$date_to'
+                            AND invoice_collection_id IS NOT NULL
+                            AND invoice_collection_id > 0
+                            AND deleted_at IS NULL";
+                    $query_result = $db->query($sql);
+                    while ($row = $query_result->fetch_assoc()) {
+                        $invoice_collection_id = (int)($row['invoice_collection_id'] ?? 0);
+                        if ($invoice_collection_id > 0) {
+                            $invoice_collection_ids[] = $invoice_collection_id;
+                        }
+                    }
                 }
 
                 $items = [];

services/nginx/app/routes/orderItemsRoute.php

@@ -3,7 +3,6 @@
 namespace routes;
 
 use classes\authentication;
-use classes\customer_product_rule_service;
 use objects\logs_o;
 use objects\order_items_o;
 use objects\orders_o;
@@ -71,10 +70,6 @@ class orderItemsRoute
                         $price = (int)self::getParameter('price');
                     }
                 }
-                $order = (new orders_o())->getOrderById((int)$data['order_id']);
-                if (!$order->exists()) {
-                    $response->error('Order not found', 404);
-                }
                 $product = (new products_o())->getProductById((int)$data['product_id']);
                 if (!$product->exists()) {
                     $response->error('Product not found', 404);
@@ -82,19 +77,6 @@ class orderItemsRoute
                 if ($product->requiresOrderItemNote() && trim((string)($notes ?? '')) === '') {
                     $response->error('Notes is required for this product', 400);
                 }
-                $customerRuleViolation = (new customer_product_rule_service())
-                    ->firstViolationForOrderItem((int)$data['order_id'], (int)$data['product_id'], $related_item_id);
-                if ($customerRuleViolation !== null) {
-                    (new logs_o())->add(
-                        'order_items',
-                        'global',
-                        1,
-                        $user->id,
-                        'ORDER_ITEM_RESTRICTED_BY_CUSTOMER_RULE',
-                        'Blocked product ' . (int)$data['product_id'] . ' on order ' . (int)$data['order_id'] . ' by rule ' . $customerRuleViolation['rule']
-                    );
-                    $response->error($customerRuleViolation['message'], 400);
-                }
 
                 // Add the order item to the order This is done individually, to make the notes to the individual order items possible
                 $order_items = (new order_items_o());

services/nginx/app/routes/productsRoute.php

@@ -53,19 +53,6 @@ class productsRoute
         return null;
     }
 
-    private function assertCanUseDepartmentPricing(mixed $user, ?int $departmentId): void
-    {
-        if (!$user instanceof users_o || $departmentId === null) {
-            return;
-        }
-
-        if ($this->hasPermission('superuser_fetch_department')) {
-            return;
-        }
-
-        $this->requirePermission('department_access_' . $departmentId);
-    }
-
     /**
      * Get the category (ID) if the category parameter is provided (In the request 'category')
      * @return int|null
@@ -104,14 +91,12 @@ class productsRoute
         // Check if the departmentId is set
         if ($departmentId) {
             // Apply the departments unique pricing
-            $products = (new products_o())->applyDepartmentPricing($products, $departmentId, true);
+            $products = (new products_o())->applyDepartmentPricing($products, $departmentId);
         }
         // Check if the customer is set
         if ($customer !== null) {
             // Apply the customers unique discounts
             $products = (new products_o())->applyCustomerDiscounts($products, $customer);
-        } else {
-            $products = products_o::stripDepartmentPriceSources($products);
         }
         return $products;
     }
@@ -212,7 +197,6 @@ class productsRoute
                 // Define the variables
                 $customer = self::getCustomerIfProvided(); // This is only used if the customer_id parameter is provided
                 $departmentId = self::getDepartmentIdIfProvided(); // This is only used if the department_id parameter is provided
-                $this->assertCanUseDepartmentPricing($user, $departmentId);
                 $category = self::getCategoryIfProvided(); // This is only used if the category parameter is provided (ID of the category)
                 $productId = self::getProductIdIfProvided(); // This is only used if the id parameter is provided (ID of the product)
                 // Check if the "final_price" parameter is set, and true.

services/nginx/app/tests/Api/CollectedInvoiceMonthlySplitApiTest.php

@@ -85,6 +85,65 @@ it('previews monthly split changes without moving orders or creating collections
         ->and(monthly_split_order_collection_id((int)$aprilOrder['id']))->toBe((int)$invoiceCollection['id']);
 });
 
+it('previews only explicit monthly split invoice collection ids', function (): void {
+    api_test_covers('POST /collected-invoices/split-by-month', 'preview-scope');
+
+    $customer = api_fixtures()->createUser(['display_name' => 'Scoped Preview Monthly Split Customer']);
+    $department = api_fixtures()->createDepartment();
+    $targetCollection = api_fixtures()->createInvoiceCollection([
+        'customer_number' => $customer['customer_number'],
+    ]);
+    $ignoredCollection = api_fixtures()->createInvoiceCollection([
+        'customer_number' => $customer['customer_number'],
+    ]);
+    $targetMarchOrder = api_fixtures()->createOrder([
+        'customer_id' => $customer['customer_number'],
+        'department_id' => $department['id'],
+        'invoice_collection_id' => $targetCollection['id'],
+        'created_at' => '2096-03-15 10:00:00',
+    ]);
+    $targetAprilOrder = api_fixtures()->createOrder([
+        'customer_id' => $customer['customer_number'],
+        'department_id' => $department['id'],
+        'invoice_collection_id' => $targetCollection['id'],
+        'created_at' => '2096-04-02 10:00:00',
+    ]);
+    $ignoredMarchOrder = api_fixtures()->createOrder([
+        'customer_id' => $customer['customer_number'],
+        'department_id' => $department['id'],
+        'invoice_collection_id' => $ignoredCollection['id'],
+        'created_at' => '2096-03-16 10:00:00',
+    ]);
+    $ignoredAprilOrder = api_fixtures()->createOrder([
+        'customer_id' => $customer['customer_number'],
+        'department_id' => $department['id'],
+        'invoice_collection_id' => $ignoredCollection['id'],
+        'created_at' => '2096-04-03 10:00:00',
+    ]);
+    $session = api_fixtures()->createUserSession(['split_collected_invoice']);
+
+    $response = api_client()->post('/collected-invoices/split-by-month', [
+        'dateFrom' => '2096-03-01',
+        'dateTo' => '2096-04-30',
+        'invoice_collection_ids' => [$targetCollection['id']],
+        'preview' => true,
+    ], $session['headers']);
+
+    $response
+        ->assertStatus(200)
+        ->assertEnvelope()
+        ->assertSuccess();
+
+    $payload = $response->data();
+    expect($payload['processed_count'] ?? null)->toBe(1)
+        ->and($payload['changed_count'] ?? null)->toBe(1)
+        ->and($payload['changed'][0]['invoice_collection_id'] ?? null)->toBe((int)$targetCollection['id'])
+        ->and(monthly_split_order_collection_id((int)$targetMarchOrder['id']))->toBe((int)$targetCollection['id'])
+        ->and(monthly_split_order_collection_id((int)$targetAprilOrder['id']))->toBe((int)$targetCollection['id'])
+        ->and(monthly_split_order_collection_id((int)$ignoredMarchOrder['id']))->toBe((int)$ignoredCollection['id'])
+        ->and(monthly_split_order_collection_id((int)$ignoredAprilOrder['id']))->toBe((int)$ignoredCollection['id']);
+});
+
 it('splits a selected March and April collected invoice into monthly collections', function (): void {
     api_test_covers('POST /collected-invoices/split-by-month', 'happy');
 
@@ -139,6 +198,74 @@ it('splits a selected March and April collected invoice into monthly collections
     }
 });
 
+it('splits only explicit monthly split invoice collection ids', function (): void {
+    api_test_covers('POST /collected-invoices/split-by-month', 'scope');
+
+    $customer = api_fixtures()->createUser(['display_name' => 'Scoped Monthly Split Customer']);
+    $department = api_fixtures()->createDepartment();
+    $targetCollection = api_fixtures()->createInvoiceCollection([
+        'customer_number' => $customer['customer_number'],
+        'created_at' => '2096-03-01 00:00:01',
+    ]);
+    $ignoredCollection = api_fixtures()->createInvoiceCollection([
+        'customer_number' => $customer['customer_number'],
+        'created_at' => '2096-03-01 00:00:01',
+    ]);
+    $targetMarchOrder = api_fixtures()->createOrder([
+        'customer_id' => $customer['customer_number'],
+        'department_id' => $department['id'],
+        'invoice_collection_id' => $targetCollection['id'],
+        'created_at' => '2096-03-15 10:00:00',
+    ]);
+    $targetAprilOrder = api_fixtures()->createOrder([
+        'customer_id' => $customer['customer_number'],
+        'department_id' => $department['id'],
+        'invoice_collection_id' => $targetCollection['id'],
+        'created_at' => '2096-04-02 10:00:00',
+    ]);
+    $ignoredMarchOrder = api_fixtures()->createOrder([
+        'customer_id' => $customer['customer_number'],
+        'department_id' => $department['id'],
+        'invoice_collection_id' => $ignoredCollection['id'],
+        'created_at' => '2096-03-16 10:00:00',
+    ]);
+    $ignoredAprilOrder = api_fixtures()->createOrder([
+        'customer_id' => $customer['customer_number'],
+        'department_id' => $department['id'],
+        'invoice_collection_id' => $ignoredCollection['id'],
+        'created_at' => '2096-04-03 10:00:00',
+    ]);
+    $session = api_fixtures()->createUserSession(['split_collected_invoice']);
+    $createdCollectionIds = [];
+
+    try {
+        $response = api_client()->post('/collected-invoices/split-by-month', [
+            'dateFrom' => '2096-03-01',
+            'dateTo' => '2096-04-30',
+            'invoice_collection_ids' => [$targetCollection['id']],
+        ], $session['headers']);
+
+        $response
+            ->assertStatus(200)
+            ->assertEnvelope()
+            ->assertSuccess();
+
+        $payload = $response->data();
+        $createdCollectionIds = (array)($payload['changed'][0]['created_invoice_collection_ids'] ?? []);
+        $aprilCollectionId = (int)($createdCollectionIds[0] ?? 0);
+
+        expect($payload['processed_count'] ?? null)->toBe(1)
+            ->and($payload['changed_count'] ?? null)->toBe(1)
+            ->and($aprilCollectionId)->toBeGreaterThan(0)
+            ->and(monthly_split_order_collection_id((int)$targetMarchOrder['id']))->toBe((int)$targetCollection['id'])
+            ->and(monthly_split_order_collection_id((int)$targetAprilOrder['id']))->toBe($aprilCollectionId)
+            ->and(monthly_split_order_collection_id((int)$ignoredMarchOrder['id']))->toBe((int)$ignoredCollection['id'])
+            ->and(monthly_split_order_collection_id((int)$ignoredAprilOrder['id']))->toBe((int)$ignoredCollection['id']);
+    } finally {
+        monthly_split_cleanup_collections($createdCollectionIds);
+    }
+});
+
 it('sets closed_at to month end when split month has ended', function (): void {
     api_test_covers('POST /collected-invoices/split-by-month', 'closed-at');
 
@@ -345,3 +472,27 @@ it('rejects invalid monthly split date ranges', function (): void {
         ->assertEnvelope()
         ->assertSuccess(false);
 });
+
+it('rejects invalid explicit monthly split invoice collection ids', function (): void {
+    api_test_covers('POST /collected-invoices/split-by-month', 'invalid-scope');
+
+    $session = api_fixtures()->createUserSession(['split_collected_invoice']);
+
+    api_client()->post('/collected-invoices/split-by-month', [
+        'dateFrom' => '2096-03-01',
+        'dateTo' => '2096-04-30',
+        'invoice_collection_ids' => ['not-a-number'],
+    ], $session['headers'])
+        ->assertStatus(400)
+        ->assertEnvelope()
+        ->assertSuccess(false);
+
+    api_client()->post('/collected-invoices/split-by-month', [
+        'dateFrom' => '2096-03-01',
+        'dateTo' => '2096-04-30',
+        'invoice_collection_ids' => [],
+    ], $session['headers'])
+        ->assertStatus(400)
+        ->assertEnvelope()
+        ->assertSuccess(false);
+});

services/nginx/app/tests/Api/DepartmentsApiTest.php

@@ -231,7 +231,6 @@ it('updates departments through the real endpoint', function (): void {
         'description' => 'Updated description',
         'order_priority' => 5,
         'archived' => true,
-        'custom_pricing_only' => true,
     ], $session['headers']);
 
     $response
@@ -247,7 +246,6 @@ it('updates departments through the real endpoint', function (): void {
     expect($row['description'] ?? null)->toBe('Updated description');
     expect((int)($row['order_priority'] ?? 0))->toBe(5);
     expect((int)($row['archived'] ?? 0))->toBe(1);
-    expect((int)($row['custom_pricing_only'] ?? 0))->toBe(1);
 });
 
 it('rejects invalid department update requests', function (): void {

services/nginx/app/tests/Api/ErrorReportsApiTest.php

@@ -1,97 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-usesApiSuite();
-
-function error_report_api_payload(array $overrides = []): array
-{
-    return array_replace_recursive([
-        'before_error' => 'Opening the orders page',
-        'expected' => 'The orders should load',
-        'actual' => 'The page showed an error',
-        'data_collection_accepted' => true,
-        'data_collection_policy_version' => 'error-report-v1',
-        'route_path' => '/admin/orders',
-        'page_url' => 'https://app.example.test/admin/orders',
-        'release_trace_id' => 'trace-error-report-test',
-        'frontend_version' => 'frontend-test',
-        'api_version' => 'api-test',
-        'request_errors' => [
-            ['method' => 'GET', 'url' => '/orders', 'statusCode' => 500],
-        ],
-        'vue_errors' => [
-            ['type' => 'vue_component_error', 'payload' => ['message' => 'Render failed']],
-        ],
-        'context' => [
-            'viewport' => ['width' => 1280, 'height' => 720],
-            'user_agent' => 'ErrorReportsApiTest',
-            'captured_at' => '2026-07-06T10:00:00.000Z',
-            'data_collection_policy_version' => 'error-report-v1',
-        ],
-    ], $overrides);
-}
-
-function error_report_api_cleanup(array $report): void
-{
-    $id = (int)($report['id'] ?? 0);
-    if ($id > 0) {
-        api_fixtures()->cleanupDeleteById('error_reports', $id);
-    }
-}
-
-it('creates error reports when screenshot capture failed', function (): void {
-    api_test_covers('POST /error-reports', 'happy');
-
-    $session = api_fixtures()->createUserSession();
-    $response = api_client()->post('/error-reports', error_report_api_payload([
-        'screenshot' => null,
-        'context' => [
-            'screenshot_attachment' => ['status' => 'capture_failed'],
-        ],
-    ]), $session['headers']);
-
-    $response
-        ->assertStatus(201)
-        ->assertEnvelope()
-        ->assertSuccess();
-
-    $report = $response->data();
-    expect($report['screenshot'])->toBeNull();
-    expect($report['answers']['before_error'])->toBe('Opening the orders page');
-    expect($report['request_error_count'])->toBe(1);
-    expect($report['vue_error_count'])->toBe(1);
-    expect($report['runtime_context']['screenshot_attachment'])->toMatchArray([
-        'status' => 'capture_failed',
-        'attached' => false,
-        'mime_type' => null,
-        'size_bytes' => 0,
-    ]);
-
-    error_report_api_cleanup($report);
-});
-
-it('creates error reports when an optional screenshot payload is invalid', function (): void {
-    api_test_covers('POST /error-reports', 'invalid optional screenshot');
-
-    $session = api_fixtures()->createUserSession();
-    $response = api_client()->post('/error-reports', error_report_api_payload([
-        'screenshot' => 'data:text/plain;base64,' . base64_encode('not an image'),
-    ]), $session['headers']);
-
-    $response
-        ->assertStatus(201)
-        ->assertEnvelope()
-        ->assertSuccess();
-
-    $report = $response->data();
-    expect($report['screenshot'])->toBeNull();
-    expect($report['runtime_context']['screenshot_attachment'])->toMatchArray([
-        'status' => 'invalid',
-        'attached' => false,
-        'mime_type' => null,
-        'size_bytes' => 0,
-    ]);
-
-    error_report_api_cleanup($report);
-});

services/nginx/app/tests/Api/LimitedBackofficeApiTest.php

@@ -285,85 +285,6 @@ it('fails price setup gaps without exposing product defaults', function (): void
     expect($response->data()['missing_products'][0]['id'] ?? null)->toBe((int)$product['id']);
 });
 
-it('defaults missing custom-only department prices to sentinel without exposing fallback prices', function (): void {
-    api_test_covers('GET /limited-backoffice/departments', 'happy');
-    api_test_covers('GET /limited-backoffice/departments/{departmentId}/prices', 'happy');
-    api_test_covers('PUT /limited-backoffice/departments/{departmentId}/prices', 'happy');
-
-    $department = api_fixtures()->createDepartment([
-        'name' => 'Limited Custom Pricing Only',
-        'custom_pricing_only' => 1,
-    ]);
-    $otherDepartment = api_fixtures()->createDepartment(['name' => 'Limited Other Pricing']);
-    $category = api_fixtures()->createCategory(['name' => 'Limited Custom Pricing Category']);
-    $product = api_fixtures()->createProduct([
-        'name' => 'Custom Missing Product',
-        'category' => $category['id'],
-        'price' => 87654,
-    ]);
-    $otherProduct = api_fixtures()->createProduct([
-        'name' => 'Custom Missing Other Product',
-        'category' => $category['id'],
-        'price' => 76543,
-    ]);
-    api_fixtures()->linkDepartmentCategory((int)$department['id'], (int)$category['id']);
-    api_fixtures()->linkDepartmentCategory((int)$otherDepartment['id'], (int)$category['id']);
-    limited_backoffice_price_insert((int)$otherDepartment['id'], (int)$product['id'], 4321);
-    limited_backoffice_price_insert((int)$otherDepartment['id'], (int)$otherProduct['id'], 5432);
-
-    $session = limited_backoffice_manager_session([(int)$department['id']]);
-
-    $departments = api_client()->get('/limited-backoffice/departments', $session['headers']);
-    $departments
-        ->assertStatus(200)
-        ->assertEnvelope()
-        ->assertSuccess();
-    expect($departments->data()[0]['custom_pricing_only'] ?? null)->toBeTrue();
-
-    $response = api_client()->get('/limited-backoffice/departments/' . (int)$department['id'] . '/prices', $session['headers']);
-    $response
-        ->assertStatus(200)
-        ->assertEnvelope()
-        ->assertSuccess();
-
-    expect($response->body)->not->toContain('87654');
-    expect($response->body)->not->toContain('76543');
-    expect($response->body)->not->toContain('4321');
-    expect($response->body)->not->toContain('5432');
-    expect($response->data()['department']['custom_pricing_only'] ?? null)->toBeTrue();
-    $products = [];
-    foreach ($response->data()['categories'] as $departmentCategory) {
-        foreach ($departmentCategory['products'] as $departmentProduct) {
-            $products[(int)$departmentProduct['id']] = $departmentProduct;
-        }
-    }
-    expect($products[(int)$product['id']]['price'] ?? null)->toBe(\objects\products_o::CUSTOM_PRICING_MISSING_PRICE);
-    expect($products[(int)$otherProduct['id']]['price'] ?? null)->toBe(\objects\products_o::CUSTOM_PRICING_MISSING_PRICE);
-
-    $updated = api_client()->put('/limited-backoffice/departments/' . (int)$department['id'] . '/prices', [
-        'prices' => [
-            ['product_id' => (int)$product['id'], 'price' => 2222],
-        ],
-    ], $session['headers']);
-    $updated
-        ->assertStatus(200)
-        ->assertEnvelope()
-        ->assertSuccess();
-
-    $updatedProducts = [];
-    foreach ($updated->data()['categories'] as $departmentCategory) {
-        foreach ($departmentCategory['products'] as $departmentProduct) {
-            $updatedProducts[(int)$departmentProduct['id']] = $departmentProduct;
-        }
-    }
-    expect($updated->body)->not->toContain('87654');
-    expect($updated->body)->not->toContain('76543');
-    expect($updated->body)->not->toContain('4321');
-    expect($updated->body)->not->toContain('5432');
-    expect($updatedProducts[(int)$product['id']]['price'] ?? null)->toBe(2222);
-    expect($updatedProducts[(int)$otherProduct['id']]['price'] ?? null)->toBe(\objects\products_o::CUSTOM_PRICING_MISSING_PRICE);
-});
-
 it('rejects invalid price batches and leaves existing prices unchanged', function (): void {
     api_test_covers('PUT /limited-backoffice/departments/{departmentId}/prices', 'validation');
 

services/nginx/app/tests/Api/OrderItemsApiTest.php

@@ -4,73 +4,6 @@ declare(strict_types=1);
 
 usesApiSuite();
 
-function create_order_item_rule_fixture(array $customerAttributes = []): array
-{
-    $customer = api_fixtures()->createUser(['display_name' => 'Order Item Rule Customer']);
-    foreach ($customerAttributes as $attribute) {
-        api_fixtures()->addCustomerAttribute((int)$customer['id'], (string)$attribute);
-    }
-
-    $department = api_fixtures()->createDepartment();
-    $order = api_fixtures()->createOrder([
-        'customer_id' => $customer['customer_number'],
-        'department_id' => $department['id'],
-        'reference' => 'RULE-CHECK',
-    ]);
-    $session = api_fixtures()->createUserSession([], ['group_id' => 1]);
-
-    return [
-        'customer' => $customer,
-        'department' => $department,
-        'order' => $order,
-        'session' => $session,
-    ];
-}
-
-function post_order_item(array $order, array $product, array $headers, array $overrides = []): \Tests\Support\Api\ApiResponse
-{
-    return api_client()->post('/order/items', array_merge([
-        'order_id' => $order['id'],
-        'product_id' => $product['id'],
-        'quantity' => 1,
-    ], $overrides), $headers);
-}
-
-function custom_pricing_only_price_override(int $userId, int $productId, int $percentage): void
-{
-    $statement = api_test_runtime()->db()->prepare(
-        'INSERT INTO `price_overrides` (`user_id`, `is_category`, `product_or_category_id`, `percentage`)
-         VALUES (?, 0, ?, ?)'
-    );
-    $productIdText = (string)$productId;
-    $statement->bind_param('isi', $userId, $productIdText, $percentage);
-    $statement->execute();
-    $statement->close();
-
-    api_fixtures()->cleanupDeleteWhere('price_overrides', [
-        'user_id' => $userId,
-        'is_category' => 0,
-        'product_or_category_id' => $productIdText,
-    ]);
-}
-
-function custom_pricing_only_department_price(int $departmentId, int $productId, int $price): void
-{
-    $statement = api_test_runtime()->db()->prepare(
-        'INSERT INTO `product_department_prices` (`department_id`, `product_id`, `price`)
-         VALUES (?, ?, ?)
-         ON DUPLICATE KEY UPDATE `price` = VALUES(`price`)'
-    );
-    $statement->bind_param('iii', $departmentId, $productId, $price);
-    $statement->execute();
-    $statement->close();
-
-    api_fixtures()->cleanupDeleteWhere('product_department_prices', [
-        'department_id' => $departmentId,
-        'product_id' => $productId,
-    ]);
-}
-
 it('requires notes when adding the extraordinary chemistry product to an order', function (): void {
     api_test_covers('POST /order/items', 'validation');
 
@@ -178,200 +111,3 @@ it('returns the extraordinary chemistry product with requires_note enabled', fun
 
     expect($response->data()['requires_note'] ?? null)->toBeTrue();
 });
-
-it('blocks addon products added as standalone additional order items for customers restricted from additional services', function (): void {
-    api_test_covers('POST /order/items', 'customer-rule-validation');
-
-    $fixture = create_order_item_rule_fixture(['restrictAdditionalServices']);
-    $primaryProduct = api_fixtures()->createProduct([
-        'name' => 'Primary truck wash',
-        'price' => 200,
-    ]);
-    $addonProduct = api_fixtures()->createProduct([
-        'name' => 'Drying add-on',
-        'category' => 4,
-        'price' => 50,
-    ]);
-
-    post_order_item($fixture['order'], $primaryProduct, $fixture['session']['headers'])
-        ->assertStatus(200)
-        ->assertEnvelope()
-        ->assertSuccess();
-
-    post_order_item($fixture['order'], $addonProduct, $fixture['session']['headers'])
-        ->assertStatus(400)
-        ->assertEnvelope()
-        ->assertSuccess(false)
-        ->assertMessage(\classes\customer_product_rule_service::BLOCK_MESSAGE);
-});
-
-it('allows standalone additional order items when the customer is not restricted from additional services', function (): void {
-    api_test_covers('POST /order/items', 'customer-rule-validation');
-
-    $fixture = create_order_item_rule_fixture();
-    $primaryProduct = api_fixtures()->createProduct([
-        'name' => 'Primary unrestricted truck wash',
-        'price' => 200,
-    ]);
-    $addonProduct = api_fixtures()->createProduct([
-        'name' => 'Unrestricted add-on',
-        'category' => 4,
-        'price' => 50,
-    ]);
-
-    post_order_item($fixture['order'], $primaryProduct, $fixture['session']['headers'])
-        ->assertStatus(200)
-        ->assertEnvelope()
-        ->assertSuccess();
-
-    post_order_item($fixture['order'], $addonProduct, $fixture['session']['headers'])
-        ->assertStatus(200)
-        ->assertEnvelope()
-        ->assertSuccess();
-});
-
-it('blocks related addon order items for customers restricted from additional services', function (): void {
-    api_test_covers('POST /order/items', 'customer-rule-validation');
-
-    $fixture = create_order_item_rule_fixture(['restrictAdditionalServices']);
-    $cashier = api_fixtures()->createUser(['display_name' => 'Order Item Rule Cashier']);
-    $primaryProduct = api_fixtures()->createProduct([
-        'name' => 'Primary related truck wash',
-        'price' => 200,
-    ]);
-    $addonProduct = api_fixtures()->createProduct([
-        'name' => 'Related extra brush',
-        'price' => 35,
-    ]);
-    $primaryItem = api_fixtures()->createOrderItem([
-        'order_id' => $fixture['order']['id'],
-        'product_id' => $primaryProduct['id'],
-        'cashier_id' => $cashier['id'],
-        'price' => 200,
-    ]);
-
-    post_order_item($fixture['order'], $addonProduct, $fixture['session']['headers'], [
-        'related_item_id' => $primaryItem['id'],
-    ])
-        ->assertStatus(400)
-        ->assertEnvelope()
-        ->assertSuccess(false)
-        ->assertMessage(\classes\customer_product_rule_service::BLOCK_MESSAGE);
-});
-
-it('blocks named restricted service products for the selected customer', function (string $attribute, array $productAttributes): void {
-    api_test_covers('POST /order/items', 'customer-rule-validation');
-
-    $fixture = create_order_item_rule_fixture([$attribute]);
-    $product = api_fixtures()->createProduct($productAttributes);
-
-    post_order_item($fixture['order'], $product, $fixture['session']['headers'])
-        ->assertStatus(400)
-        ->assertEnvelope()
-        ->assertSuccess(false)
-        ->assertMessage(\classes\customer_product_rule_service::BLOCK_MESSAGE);
-})->with([
-    'spot free' => ['restrictSpotFree', ['name' => 'Spot Free rinse', 'price' => 80]],
-    'interior cleaning' => ['restrictInteriorCleaning', ['name' => 'Indvendig vask', 'price' => 125]],
-    'tank cleaning' => ['restrictTankCleaning', ['name' => 'Tankrens', 'category' => 5, 'price' => 300]],
-]);
-
-it('only allows tank cleaning products when the customer has the only tank cleaning rule', function (): void {
-    api_test_covers('POST /order/items', 'customer-rule-validation');
-
-    $fixture = create_order_item_rule_fixture(['onlyTankCleaning']);
-    $nonTankProduct = api_fixtures()->createProduct([
-        'name' => 'Exterior truck wash',
-        'price' => 180,
-    ]);
-    $tankProduct = api_fixtures()->createProduct([
-        'name' => 'Tank cleaning',
-        'category' => 5,
-        'price' => 300,
-    ]);
-
-    post_order_item($fixture['order'], $nonTankProduct, $fixture['session']['headers'])
-        ->assertStatus(400)
-        ->assertEnvelope()
-        ->assertSuccess(false)
-        ->assertMessage(\classes\customer_product_rule_service::BLOCK_MESSAGE);
-
-    post_order_item($fixture['order'], $tankProduct, $fixture['session']['headers'])
-        ->assertStatus(200)
-        ->assertEnvelope()
-        ->assertSuccess();
-});
-
-it('uses the sentinel for missing custom-only department prices without discounts or cross-department prices', function (): void {
-    api_test_covers('GET /products', 'happy');
-    api_test_covers('POST /order/items', 'happy');
-
-    $department = api_fixtures()->createDepartment([
-        'name' => 'Custom Pricing Products',
-        'custom_pricing_only' => 1,
-    ]);
-    $otherDepartment = api_fixtures()->createDepartment(['name' => 'Custom Pricing Other']);
-    $category = api_fixtures()->createCategory(['name' => 'Custom Pricing Products Category']);
-    $product = api_fixtures()->createProduct([
-        'name' => 'Custom Pricing Missing Product',
-        'category' => $category['id'],
-        'price' => 12345,
-    ]);
-    api_fixtures()->linkDepartmentCategory((int)$department['id'], (int)$category['id']);
-    api_fixtures()->linkDepartmentCategory((int)$otherDepartment['id'], (int)$category['id']);
-    custom_pricing_only_department_price((int)$otherDepartment['id'], (int)$product['id'], 3333);
-
-    $customer = api_fixtures()->createUser(['display_name' => 'Custom Pricing Customer']);
-    api_fixtures()->cacheEconomicCustomerDiscountPercentage((int)$customer['id'], 0);
-    custom_pricing_only_price_override((int)$customer['id'], (int)$product['id'], 50);
-
-    $session = api_fixtures()->createUserSession([
-        'list_products',
-        'add_order_items',
-        'department_access_' . (int)$department['id'],
-    ]);
-
-    $productResponse = api_client()->get(
-        '/products?final_price=true&id=' . (int)$product['id']
-        . '&department_id=' . (int)$department['id']
-        . '&customer_id=' . (int)$customer['customer_number'],
-        $session['headers']
-    );
-    $productResponse
-        ->assertStatus(200)
-        ->assertEnvelope()
-        ->assertSuccess();
-
-    expect($productResponse->body)->not->toContain('12345');
-    expect($productResponse->body)->not->toContain('3333');
-    expect($productResponse->data()['price'] ?? null)->toBe(\objects\products_o::CUSTOM_PRICING_MISSING_PRICE);
-
-    api_client()->get(
-        '/products?final_price=true&id=' . (int)$product['id']
-        . '&department_id=' . (int)$otherDepartment['id'],
-        $session['headers']
-    )
-        ->assertStatus(403)
-        ->assertEnvelope()
-        ->assertSuccess(false)
-        ->assertMissingPermissions(['department_access_' . (int)$otherDepartment['id']]);
-
-    $order = api_fixtures()->createOrder([
-        'customer_id' => $customer['customer_number'],
-        'department_id' => $department['id'],
-        'reference' => 'CUSTOM-ONLY-ORDER',
-    ]);
-
-    $orderItem = api_client()->post('/order/items', [
-        'order_id' => $order['id'],
-        'product_id' => $product['id'],
-        'quantity' => 1,
-    ], $session['headers']);
-
-    $orderItem
-        ->assertStatus(200)
-        ->assertEnvelope()
-        ->assertSuccess();
-
-    expect((int)($orderItem->data()['price'] ?? 0))->toBe(\objects\products_o::CUSTOM_PRICING_MISSING_PRICE);
-});

services/nginx/app/tests/Support/Api/ApiFixtures.php

@@ -132,7 +132,6 @@ final class ApiFixtures
             'branding' => (int)($attributes['branding'] ?? 0),
             'visible' => (int)($attributes['visible'] ?? 1),
             'archived' => (int)($attributes['archived'] ?? 0),
-            'custom_pricing_only' => (int)($attributes['custom_pricing_only'] ?? 0),
             'latitude' => $attributes['latitude'] ?? 0.0,
             'longitude' => $attributes['longitude'] ?? 0.0,
             'order_priority' => (int)($attributes['order_priority'] ?? 0),
@@ -1710,17 +1709,6 @@ final class ApiFixtures
         $this->cleanup->add(fn() => $this->deleteWhere($table, $conditions));
     }
 
-    public function cacheEconomicCustomerDiscountPercentage(int $userId, int $discountPercentage): void
-    {
-        if ($this->redis === null) {
-            throw new RuntimeException('API tests require Redis for cache-backed endpoint flows.');
-        }
-
-        $key = 'users_' . $userId . '_economic_customer_discount_percentage';
-        $this->redis->set($key, (string)$discountPercentage);
-        $this->cleanup->add(fn() => $this->deleteRedisKey($key));
-    }
-
     private function purgeCustomerTraceData(int $userId, int $customerNumber): void
     {
         $invoiceCollectionIds = $this->fetchIntColumnWhere('collected_order_invoices', 'id', [

services/nginx/app/tests/Support/Api/ApiSchemaBootstrap.php

@@ -89,7 +89,6 @@ CREATE TABLE IF NOT EXISTS `departments` (
     `branding` INT NULL DEFAULT NULL,
     `visible` TINYINT(1) NOT NULL DEFAULT 1,
     `archived` TINYINT(1) NOT NULL DEFAULT 0,
-    `custom_pricing_only` TINYINT(1) NOT NULL DEFAULT 0,
     `latitude` DECIMAL(10,7) NOT NULL DEFAULT 0,
     `longitude` DECIMAL(10,7) NOT NULL DEFAULT 0,
     `order_priority` INT NOT NULL DEFAULT 0,
@@ -893,13 +892,6 @@ SQL,
                 'ALTER TABLE `departments` ADD INDEX `idx_departments_archived` (`archived`)'
             );
         }
-
-        if (!$this->columnExists('departments', 'custom_pricing_only')) {
-            $this->execute(
-                'departments.custom_pricing_only',
-                'ALTER TABLE `departments` ADD COLUMN `custom_pricing_only` TINYINT(1) NOT NULL DEFAULT 0 AFTER `archived`'
-            );
-        }
     }
 
     private function ensureOrderInvoiceCollectionSchema(): void

services/nginx/app/tests/Unit/ErrorReports/ErrorReportTest.php

@@ -76,6 +76,4 @@ it('defines error report schema, routes, permissions, storage, and OpenAPI docs'
     expect($openapi)->toContain('/error-reports:');
     expect($openapi)->toContain('ErrorReportSubmissionRequest');
     expect($openapi)->toContain('ErrorReportStatusUpdateRequest');
-    expect($openapi)->not->toContain("        - screenshot\n");
-    expect($openapi)->toContain('Reports are accepted without an attachment when capture or upload fails.');
 });

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

@@ -618,33 +618,6 @@ it('uses a preloaded e-conomic global discount in expected price breakdowns', fu
     ]);
 });
 
-it('uses the custom-only sentinel without discounts when department price is missing', function (): void {
-    $row = [
-        'customer_number' => 35131752,
-        'user_id' => 411,
-        'product_base_price' => 100,
-        'department_price' => null,
-        'department_custom_pricing_only' => 1,
-        'product_discount_percentage' => 50,
-        'category_discount_percentage' => 25,
-        'apply_category_discount' => 0,
-    ];
-
-    $expected = invoice_period_flag_service_invoke('calculateExpectedPrice', [$row]);
-    $breakdown = invoice_period_flag_service_invoke('priceBreakdown', [$row, $expected]);
-
-    expect($expected)->toBe(\objects\products_o::CUSTOM_PRICING_MISSING_PRICE);
-    expect($breakdown)->toMatchArray([
-        'product_price' => \objects\products_o::CUSTOM_PRICING_MISSING_PRICE,
-        'department_price' => null,
-        'effective_base_price' => \objects\products_o::CUSTOM_PRICING_MISSING_PRICE,
-        'product_discount_percentage' => 50,
-        'category_discount_percentage' => 0,
-        'applied_discount_percentage' => 0,
-        'expected_price' => \objects\products_o::CUSTOM_PRICING_MISSING_PRICE,
-    ]);
-});
-
 it('does not report a price mismatch when a product-specific discount makes the expected price zero', function (): void {
     $row = [
         'customer_number' => 35131752,