diff --git a/config/settings/base.py b/config/settings/base.py index e84e3bd..96df0ee 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -66,7 +66,10 @@ MIDDLEWARE = DJANGO_MIDDLEWARE + PROJECT_MIDDLEWARE if DEBUG: INSTALLED_APPS += ["silk"] - MIDDLEWARE += ["silk.middleware.SilkyMiddleware", "django_browser_reload.middleware.BrowserReloadMiddleware",] + MIDDLEWARE += [ + "silk.middleware.SilkyMiddleware", + "django_browser_reload.middleware.BrowserReloadMiddleware", + ] ROOT_URLCONF = "config.urls" diff --git a/config/urls.py b/config/urls.py index e1ce1f6..1e1dc25 100644 --- a/config/urls.py +++ b/config/urls.py @@ -16,4 +16,7 @@ urlpatterns = [ if settings.DEBUG: urlpatterns.append(path("__debug__/", include(debug_toolbar.urls))) urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) - urlpatterns += [path("silk/", include("silk.urls")), path("__reload__/", include("django_browser_reload.urls")),] + urlpatterns += [ + path("silk/", include("silk.urls")), + path("__reload__/", include("django_browser_reload.urls")), + ] diff --git a/shop/models.py b/shop/models.py index 4d056a8..dd2b953 100644 --- a/shop/models.py +++ b/shop/models.py @@ -450,7 +450,7 @@ class Order(TimestampedModel): class Meta: verbose_name = _("pedido") verbose_name_plural = _("pedidos") - ordering = ("creation_date", ) + ordering = ("creation_date",) class Cart(models.Model): diff --git a/web/views/components.py b/web/views/components.py index 028896f..2f95763 100644 --- a/web/views/components.py +++ b/web/views/components.py @@ -87,7 +87,9 @@ def cart(request, *args, **kwargs): for item in items: price = ProductPrice.objects.filter(product=item.product, current=True).first() base_total += price.price * item.quantity - tax_total += round(price.price * Decimal(price.tax.value / 100), 2) + tax_total += round( + price.price * Decimal(price.tax.value / 100) * item.quantity, 2 + ) total = base_total + tax_total diff --git a/web/views/web.py b/web/views/web.py index 44f85aa..fcda7e2 100644 --- a/web/views/web.py +++ b/web/views/web.py @@ -166,8 +166,10 @@ class OrderDetail(TemplateView): order=order, product__is_shipping_method=False, ).aggregate(amount=Sum("taxes")).get("amount") or Decimal("0") + settings = WebSettings.load() return { + "web_title": settings.web_title, "order": order, "items": items, "signature_version": parameters.get("Ds_SignatureVersion"), @@ -197,7 +199,9 @@ class OrdersView(TemplateView, FilteredQuerysetMixin, PaginatedQuerysetMixin): template_name = "web/orders.html" def get_queryset(self): - return Order.objects.filter(user=self.request.user).exclude(status=Order.Statuses.STATUS_PENDING) + return Order.objects.filter(user=self.request.user).exclude( + status=Order.Statuses.STATUS_PENDING + ) def get_context_data(self, **kwargs): settings = WebSettings.load()