From 8a7e2865edca870e7a5803a9a99516b0beec1804 Mon Sep 17 00:00:00 2001 From: phzhik Date: Thu, 12 Oct 2023 08:50:13 +0400 Subject: [PATCH] * Get max commission value --- store/models.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/store/models.py b/store/models.py index be72075..d32e132 100644 --- a/store/models.py +++ b/store/models.py @@ -459,14 +459,16 @@ class Checklist(models.Model): if self.price_snapshot_id: return self.price_snapshot.commission_rub + # Default commission + commission = GlobalSettings.load().commission_rub + if self.price_rub > 150_000: - commission = self.price_rub * Decimal(settings.COMMISSION_OVER_150K) - elif self.category_id: + commission = max(commission, self.price_rub * Decimal(settings.COMMISSION_OVER_150K)) + + if self.category_id: # Add commission of bottom-most category category_commission = getattr(self.category, 'commission', 0) - commission = category_commission * self.price_rub / 100 - else: - commission = GlobalSettings.load().commission_rub + commission = max(commission, category_commission * self.price_rub / 100) return commission