Merge branch 'simple-order-cycles'

Conflicts:
	app/views/admin/order_cycles/_row.html.haml

app/views/admin/order_cycles/_form.html.haml

@@ -1,14 +1,4 @@
-= f.label :name
-= f.text_field :name, 'ng-model' => 'order_cycle.name', 'required' => true
-%br/
-
-.date-field
-  = f.label :orders_open_at, 'Orders open'
-  = f.text_field :orders_open_at, 'datetimepicker' => 'order_cycle.orders_open_at', 'ng-model' => 'order_cycle.orders_open_at'
-.date-field
-  = f.label :orders_close_at, 'Orders close'
-  = f.text_field :orders_close_at, 'datetimepicker' => 'order_cycle.orders_close_at', 'ng-model' => 'order_cycle.orders_close_at'
-%br/
+= render 'name_and_timing_form', f: f
 
 
 %h2 Incoming

app/views/admin/order_cycles/_name_and_timing_form.html.haml

@@ -0,0 +1,15 @@
+.row
+  .alpha.two.columns
+    = f.label :name
+  .fourteen.columns.omega
+    = f.text_field :name, 'ng-model' => 'order_cycle.name', 'required' => true
+
+.row
+  .alpha.two.columns
+    = f.label :orders_open_at, 'Orders open'
+  .six.columns
+    = f.text_field :orders_open_at, 'datetimepicker' => 'order_cycle.orders_open_at', 'ng-model' => 'order_cycle.orders_open_at'
+  .two.columns
+    = f.label :orders_close_at, 'Orders close'
+  .six.columns.omega
+    = f.text_field :orders_close_at, 'datetimepicker' => 'order_cycle.orders_close_at', 'ng-model' => 'order_cycle.orders_close_at'

app/views/admin/order_cycles/_row.html.haml

@@ -4,15 +4,17 @@
   %td= link_to order_cycle.name, main_app.edit_admin_order_cycle_path(order_cycle)
   %td= order_cycle_form.text_field :orders_open_at, :class => 'datetimepicker', :value => order_cycle.orders_open_at
   %td= order_cycle_form.text_field :orders_close_at, :class => 'datetimepicker', :value => order_cycle.orders_close_at
-  %td.suppliers
-    - order_cycle.suppliers.merge(OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises).each do |s|
-      = s.name
-      %br/
-  %td= order_cycle.coordinator.name
-  %td.distributors
-    - order_cycle.distributors.merge(OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises).each do |d|
-      = d.name
-      %br/
+
+  - unless order_cycles_simple_view
+    %td.suppliers
+      - order_cycle.suppliers.merge(OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises).each do |s|
+        = s.name
+        %br/
+    %td= order_cycle.coordinator.name
+    %td.distributors
+      - order_cycle.distributors.merge(OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises).each do |d|
+        = d.name
+        %br/
 
   %td.products
     - variant_images = capture do

app/views/admin/order_cycles/_simple_form.html.haml

@@ -0,0 +1,26 @@
+= render 'name_and_timing_form', f: f
+
+.row
+  .alpha.two.columns
+    = label_tag 'Pickup time'
+  .six.columns
+    = text_field_tag 'order_cycle_outgoing_exchange_0_pickup_time', '', 'id' => 'order_cycle_outgoing_exchange_0_pickup_time', 'placeholder' => 'Ready for (ie. Date / Time)', 'ng-model' => 'outgoing_exchange.pickup_time'
+  .two.columns
+    = label_tag 'Pickup instructions'
+  .six.columns.omega
+    = text_field_tag 'order_cycle_outgoing_exchange_0_pickup_instructions', '', 'id' => 'order_cycle_outgoing_exchange_0_pickup_instructions', 'placeholder' => 'Pick-up instructions', 'ng-model' => 'outgoing_exchange.pickup_instructions'
+
+%table.exchanges
+  %tbody{ng: {repeat: "exchange in order_cycle.incoming_exchanges"}}
+    %tr.products
+      = render 'exchange_supplied_products_form'
+
+= render 'coordinator_fees', f: f
+
+.actions
+  = f.submit @order_cycle.new_record? ? 'Create' : 'Update', 'ng-disabled' => '!loaded()'
+  %span{'ng-show' => 'loaded()'}
+    or
+    = link_to 'Cancel', main_app.admin_order_cycles_path
+  %span{'ng-hide' => 'loaded()'} Loading...
+

app/views/admin/order_cycles/edit.html.haml

@@ -1,4 +1,9 @@
 %h1 Edit Order Cycle
 
-= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'order_cycle', 'ng-controller' => 'AdminEditOrderCycleCtrl', 'ng-submit' => 'submit()'} do |f|
-  = render 'form', :f => f
+- ng_controller = order_cycles_simple_view ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
+
+= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.order_cycles', 'ng-controller' => ng_controller, 'ng-submit' => 'submit()'} do |f|
+  - if order_cycles_simple_view
+    = render 'simple_form', f: f
+  - else
+    = render 'form', f: f

app/views/admin/order_cycles/index.html.haml

@@ -11,9 +11,10 @@
       %col
       %col{'style' => 'width: 20%;'}
       %col{'style' => 'width: 20%;'}
-      %col
-      %col
-      %col
+      - unless order_cycles_simple_view
+        %col
+        %col
+        %col
       %col
       %col
       %col
@@ -23,9 +24,10 @@
         %th Name
         %th Open
         %th Close
-        %th Suppliers
-        %th Coordinator
-        %th Distributors
+        - unless order_cycles_simple_view
+          %th Suppliers
+          %th Coordinator
+          %th Distributors
         %th Products
         %th.actions
         %th.actions

app/views/admin/order_cycles/new.html.haml

@@ -1,4 +1,9 @@
 %h1 New Order Cycle
 
-= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'order_cycle', 'ng-controller' => 'AdminCreateOrderCycleCtrl', 'ng-submit' => 'submit()'} do |f|
-  = render 'form', :f => f
+- ng_controller = order_cycles_simple_view ? 'AdminSimpleCreateOrderCycleCtrl' : 'AdminCreateOrderCycleCtrl'
+
+= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.order_cycles', 'ng-controller' => ng_controller, 'ng-submit' => 'submit()'} do |f|
+  - if order_cycles_simple_view
+    = render 'simple_form', f: f
+  - else
+    = render 'form', f: f