diff --git a/webshop/templates/includes/cart/cart_payment_summary.html b/webshop/templates/includes/cart/cart_payment_summary.html index b5655a237b..b81053b6aa 100644 --- a/webshop/templates/includes/cart/cart_payment_summary.html +++ b/webshop/templates/includes/cart/cart_payment_summary.html @@ -51,16 +51,6 @@
{% endif %} - - {% if cart_settings.enable_checkout %} - - {% else %} - - {% endif %} diff --git a/webshop/templates/includes/cart/place_order.html b/webshop/templates/includes/cart/place_order.html new file mode 100644 index 0000000000..a6d638bfea --- /dev/null +++ b/webshop/templates/includes/cart/place_order.html @@ -0,0 +1,13 @@ +
+
+ {% if cart_settings.enable_checkout %} + + {% else %} + + {% endif %} +
+
\ No newline at end of file diff --git a/webshop/templates/pages/cart.html b/webshop/templates/pages/cart.html index 155bb3c3fa..613ffc5a55 100644 --- a/webshop/templates/pages/cart.html +++ b/webshop/templates/pages/cart.html @@ -94,8 +94,14 @@
{{ _("Terms and Conditions") }}
{% endif %} -
- {% include "templates/includes/cart/cart_payment_summary.html" %} +
+
+ {% include "templates/includes/cart/cart_payment_summary.html" %} +
+ +
+ {% include "templates/includes/cart/place_order.html" %} +
{% include "templates/includes/cart/cart_address.html" %} diff --git a/webshop/webshop/doctype/webshop_settings/webshop_settings.json b/webshop/webshop/doctype/webshop_settings/webshop_settings.json index f29e1074e3..b0471b7ff5 100644 --- a/webshop/webshop/doctype/webshop_settings/webshop_settings.json +++ b/webshop/webshop/doctype/webshop_settings/webshop_settings.json @@ -15,8 +15,8 @@ "hide_variants", "enable_variants", "show_price", - "login_required_to_view_products", "column_break_9", + "login_required_to_view_products", "show_stock_availability", "show_quantity_in_website", "allow_items_not_in_stock", @@ -378,7 +378,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2024-11-05 13:31:46.657592", + "modified": "2024-12-16 16:22:51.445190", "modified_by": "Administrator", "module": "Webshop", "name": "Webshop Settings", @@ -393,6 +393,10 @@ "role": "System Manager", "share": 1, "write": 1 + }, + { + "read": 1, + "role": "All" } ], "sort_field": "modified",