From ac361d3b64dca6ef303e3394f8aec3bee5c25d9a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Thu, 17 Mar 2022 10:22:38 +0100 Subject: [PATCH] Add already_opened on each step --- .../split_checkout/_already_ordered.html.haml | 3 +++ app/views/split_checkout/_checkout.html.haml | 1 + app/webpacker/css/darkswarm/split-checkout.scss | 14 ++++++++++++++ config/locales/en.yml | 3 +++ 4 files changed, 21 insertions(+) create mode 100644 app/views/split_checkout/_already_ordered.html.haml diff --git a/app/views/split_checkout/_already_ordered.html.haml b/app/views/split_checkout/_already_ordered.html.haml new file mode 100644 index 0000000000..a5361811cf --- /dev/null +++ b/app/views/split_checkout/_already_ordered.html.haml @@ -0,0 +1,3 @@ +.already-ordered + .panel.medium-6 + = t("split_checkout.already_ordered.message_html", cart: link_to(t('split_checkout.already_ordered.cart'), "#{main_app.cart_path}#bought-products")) diff --git a/app/views/split_checkout/_checkout.html.haml b/app/views/split_checkout/_checkout.html.haml index f26c8c4ca9..1100f1b28e 100644 --- a/app/views/split_checkout/_checkout.html.haml +++ b/app/views/split_checkout/_checkout.html.haml @@ -1,4 +1,5 @@ %checkout.row#checkout .small-12.medium-12.columns = render partial: "split_checkout/tabs" + = render partial: "split_checkout/already_ordered" if @already_ordered = render partial: "split_checkout/form" diff --git a/app/webpacker/css/darkswarm/split-checkout.scss b/app/webpacker/css/darkswarm/split-checkout.scss index a336878767..cd7a821fb0 100644 --- a/app/webpacker/css/darkswarm/split-checkout.scss +++ b/app/webpacker/css/darkswarm/split-checkout.scss @@ -58,6 +58,20 @@ } } +.already-ordered { + .panel { + margin-top: 3rem; + background-color: $grey-250; + border: 1px solid $tiny-blue; + color: $grey-700; + + &.medium-6, &.medium-10 { + margin-right: auto; + margin-left: auto; + } + } +} + .checkout-step { margin-top: 3rem; diff --git a/config/locales/en.yml b/config/locales/en.yml index 585bc57ff0..4defdc791a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1745,6 +1745,9 @@ en: your_details_without_number: Your details payment_method_without_number: Payment method order_summary_without_number: Order summary + already_ordered: + cart: "cart" + message_html: "You have an order for this order cycle already. Check the %{cart} to see the items you ordered before. You can also cancel items as long as the order cycle is open." step1: your_details: title: Your details