ソースを参照

Implemented line_price_incl_tax_incl_discounts based on line_price_excl_tax_incl_discounts when only excl_tax_discounts is known.

master
Lars van de Kerkhof 2年前
コミット
2fdee65ccf
1個のファイルの変更10行の追加7行の削除
  1. 10
    7
      src/oscar/apps/basket/abstract_models.py

+ 10
- 7
src/oscar/apps/basket/abstract_models.py ファイルの表示

1
 import zlib
1
 import zlib
2
-from decimal import Decimal as D
2
+from decimal import Decimal as D, ROUND_HALF_DOWN
3
 from operator import itemgetter
3
 from operator import itemgetter
4
 
4
 
5
 from django.conf import settings
5
 from django.conf import settings
983
         if self.line_price_incl_tax is not None and incl_tax_discounts:
983
         if self.line_price_incl_tax is not None and incl_tax_discounts:
984
             return max(0, self.line_price_incl_tax - self._discount_incl_tax)
984
             return max(0, self.line_price_incl_tax - self._discount_incl_tax)
985
         elif self.line_price_excl_tax is not None and excl_tax_discounts:
985
         elif self.line_price_excl_tax is not None and excl_tax_discounts:
986
-            return max(
987
-                0,
988
-                round_half_up(
989
-                    (self.line_price_excl_tax - excl_tax_discounts) / self._tax_ratio
990
-                ),
991
-            )
986
+            return round_half_up(self.line_price_excl_tax_incl_discounts / self._tax_ratio)
987
+            # return max(0, self.line_price_incl_tax - (excl_tax_discounts / self._tax_ratio).quantize(D("0.01"), ROUND_HALF_DOWN))
988
+            # return max(0, self.line_price_incl_tax - round_half_up(excl_tax_discounts / self._tax_ratio))
989
+            # return max(
990
+            #     0,
991
+            #     round_half_up(
992
+            #         (self.line_price_excl_tax - excl_tax_discounts) / self._tax_ratio
993
+            #     ),
994
+            # )
992
 
995
 
993
         return self.line_price_incl_tax
996
         return self.line_price_incl_tax
994
 
997
 

読み込み中…
キャンセル
保存