diff --git a/la_chariotte/order/templates/order/grouped_order_detail.html b/la_chariotte/order/templates/order/grouped_order_detail.html index d9d6b5e..547151d 100644 --- a/la_chariotte/order/templates/order/grouped_order_detail.html +++ b/la_chariotte/order/templates/order/grouped_order_detail.html @@ -59,7 +59,7 @@ {% if error_message %}

{{ error_message }}

{% endif %}
-

Vos informations

+

Vos informations

diff --git a/la_chariotte/order/templates/order/grouped_order_overview.html b/la_chariotte/order/templates/order/grouped_order_overview.html index 6ebdeef..60998dd 100644 --- a/la_chariotte/order/templates/order/grouped_order_overview.html +++ b/la_chariotte/order/templates/order/grouped_order_overview.html @@ -7,6 +7,7 @@ {% block content %}

@@ -24,6 +25,22 @@
+ +
+

Partager et imprimer

+
+
+

Pour partager cette commande, il vous suffit de copier ce lien et de l'envoyer à vos connaissances :

+ + +
+
+

Pour vous aider à distribuer les produits le jour J, vous pouvez imprimer la liste des commandes : + ici

+
+
+
+

Produits commandés

@@ -80,4 +97,20 @@
- {% endblock %} \ No newline at end of file + {% endblock %} + + \ No newline at end of file diff --git a/la_chariotte/order/views.py b/la_chariotte/order/views.py index cfda76b..5f68aad 100644 --- a/la_chariotte/order/views.py +++ b/la_chariotte/order/views.py @@ -71,9 +71,18 @@ class GroupedOrderOverview(UserPassesTestMixin, generic.DetailView): return self.get_object().orga == self.request.user def get(self, request, *args, **kwargs): + # Compute grouped order total price before display self.get_object().compute_total_price() return super().get(self, request, *args, **kwargs) + def get_context_data(self, **kwargs): + context = super(GroupedOrderOverview, self).get_context_data(**kwargs) + # Add share link to context + context["share_link"] = self.request.build_absolute_uri( + reverse("order:grouped_order_detail", args=(self.get_object().pk,)) + ) + return context + class GroupedOrderCreateView(LoginRequiredMixin, generic.CreateView): """View for creating a new grouped order""" diff --git a/la_chariotte/static/css/app.css b/la_chariotte/static/css/app.css index 5b456be..3903f0c 100644 --- a/la_chariotte/static/css/app.css +++ b/la_chariotte/static/css/app.css @@ -10375,6 +10375,10 @@ a.navbar-item:hover { border: #e9b049 1px solid !important; } +.input.custom-width { + width: unset; +} + @media screen and (max-width: 1023px) { table { display: block; diff --git a/la_chariotte/static/sass/base/_buttons.sass b/la_chariotte/static/sass/base/_form.sass similarity index 74% rename from la_chariotte/static/sass/base/_buttons.sass rename to la_chariotte/static/sass/base/_form.sass index 1dd8641..24d2acf 100644 --- a/la_chariotte/static/sass/base/_buttons.sass +++ b/la_chariotte/static/sass/base/_form.sass @@ -1,3 +1,4 @@ +// Buttons .button white-space: normal height: auto @@ -9,4 +10,8 @@ .button.is-info, .button.is-info:hover color: $bright-black !important &.is-light - border: $beige 1px solid !important \ No newline at end of file + border: $beige 1px solid !important + +// Input +.input.custom-width + width: unset \ No newline at end of file diff --git a/la_chariotte/static/sass/style.sass b/la_chariotte/static/sass/style.sass index 13e64de..b225d44 100644 --- a/la_chariotte/static/sass/style.sass +++ b/la_chariotte/static/sass/style.sass @@ -12,5 +12,5 @@ @import "./base/global" @import "./base/navbar" @import "./base/content" -@import "./base/buttons" +@import "./base/form" @import "./base/table" \ No newline at end of file diff --git a/la_chariotte/templates/base.html b/la_chariotte/templates/base.html index 372e293..46f0284 100644 --- a/la_chariotte/templates/base.html +++ b/la_chariotte/templates/base.html @@ -140,4 +140,5 @@ }); }); + {% block extra_js %}{% endblock %} \ No newline at end of file