WIP: Simple order cycle form loads and displays correct info

app/assets/javascripts/admin/order_cycles/controllers/simple.js.coffee

@@ -0,0 +1,27 @@
+angular.module('admin.order_cycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, OrderCycle, Enterprise, EnterpriseFee) ->
+  $scope.enterprises = Enterprise.index (enterprises) =>
+    enterprise = enterprises[Object.keys(enterprises)[0]]
+    OrderCycle.addSupplier enterprise.id
+    OrderCycle.addDistributor enterprise.id
+
+    OrderCycle.setExchangeVariants(OrderCycle.order_cycle.incoming_exchanges[0],
+      Enterprise.suppliedVariants(enterprise.id), true)
+
+    OrderCycle.order_cycle.coordinator_id = enterprise.id
+
+  $scope.enterprise_fees = EnterpriseFee.index()
+
+  $scope.order_cycle = OrderCycle.order_cycle
+
+  $scope.loaded = ->
+    Enterprise.loaded && EnterpriseFee.loaded
+
+  $scope.removeDistributionOfVariant = angular.noop
+
+  $scope.addCoordinatorFee = ($event) ->
+    $event.preventDefault()
+    OrderCycle.addCoordinatorFee()
+
+  $scope.enterpriseFeesForEnterprise = (enterprise_id) ->
+    EnterpriseFee.forEnterprise(parseInt(enterprise_id))
+

app/helpers/order_cycles_helper.rb

@@ -63,7 +63,7 @@ module OrderCyclesHelper
   end
 
   def order_cycles_simple_view
-    !OpenFoodNetwork::Permissions.new(spree_current_user).can_manage_complex_order_cycles?
+    @order_cycles_simple_view ||= !OpenFoodNetwork::Permissions.new(spree_current_user).can_manage_complex_order_cycles?
   end
 
   def order_cycles_enabled?

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

@@ -0,0 +1,18 @@
+= render 'name_and_timing_form', f: f
+
+= 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'
+%br/
+= 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'
+
+%div{ng: {repeat: "exchange in order_cycle.incoming_exchanges"}}
+  = 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/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' => 'admin.order_cycles', '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

spec/features/admin/order_cycles_spec.rb

@@ -131,16 +131,16 @@ feature %q{
     page.should have_selector 'td.distributors', text: 'My distributor'
 
     # And it should have some fees
-    OrderCycle.last.exchanges.incoming.first.enterprise_fees.should == [supplier_fee]
-    OrderCycle.last.coordinator_fees.should                         == [coordinator_fee]
-    OrderCycle.last.exchanges.outgoing.first.enterprise_fees.should == [distributor_fee]
+    oc = OrderCycle.last
+    oc.exchanges.incoming.first.enterprise_fees.should == [supplier_fee]
+    oc.coordinator_fees.should                         == [coordinator_fee]
+    oc.exchanges.outgoing.first.enterprise_fees.should == [distributor_fee]
 
     # And it should have some variants selected
-    OrderCycle.last.exchanges.first.variants.count.should == 2
-    OrderCycle.last.exchanges.last.variants.count.should == 2
+    oc.exchanges.first.variants.count.should == 2
+    oc.exchanges.last.variants.count.should == 2
 
     # And my pickup time and instructions should have been saved
-    oc = OrderCycle.last
     exchange = oc.exchanges.where(:sender_id => oc.coordinator_id).first
     exchange.pickup_time.should == 'pickup time'
     exchange.pickup_instructions.should == 'pickup instructions'
@@ -575,9 +575,14 @@ feature %q{
   end
 
 
-  describe "as an enterprise user selling only my own produce" do
+  describe "simplified interface for enterprise users selling only their own produce" do
     let(:user) { create_enterprise_user }
     let(:enterprise) { create(:enterprise, is_primary_producer: true, sells: 'own') }
+    let!(:p1) { create(:simple_product, supplier: enterprise) }
+    let!(:p2) { create(:simple_product, supplier: enterprise) }
+    let!(:p3) { create(:simple_product, supplier: enterprise) }
+    let!(:v) { create(:variant, product: p3) }
+    let!(:fee) { create(:enterprise_fee, enterprise: enterprise, name: 'Coord fee') }
 
     use_short_wait
 
@@ -593,6 +598,51 @@ feature %q{
       page.should_not have_selector 'th', text: 'COORDINATOR'
       page.should_not have_selector 'th', text: 'DISTRIBUTORS'
     end
+
+    it "creates order cycles", js: true do
+      # When I go to the new order cycle page
+      visit admin_order_cycles_path
+      click_link 'New Order Cycle'
+
+      # And I fill in the basic fields
+      fill_in 'order_cycle_name', with: 'Plums & Avos'
+      fill_in 'order_cycle_orders_open_at', with: '2014-10-17 06:00:00'
+      fill_in 'order_cycle_orders_close_at', with: '2014-10-24 17:00:00'
+      fill_in 'order_cycle_outgoing_exchange_0_pickup_time', with: 'pickup time'
+      fill_in 'order_cycle_outgoing_exchange_0_pickup_instructions', with: 'pickup instructions'
+
+      # Then my products / variants should already be selected
+      page.should have_checked_field "order_cycle_incoming_exchange_0_variants_#{p1.master.id}"
+      page.should have_checked_field "order_cycle_incoming_exchange_0_variants_#{p2.master.id}"
+      page.should have_checked_field "order_cycle_incoming_exchange_0_variants_#{v.id}"
+
+      # When I unselect a product
+      uncheck "order_cycle_incoming_exchange_0_variants_#{p2.master.id}"
+
+      # And I add a fee and save
+      click_button 'Add coordinator fee'
+      select 'Coord fee', from: 'order_cycle_coordinator_fee_0_id'
+      click_button 'Create'
+
+      # Then my order cycle should have been created
+      page.should have_content 'Your order cycle has been created.'
+      page.should have_selector 'a', text: 'Plums & Avos'
+      page.should have_selector "input[value='2012-11-06 06:00:00 +1100']"
+      page.should have_selector "input[value='2012-11-13 17:00:00 +1100']"
+
+      # And it should have some variants selected
+      oc = OrderCycle.last
+      oc.exchanges.incoming.first.variants.count.should == 2
+      oc.exchanges.outgoing.first.variants.count.should == 2
+
+      # And it should have the fee
+      oc.coordinator_fees.should == [fee]
+
+      # And my pickup time and instructions should have been saved
+      ex = oc.exchanges.outgoing.first
+      ex.pickup_time.should == 'pickup time'
+      ex.pickup_instructions.should == 'pickup instructions'
+    end
   end