From a78d8fa6afec317574aba45e972b965dc258ff93 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Wed, 18 Nov 2015 15:54:02 +1100 Subject: [PATCH] Build exchange form on front-end --- app/views/admin/order_cycles/_add_exchange_form.html.haml | 6 ++++++ app/views/admin/order_cycles/_form.html.haml | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 app/views/admin/order_cycles/_add_exchange_form.html.haml diff --git a/app/views/admin/order_cycles/_add_exchange_form.html.haml b/app/views/admin/order_cycles/_add_exchange_form.html.haml new file mode 100644 index 0000000000..b21f51ef3c --- /dev/null +++ b/app/views/admin/order_cycles/_add_exchange_form.html.haml @@ -0,0 +1,6 @@ +%select{id: "new_#{type}_id", name: "new_#{type}_id", 'ng-model' => "new_#{type}_id"} + %option{"ng-repeat" => "enterprise in #{type}_enterprises|orderBy:'name'", "value" => "{{ enterprise.id }}", "ng-disabled" => "enterprise.issues_summary_#{type}"} + {{ enterprise.name }} + = "{{ enterprise.issues_summary_#{type} ? '('+enterprise.issues_summary_#{type}+')' : '' }}" + += f.submit "Add #{type}", 'ng-click' => "add#{type.capitalize}($event)" diff --git a/app/views/admin/order_cycles/_form.html.haml b/app/views/admin/order_cycles/_form.html.haml index 4f2d52382e..ad8a9a5822 100644 --- a/app/views/admin/order_cycles/_form.html.haml +++ b/app/views/admin/order_cycles/_form.html.haml @@ -24,9 +24,7 @@ = render 'exchange_supplied_products_form' - if Enterprise.managed_by(spree_current_user).include? @order_cycle.coordinator - = select_tag :new_supplier_id, options_for_select(permitted_producer_enterprise_options_for(@order_cycle)), {'ng-model' => 'new_supplier_id'} - - = f.submit 'Add supplier', 'ng-click' => 'addSupplier($event)' + = render 'add_exchange_form', f: f, type: 'supplier' %h2 Outgoing %table.exchanges @@ -49,8 +47,7 @@ = render 'exchange_distributed_products_form' - if Enterprise.managed_by(spree_current_user).include? @order_cycle.coordinator - = select_tag :new_distributor_id, options_for_select(permitted_hub_enterprise_options_for(@order_cycle)), {'ng-model' => 'new_distributor_id'} - = f.submit 'Add distributor', 'ng-click' => 'addDistributor($event)' + = render 'add_exchange_form', f: f, type: 'distributor' .actions - if @order_cycle.new_record?