diff --git a/app/views/spree/admin/distributors/_form.html.haml b/app/views/spree/admin/distributors/_form.html.haml index b79b83f3c9..8494881c33 100644 --- a/app/views/spree/admin/distributors/_form.html.haml +++ b/app/views/spree/admin/distributors/_form.html.haml @@ -26,8 +26,11 @@ %fieldset %legend Pickup details %table{"data-hook" => "distributors_pickup_details"} + %tr{"data-hook" => "next_collection_at"} + %td Next collection date/time: + %td= f.text_field :next_collection_at %tr{"data-hook" => "pickup_times"} - %td Pickup times: + %td Regular pickup times: %td= f.text_field :pickup_times = f.fields_for :pickup_address do |pickup_address_form| = render 'spree/admin/shared/address_form', :form => pickup_address_form diff --git a/app/views/spree/admin/distributors/show.html.haml b/app/views/spree/admin/distributors/show.html.haml index f5837abb15..5bb4fb4563 100644 --- a/app/views/spree/admin/distributors/show.html.haml +++ b/app/views/spree/admin/distributors/show.html.haml @@ -19,7 +19,10 @@ %th Pickup address: %td= render 'spree/shared/address', :address => @distributor.pickup_address %tr - %th Pickup times: + %th Next collection date/time: + %td= @distributor.next_collection_at + %tr + %th Regular pickup times: %td= @distributor.pickup_times %tr %th ABN: diff --git a/spec/requests/admin/distributors_spec.rb b/spec/requests/admin/distributors_spec.rb index beaac1a628..eee123b0ac 100644 --- a/spec/requests/admin/distributors_spec.rb +++ b/spec/requests/admin/distributors_spec.rb @@ -25,6 +25,7 @@ feature %q{ select('Australia', :from => 'distributor_pickup_address_attributes_country_id') select('Victoria', :from => 'distributor_pickup_address_attributes_state_id') + fill_in 'distributor_next_collection_at', :with => 'Thursday, 22nd Feb, 6 - 9 PM' fill_in 'distributor_pickup_times', :with => 'Thursday, 22nd Feb, 6 - 9 PM. Friday, 23nd Feb, 6 - 9 PM' fill_in 'distributor_email', :with => 'info@eaterprises.com.au' fill_in 'distributor_url', :with => 'http://eaterprises.com.au'