karrio-server-pricing 2026.1.3__py3-none-any.whl → 2026.1.5__py3-none-any.whl

karrio/server/pricing/models.py

@@ -193,14 +193,22 @@ class Markup(core.Entity):
                 else (rate.total_charge * (typing.cast(float, self.amount) / 100))
             )
             total_charge = lib.to_decimal(rate.total_charge + amount)
-            extra_charges = rate.extra_charges + [
-                karrio.ChargeDetails(
-                    name=typing.cast(str, self.name),
-                    amount=amount,
-                    currency=rate.currency,
-                    id=self.id,
-                )
-            ]
+
+            # Only add to extra_charges if the markup is visible.
+            # Non-visible markups (e.g., plan-based platform fees) are
+            # included in total_charge but hidden from the breakdown.
+            extra_charges = (
+                rate.extra_charges + [
+                    karrio.ChargeDetails(
+                        name=typing.cast(str, self.name),
+                        amount=amount,
+                        currency=rate.currency,
+                        id=self.id,
+                    )
+                ]
+                if self.is_visible
+                else rate.extra_charges
+            )
 
             return datatypes.Rate(
                 **{

karrio/server/pricing/signals.py

@@ -34,11 +34,17 @@ def apply_custom_markups(context: Context, result):
     Apply active markups to rate quotes.
 
     This function is called after rates are fetched from carriers.
-    It applies all active markups that match the organization context.
+    It applies all active markups that match the organization context
+    and the tenant's pricing plan.
 
     Markup scoping via organization_ids JSONField:
     - Markups with org ID in organization_ids apply only to that org
     - Markups with empty organization_ids are system-wide
+
+    Plan filtering via metadata.plan:
+    - Markups with no plan in metadata are global (apply to all plans)
+    - Markups with metadata.plan only apply when the tenant's plan matches
+    - Plan is resolved from: request filter > org metadata > default "launch"
     """
     org_id = getattr(context.org, "id", None)
 
@@ -46,8 +52,10 @@ def apply_custom_markups(context: Context, result):
         # Filter markups that either:
         # 1. Have the current organization in their organization_ids list
         # 2. Have an empty organization_ids list (system-wide markups)
+        # Note: icontains is used instead of __contains for cross-DB
+        # compatibility (SQLite does not support JSON containment lookups).
         _filters = (
-            Q(active=True, organization_ids__contains=[org_id])
+            Q(active=True, organization_ids__icontains=org_id)
             | Q(active=True, organization_ids=[]),
         )
     else:
@@ -56,9 +64,38 @@ def apply_custom_markups(context: Context, result):
 
     markups = models.Markup.objects.filter(*_filters)
 
+    # Resolve the tenant's plan for plan-based markup filtering.
+    # Priority: explicit request filter > org metadata > default "launch"
+    request_plan = None
+    context_data = None
+    if hasattr(context, "_full_data"):
+        context_data = context._full_data
+    elif hasattr(context, "data"):
+        context_data = context.data
+
+    if context_data:
+        filters = context_data.get("filters") or {}
+        request_plan = filters.get("plan")
+
+    if request_plan:
+        tenant_plan = request_plan
+    else:
+        org_metadata = getattr(
+            getattr(context, "org", None), "metadata", {}
+        ) or {}
+        tenant_plan = org_metadata.get("plan", "launch")
+
+    # Filter markups by plan:
+    # Apply if markup has no plan in metadata (global) OR plan matches tenant's plan
+    def matches_plan(markup):
+        markup_plan = (markup.metadata or {}).get("plan")
+        return markup_plan is None or markup_plan == tenant_plan
+
+    applicable_markups = [m for m in markups if matches_plan(m)]
+
     return functools.reduce(
         lambda cumulated_result, markup: markup.apply_charge(cumulated_result),
-        markups,
+        applicable_markups,
         result,
     )
 

{karrio_server_pricing-2026.1.3.dist-info → karrio_server_pricing-2026.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_server_pricing
-Version: 2026.1.3
+Version: 2026.1.5
 Summary: Multi-carrier shipping API Pricing panel
 Author-email: karrio <hello@karrio.io>
 License-Expression: LGPL-3.0

{karrio_server_pricing-2026.1.3.dist-info → karrio_server_pricing-2026.1.5.dist-info}/RECORD

@@ -1,9 +1,9 @@
 karrio/server/pricing/__init__.py,sha256=zXpxAFuHsCdAaESYGLRvdqCs7CXtIn8cF688jV4ufQc,64
 karrio/server/pricing/admin.py,sha256=vDYvoFk9M6bGK6NBoJCRkxL5dla4sibNfej69_RIOT8,5642
 karrio/server/pricing/apps.py,sha256=LBpxtFvuUn36DjMiPlQL51V5WfVMDf7N4QS3IUs_Pcs,431
-karrio/server/pricing/models.py,sha256=gRcCHNEQpQSP4T44RvyPInNYzXL3SHXq9Ar0f9il3YY,11697
+karrio/server/pricing/models.py,sha256=AfgSmMcN7H22_qLRlK5InWmdfnZi_YHMtQD-LJJhMr0,12040
 karrio/server/pricing/serializers.py,sha256=48panQv9ZyLzkVa94XzOqbXxFm0daMK1_jOVJwQiNbI,574
-karrio/server/pricing/signals.py,sha256=-XNTjbnn1AnRZDP45YXIaSTXdYG6tXrnBXnCX9CFDOo,6560
+karrio/server/pricing/signals.py,sha256=-Q-SN0wElBhBJRfBF5Iez7Qkxte1fQ0eLpnOOJzPBkw,8034
 karrio/server/pricing/tests.py,sha256=iaTqsY2pSPR1YRy9TqjhkfvRN8776l0Zoh4xeT0awQc,24818
 karrio/server/pricing/views.py,sha256=xc1IQHrsij7j33TUbo-_oewy3vs03pw_etpBWaMYJl0,63
 karrio/server/pricing/migrations/0001_initial.py,sha256=KKEklxf8Q1-IQn-8ZchbCi3-zmIyjn80DaGqPgRRI5w,52327
@@ -86,7 +86,7 @@ karrio/server/pricing/migrations/0077_migrate_surcharge_to_markup_data.py,sha256
 karrio/server/pricing/migrations/0078_cleanup.py,sha256=aEO5ceQ6-35jz3mGblQ2RD_144Uu-gVAjaEckqHM1OM,4263
 karrio/server/pricing/migrations/0079_fee_snapshot_model.py,sha256=n18S32UPAp_WMzVL4_Hf96drwGPE72pc45Ul2qPs-nk,9843
 karrio/server/pricing/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-karrio_server_pricing-2026.1.3.dist-info/METADATA,sha256=MJAX7agk7MRZSlPuQ7g0zOUHWr70ymy9D5w5oXDQ5-I,684
-karrio_server_pricing-2026.1.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-karrio_server_pricing-2026.1.3.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_pricing-2026.1.3.dist-info/RECORD,,
+karrio_server_pricing-2026.1.5.dist-info/METADATA,sha256=0TayHwWKp9oIXYgD6rqDflmIK5Qdu9BT-KDN49g04VM,684
+karrio_server_pricing-2026.1.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+karrio_server_pricing-2026.1.5.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_pricing-2026.1.5.dist-info/RECORD,,