Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions apps/checkout/applicator.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
from decimal import Decimal as D

from oscar.apps.checkout import applicator

from apps.checkout.surcharges import FlatCharge


class SurchargeApplicator(applicator.SurchargeApplicator):
def __init__(self, request=None, context=None):
super().__init__(request=request, context=context)

def get_payment_method(self):
return self.request.POST.get('payment_method')

def get_surcharges(self, basket, **kwargs):
from apps.payment.models import PaymentMethod

try:
payment_method = PaymentMethod.objects.get(pk=self.get_payment_method())
except PaymentMethod.DoesNotExist:
return ()
if not payment_method or payment_method.charges <= 0:
return ()
return (
FlatCharge(
name=payment_method.title,
code=payment_method.payment_gateway.slug,
excl_tax=D(payment_method.charges * payment_method.currency_factory),
incl_tax=D(payment_method.charges * payment_method.currency_factory)
),
)
5 changes: 4 additions & 1 deletion apps/checkout/apps.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import oscar.apps.checkout.apps as apps
from oscar.core.loading import get_class

from apps.checkout.applicator import SurchargeApplicator


class CheckoutConfig(apps.CheckoutConfig):
name = 'apps.checkout'
surcharge_applicator_class = SurchargeApplicator

def ready(self):
super(CheckoutConfig,self).ready()
super(CheckoutConfig, self).ready()
self.payment_details_view = get_class('checkout.views', 'PaymentDetailsView')
8 changes: 8 additions & 0 deletions apps/checkout/surcharges.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
from oscar.apps.checkout.surcharges import FlatCharge


class FlatCharge(FlatCharge):
def __init__(self, name, code, excl_tax=None, incl_tax=None):
super().__init__(excl_tax=excl_tax, incl_tax=incl_tax)
self.name = name
self.code = code
6 changes: 4 additions & 2 deletions apps/checkout/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from django_tenants.utils import get_model
from oscar.core.loading import get_class

from apps.checkout.applicator import SurchargeApplicator
from apps.payment.models import PaymentMethod

BillingAddress = get_model("order", "BillingAddress")
Expand Down Expand Up @@ -43,7 +44,6 @@ def handle_payment(self, order_number, total, **kwargs):
currency=total.currency,
amount_allocated=total.incl_tax,
amount_debited=total.incl_tax

)

self.add_payment_source(source)
Expand All @@ -63,8 +63,10 @@ def render_preview(self, request, **kwargs):
paypal_object_str = self.is_paypal_payment(request)
try:
payment_method_object = PaymentMethod.objects.get(pk=payment_method)
basket_surcharges = SurchargeApplicator(request=request).get_surcharges(basket=request.basket)

kwargs.update(dict(payment_method=payment_method_object, stripe_token=stripe_token,
paypal_object_str=paypal_object_str))
paypal_object_str=paypal_object_str, basket_surcharges=basket_surcharges))
except ValueError as e:
messages.error(
self.request,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ <h6 class="widget-product-title">
{% endif %}
</span>
</li>
{% for surcharge in basket_surcharges %}
<li class="d-flex justify-content-between align-items-center">
<span class="mr-2">{{ surcharge.name }}:</span>
<span class="text-right">{{ surcharge.excl_tax|currency:basket.currency }}</span>
</li>
{% endfor %}
<li class="d-flex justify-content-between align-items-center">
<span class="mr-2">Taxes:</span>
<span class="text-right">{{ basket.total_tax|currency:basket.currency }}</span>
Expand Down