${esc(item.sku)}
@@ -690,10 +688,6 @@ async function renderOrderDetailModal(orderNumber, opts) {
if (item.kit) {
matchDot = 'Kit';
rowStyle = '';
- } else if (item.quantity_discount) {
- const bpTitle = item.baseprice ? `Catalog: ${fmtNum(item.baseprice)} lei` : 'Discount GoMag';
- matchDot = `Disc.`;
- rowStyle = '';
} else if (priceInfo.pret_roa == null && priceInfo.match == null) {
matchDot = '';
rowStyle = '';
@@ -709,7 +703,7 @@ async function renderOrderDetailModal(orderNumber, opts) {
${esc(item.product_name || '-')} |
${renderCodmatCell(item)} |
${item.quantity || 0} |
- ${item.quantity_discount && item.baseprice ? `${fmtNum(item.baseprice)} ${fmtNum(item.price)}` : (item.price != null ? fmtNum(item.price) : '-')} |
+ ${item.price != null ? fmtNum(item.price) : '-'} |
${pretRoaHtml} |
${item.vat != null ? Number(item.vat) : '-'} |
${fmtNum(valoare)} |
diff --git a/api/app/templates/base.html b/api/app/templates/base.html
index 0ac16f9..10d34bf 100644
--- a/api/app/templates/base.html
+++ b/api/app/templates/base.html
@@ -168,7 +168,7 @@
-
+
+
{% endblock %}
diff --git a/api/tests/test_business_rules.py b/api/tests/test_business_rules.py
index b9a23cd..4e15105 100644
--- a/api/tests/test_business_rules.py
+++ b/api/tests/test_business_rules.py
@@ -636,49 +636,39 @@ class TestGetPricesForOrderCantitateRoa:
assert result["summary"]["mismatches"] == 0
-class TestGetPricesForOrderQuantityDiscount:
- """baseprice > price means GoMag applied a discount — skip price comparison."""
+class TestGetPricesDirectionalMatch:
+ """Price match is directional: gomag <= roa is OK, gomag > roa is mismatch."""
- def test_discount_detected(self):
- """baseprice > price: quantity_discount=True, match=None, mismatches=0."""
+ def test_gomag_below_roa_is_match(self):
+ """GoMag price lower than ROA (promo/volume discount) → match=True."""
items = [{"sku": "SKU-DISC", "price": 28.59, "baseprice": 33.0, "quantity": 48,
"codmat_details": [{"codmat": "COD1", "cantitate_roa": 1,
"id_articol": 100, "cont": "345"}]}]
conn = _mock_oracle_conn(pol_cu_tva=True, price_map={100: (28.99, 1.19)})
result = get_prices_for_order(items, {"id_pol": "1"}, conn=conn)
- assert result["items"][0].get("quantity_discount") is True
- assert result["items"][0]["match"] is None
+ assert result["items"][0]["match"] is True
+ assert result["items"][0]["pret_roa"] == 28.99
assert result["summary"]["mismatches"] == 0
- def test_no_discount_when_baseprice_equals_price(self):
- """baseprice == price: normal comparison."""
- items = [{"sku": "SKU-FULL", "price": 28.99, "baseprice": 28.99, "quantity": 1,
+ def test_gomag_above_roa_is_mismatch(self):
+ """GoMag price higher than ROA → match=False, mismatch counted."""
+ items = [{"sku": "SKU-HIGH", "price": 30.00, "quantity": 1,
"codmat_details": [{"codmat": "COD2", "cantitate_roa": 1,
"id_articol": 200, "cont": "345"}]}]
conn = _mock_oracle_conn(pol_cu_tva=True, price_map={200: (28.99, 1.19)})
result = get_prices_for_order(items, {"id_pol": "1"}, conn=conn)
- assert result["items"][0].get("quantity_discount") is not True
- assert result["items"][0]["match"] is True
+ assert result["items"][0]["match"] is False
+ assert result["summary"]["mismatches"] == 1
- def test_no_discount_when_baseprice_missing(self):
- """baseprice=0 (missing): normal comparison."""
- items = [{"sku": "SKU-OLD", "price": 28.99, "quantity": 1,
+ def test_gomag_equals_roa_is_match(self):
+ """GoMag price equals ROA → match=True."""
+ items = [{"sku": "SKU-FULL", "price": 28.99, "quantity": 1,
"codmat_details": [{"codmat": "COD3", "cantitate_roa": 1,
"id_articol": 300, "cont": "345"}]}]
conn = _mock_oracle_conn(pol_cu_tva=True, price_map={300: (28.99, 1.19)})
result = get_prices_for_order(items, {"id_pol": "1"}, conn=conn)
- assert result["items"][0].get("quantity_discount") is not True
assert result["items"][0]["match"] is True
-
- def test_kit_takes_precedence_over_discount(self):
- """Kit check runs before discount check — kit wins."""
- items = [{"sku": "SKU-KITDISC", "price": 20.0, "baseprice": 25.0, "quantity": 10,
- "codmat_details": [{"codmat": "COD4", "cantitate_roa": 2,
- "id_articol": 400, "cont": "345"}]}]
- conn = _mock_oracle_conn(pol_cu_tva=True, price_map={400: (10.0, 1.19)})
- result = get_prices_for_order(items, {"id_pol": "1"}, conn=conn)
- assert result["items"][0].get("kit") is True
- assert result["items"][0].get("quantity_discount") is not True
+ assert result["summary"]["mismatches"] == 0
# ── normalize_company_name (II, PFA, INTREPRINDERE INDIVIDUALA) ──