kopia lustrzana https://github.com/longclawshop/longclaw
Deals with the deprecation of request.site in wagtail 2.9 (#488)
rodzic
7d4c22ca64
commit
cfd2df17e0
|
@ -55,7 +55,7 @@ class PaypalVZeroPayment(BasePayment):
|
||||||
self.gateway = braintree.BraintreeGateway(access_token=settings.VZERO_ACCESS_TOKEN)
|
self.gateway = braintree.BraintreeGateway(access_token=settings.VZERO_ACCESS_TOKEN)
|
||||||
|
|
||||||
def create_payment(self, request, amount, description=''):
|
def create_payment(self, request, amount, description=''):
|
||||||
config = Configuration.for_site(request.site)
|
config = Configuration.for_request(request)
|
||||||
nonce = request.POST.get('payment_method_nonce')
|
nonce = request.POST.get('payment_method_nonce')
|
||||||
result = self.gateway.transaction.sale({
|
result = self.gateway.transaction.sale({
|
||||||
"amount": str(amount),
|
"amount": str(amount),
|
||||||
|
|
|
@ -15,7 +15,7 @@ class StripePayment(BasePayment):
|
||||||
|
|
||||||
def create_payment(self, request, amount, description=''):
|
def create_payment(self, request, amount, description=''):
|
||||||
try:
|
try:
|
||||||
currency = Configuration.for_site(request.site).currency
|
currency = Configuration.for_request(request).currency
|
||||||
charge = stripe.Charge.create(
|
charge = stripe.Charge.create(
|
||||||
amount=int(math.ceil(amount * 100)), # Amount in pence
|
amount=int(math.ceil(amount * 100)), # Amount in pence
|
||||||
currency=currency.lower(),
|
currency=currency.lower(),
|
||||||
|
|
|
@ -64,7 +64,7 @@ def create_order(email,
|
||||||
|
|
||||||
ip_address = get_client_ip(request)
|
ip_address = get_client_ip(request)
|
||||||
if shipping_country and shipping_option:
|
if shipping_country and shipping_option:
|
||||||
site_settings = Configuration.for_site(request.site)
|
site_settings = Configuration.for_request(request)
|
||||||
shipping_rate = get_shipping_cost(
|
shipping_rate = get_shipping_cost(
|
||||||
site_settings,
|
site_settings,
|
||||||
shipping_address.country.pk,
|
shipping_address.country.pk,
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
from longclaw.configuration.models import Configuration
|
from longclaw.configuration.models import Configuration
|
||||||
|
|
||||||
def currency(request):
|
def currency(request):
|
||||||
config = Configuration.for_site(request.site)
|
config = Configuration.for_request(request)
|
||||||
return {
|
return {
|
||||||
'currency_html_code': config.currency_html_code,
|
'currency_html_code': config.currency_html_code,
|
||||||
'currency': config.currency
|
'currency': config.currency
|
||||||
|
|
|
@ -52,7 +52,7 @@ def get_shipping_cost_kwargs(request, country=None):
|
||||||
|
|
||||||
bid = basket_id(request)
|
bid = basket_id(request)
|
||||||
option = request.query_params.get('shipping_rate_name', 'standard')
|
option = request.query_params.get('shipping_rate_name', 'standard')
|
||||||
settings = Configuration.for_site(request.site)
|
settings = Configuration.for_request(request)
|
||||||
|
|
||||||
return dict(country_code=country_code, destination=destination, basket_id=bid, settings=settings, name=option)
|
return dict(country_code=country_code, destination=destination, basket_id=bid, settings=settings, name=option)
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ register = template.Library()
|
||||||
def shipping_rate(context, **kwargs):
|
def shipping_rate(context, **kwargs):
|
||||||
"""Return the shipping rate for a country & shipping option name.
|
"""Return the shipping rate for a country & shipping option name.
|
||||||
"""
|
"""
|
||||||
settings = Configuration.for_site(context["request"].site)
|
settings = Configuration.for_request(context["request"])
|
||||||
code = kwargs.get('code', None)
|
code = kwargs.get('code', None)
|
||||||
name = kwargs.get('name', None)
|
name = kwargs.get('name', None)
|
||||||
return get_shipping_cost(settings, code, name)
|
return get_shipping_cost(settings, code, name)
|
||||||
|
|
|
@ -71,7 +71,7 @@ class ShippingTests(LongclawTestCase):
|
||||||
self.assertEqual(result['country_code'], 'US')
|
self.assertEqual(result['country_code'], 'US')
|
||||||
self.assertEqual(result['destination'], None)
|
self.assertEqual(result['destination'], None)
|
||||||
self.assertEqual(result['basket_id'], basket_id(api_request))
|
self.assertEqual(result['basket_id'], basket_id(api_request))
|
||||||
self.assertEqual(result['settings'], Configuration.for_site(api_request.site))
|
self.assertEqual(result['settings'], Configuration.for_request(api_request))
|
||||||
self.assertEqual(result['name'], 'standard')
|
self.assertEqual(result['name'], 'standard')
|
||||||
|
|
||||||
def test_get_shipping_cost_kwargs_country_code_and_shipping_rate_name(self):
|
def test_get_shipping_cost_kwargs_country_code_and_shipping_rate_name(self):
|
||||||
|
@ -81,7 +81,7 @@ class ShippingTests(LongclawTestCase):
|
||||||
self.assertEqual(result['country_code'], 'US')
|
self.assertEqual(result['country_code'], 'US')
|
||||||
self.assertEqual(result['destination'], None)
|
self.assertEqual(result['destination'], None)
|
||||||
self.assertEqual(result['basket_id'], basket_id(api_request))
|
self.assertEqual(result['basket_id'], basket_id(api_request))
|
||||||
self.assertEqual(result['settings'], Configuration.for_site(api_request.site))
|
self.assertEqual(result['settings'], Configuration.for_request(api_request))
|
||||||
self.assertEqual(result['name'], 'foo')
|
self.assertEqual(result['name'], 'foo')
|
||||||
|
|
||||||
def test_get_shipping_cost_kwargs_only_country(self):
|
def test_get_shipping_cost_kwargs_only_country(self):
|
||||||
|
@ -91,7 +91,7 @@ class ShippingTests(LongclawTestCase):
|
||||||
self.assertEqual(result['country_code'], self.country.pk)
|
self.assertEqual(result['country_code'], self.country.pk)
|
||||||
self.assertEqual(result['destination'], None)
|
self.assertEqual(result['destination'], None)
|
||||||
self.assertEqual(result['basket_id'], basket_id(api_request))
|
self.assertEqual(result['basket_id'], basket_id(api_request))
|
||||||
self.assertEqual(result['settings'], Configuration.for_site(api_request.site))
|
self.assertEqual(result['settings'], Configuration.for_request(api_request))
|
||||||
self.assertEqual(result['name'], 'standard')
|
self.assertEqual(result['name'], 'standard')
|
||||||
|
|
||||||
def test_get_shipping_cost_kwargs_only_country_known_iso(self):
|
def test_get_shipping_cost_kwargs_only_country_known_iso(self):
|
||||||
|
@ -102,7 +102,7 @@ class ShippingTests(LongclawTestCase):
|
||||||
self.assertEqual(result['country_code'], 'ZZ')
|
self.assertEqual(result['country_code'], 'ZZ')
|
||||||
self.assertEqual(result['destination'], None)
|
self.assertEqual(result['destination'], None)
|
||||||
self.assertEqual(result['basket_id'], basket_id(api_request))
|
self.assertEqual(result['basket_id'], basket_id(api_request))
|
||||||
self.assertEqual(result['settings'], Configuration.for_site(api_request.site))
|
self.assertEqual(result['settings'], Configuration.for_request(api_request))
|
||||||
self.assertEqual(result['name'], 'standard')
|
self.assertEqual(result['name'], 'standard')
|
||||||
|
|
||||||
def test_get_shipping_cost_kwargs_with_destination(self):
|
def test_get_shipping_cost_kwargs_with_destination(self):
|
||||||
|
@ -113,7 +113,7 @@ class ShippingTests(LongclawTestCase):
|
||||||
self.assertEqual(result['country_code'], destination.country.pk)
|
self.assertEqual(result['country_code'], destination.country.pk)
|
||||||
self.assertEqual(result['destination'], destination)
|
self.assertEqual(result['destination'], destination)
|
||||||
self.assertEqual(result['basket_id'], basket_id(api_request))
|
self.assertEqual(result['basket_id'], basket_id(api_request))
|
||||||
self.assertEqual(result['settings'], Configuration.for_site(api_request.site))
|
self.assertEqual(result['settings'], Configuration.for_request(api_request))
|
||||||
self.assertEqual(result['name'], 'standard')
|
self.assertEqual(result['name'], 'standard')
|
||||||
|
|
||||||
def test_get_shipping_cost_kwargs_with_destination_and_country_code(self):
|
def test_get_shipping_cost_kwargs_with_destination_and_country_code(self):
|
||||||
|
@ -125,7 +125,7 @@ class ShippingTests(LongclawTestCase):
|
||||||
self.assertEqual(result['country_code'], '11')
|
self.assertEqual(result['country_code'], '11')
|
||||||
self.assertEqual(result['destination'], destination)
|
self.assertEqual(result['destination'], destination)
|
||||||
self.assertEqual(result['basket_id'], basket_id(api_request))
|
self.assertEqual(result['basket_id'], basket_id(api_request))
|
||||||
self.assertEqual(result['settings'], Configuration.for_site(api_request.site))
|
self.assertEqual(result['settings'], Configuration.for_request(api_request))
|
||||||
self.assertEqual(result['name'], 'standard')
|
self.assertEqual(result['name'], 'standard')
|
||||||
|
|
||||||
def test_create_address(self):
|
def test_create_address(self):
|
||||||
|
|
|
@ -48,7 +48,7 @@ class ProductCount(LongclawSummaryItem):
|
||||||
class MonthlySales(LongclawSummaryItem):
|
class MonthlySales(LongclawSummaryItem):
|
||||||
order = 30
|
order = 30
|
||||||
def get_context(self):
|
def get_context(self):
|
||||||
settings = Configuration.for_site(self.request.site)
|
settings = Configuration.for_request(self.request)
|
||||||
sales = stats.sales_for_time_period(*stats.current_month())
|
sales = stats.sales_for_time_period(*stats.current_month())
|
||||||
return {
|
return {
|
||||||
'total': "{}{}".format(settings.currency_html_code,
|
'total': "{}{}".format(settings.currency_html_code,
|
||||||
|
|
Ładowanie…
Reference in New Issue