From fa908d4024cfacd8d94236aa64b1550c015cba94 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Sat, 2 May 2020 18:59:26 +0100 Subject: [PATCH] Extract change_order_cycle partial from main enterprise shop view --- .../enterprises/_change_order_cycle.html.haml | 24 +++++++++++++++++ app/views/enterprises/shop.html.haml | 26 +------------------ 2 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 app/views/enterprises/_change_order_cycle.html.haml diff --git a/app/views/enterprises/_change_order_cycle.html.haml b/app/views/enterprises/_change_order_cycle.html.haml new file mode 100644 index 0000000000..4f9f20bab2 --- /dev/null +++ b/app/views/enterprises/_change_order_cycle.html.haml @@ -0,0 +1,24 @@ +%div{"ng-controller" => "OrderCycleChangeCtrl", "ng-cloak" => true} + %closing + %div{"ng-if" => "OrderCycle.selected()"} + = t :enterprises_next_closing + %strong {{ OrderCycle.orders_close_at() | date_in_words }} + %div{"ng-if" => "!OrderCycle.selected()"} + = t :enterprises_choose + + .order-cycle-select + .select-label + %span= t :enterprises_ready_for + + - if oc_select_options.count == 1 + %p + = oc_select_options.first[:time] + + - else + %select.select2.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", + "ofn-change-order-cycle" => true, + "disabled" => require_customer?, + "ng-options" => "oc.id as oc.time for oc in #{oc_select_options.to_json}"} + + - if oc_select_options.count > 1 + %option{value: "", disabled: "", selected: ""}= t :shopping_oc_select diff --git a/app/views/enterprises/shop.html.haml b/app/views/enterprises/shop.html.haml index 6414e82546..893d43678d 100644 --- a/app/views/enterprises/shop.html.haml +++ b/app/views/enterprises/shop.html.haml @@ -17,31 +17,7 @@ %a.close{ ng: { click: "alert.close()" } } × - content_for :order_cycle_form do - - %div{"ng-controller" => "OrderCycleChangeCtrl", "ng-cloak" => true} - %closing - %div{"ng-if" => "OrderCycle.selected()"} - = t :enterprises_next_closing - %strong {{ OrderCycle.orders_close_at() | date_in_words }} - %div{"ng-if" => "!OrderCycle.selected()"} - = t :enterprises_choose - - .order-cycle-select - .select-label - %span= t :enterprises_ready_for - - - if oc_select_options.count == 1 - %p - = oc_select_options.first[:time] - - - else - %select.select2.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", - "ofn-change-order-cycle" => true, - "disabled" => require_customer?, - "ng-options" => "oc.id as oc.time for oc in #{oc_select_options.to_json}"} - - - if oc_select_options.count > 1 - %option{value: "", disabled: "", selected: ""}= t :shopping_oc_select + = render partial: "change_order_cycle" - content_for :ordercycle_sidebar do .show-for-large-up.large-4.columns