diff --git a/web/templates/components/users/user_dropdown.html b/web/templates/components/users/user_dropdown.html index 64d42ee..abf9c3b 100644 --- a/web/templates/components/users/user_dropdown.html +++ b/web/templates/components/users/user_dropdown.html @@ -12,30 +12,12 @@ {% translate 'Mis pedidos' %} -
  • - - {% translate 'Ajustes' %} - -
  • {% translate 'Lista de deseados' %}
  • -
  • - - {% translate 'Direcciones de envío' %} - -
  • -
  • - - {% translate 'Métodos de pago' %} - -
  • diff --git a/web/templates/web/order.html b/web/templates/web/order.html index 34003f9..9760699 100644 --- a/web/templates/web/order.html +++ b/web/templates/web/order.html @@ -13,6 +13,7 @@ {% trans 'Pagado' %} {% endif %} +
    @@ -32,7 +33,7 @@
    - {{ item.quantity }}x + {{ item.quantity|floatformat }}x
    @@ -53,6 +54,7 @@
    + {% endfor %} {% if items.count == 0 %} @@ -73,11 +75,12 @@
    -

    {{ order.shipping_address }}

    -

    {{ order.shipping_city }}

    -

    {{ order.shipping_state }}

    -

    {{ order.shipping_country }}

    -

    {{ order.shipping_zip }}

    +

    {{ order.email }}

    +

    {{ order.shipping_address }}

    +

    {{ order.shipping_city }}

    +

    {{ order.shipping_state }}

    +

    {{ order.shipping_country }}

    +

    {{ order.shipping_zip }}

    @@ -87,11 +90,11 @@
    -

    {{ order.billing_address }}

    -

    {{ order.billing_city }}

    -

    {{ order.billing_state }}

    -

    {{ order.billing_country }}

    -

    {{ order.billing_zip }}

    +

    {{ order.billing_address }}

    +

    {{ order.billing_city }}

    +

    {{ order.billing_state }}

    +

    {{ order.billing_country }}

    +

    {{ order.billing_zip }}

    @@ -101,9 +104,7 @@ {% translate 'Método de envío' %} -
    - {{ order.shipping_method.name }} -
    +

    {{ order.shipping_method.name }}

    @@ -180,12 +181,9 @@
    {% endif %} - - - {% endblock %} diff --git a/web/views/web.py b/web/views/web.py index df8e3e7..1346994 100644 --- a/web/views/web.py +++ b/web/views/web.py @@ -110,6 +110,8 @@ class CartDetail(TemplateView, CreateView): shipping_address_zip = form.cleaned_data.get("shipping_address_zip") shipping_address_phone = form.cleaned_data.get("shipping_address_phone") + email = form.cleaned_data.get("email") + shipping_method = get_object_or_404(ShippingMethod, pk=shipping_method_id) order = create_order_from_cart( @@ -128,6 +130,7 @@ class CartDetail(TemplateView, CreateView): shipping_address_country=shipping_address_country, shipping_address_zip=shipping_address_zip, shipping_address_phone=shipping_address_phone, + email=email, ) return redirect(reverse("web:order", kwargs={"uuid": order.uuid}))