raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-18 04:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update delivery page of checkout, change shipping to delivery

Browse Source
This commit is contained in:
Rohan Mitchell
2013-09-19 13:39:53 +10:00
parent e4127358c3
commit c9e543b25a
5 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/store/checkout_adjustments.js.coffee
View File

@@ -1,8 +1,8 @@
$(document).ready ->
$('#cart_adjustments').hide()
$('th.cart-adjustment-header').html('<a href="#">Order Adjustments...</a>')
$('th.cart-adjustment-header').html('<a href="#">Distribution...</a>')
$('th.cart-adjustment-header a').click ->
$('#cart_adjustments').toggle()
$('th.cart-adjustment-header a').html('Order Adjustments')
$('th.cart-adjustment-header a').html('Distribution')
false

4
app/models/spree/shipping_method_decorator.rb
View File

@@ -10,4 +10,8 @@ Spree::ShippingMethod.class_eval do
end
alias_method_chain :available_to_order?, :distributor_check
def adjustment_label
'Delivery'
end
end

5
app/overrides/spree/checkout/_delivery/shipping_instructions_to_delivery_instructions.html.haml.deface Normal file
View File

@@ -0,0 +1,5 @@
/ replace_contents '#shipping_method p#minstrs'
= form.label :special_instructions, 'Delivery Instructions'
%br/
= form.text_area :special_instructions, :cols => 40, :rows => 7

2
app/overrides/spree/checkout/_delivery/shipping_method_to_delivery_method.html.haml.deface Normal file
View File

@@ -0,0 +1,2 @@
/ replace_contents '#shipping_method legend'
Delivery Method

4
spec/features/consumer/checkout_spec.rb
View File

@@ -393,7 +393,7 @@ feature %q{
# -- Checkout: Delivery
order_charges = page.all("tbody#summary-order-charges tr").map {|row| row.all('td').map(&:text)}.take(2)
order_charges.should == [["Shipping:", "$0.00"],
order_charges.should == [["Delivery:", "$0.00"],
["Distribution:", "$54.00"]]
click_checkout_continue_button
@@ -476,7 +476,7 @@ feature %q{
# -- Checkout: Delivery
order_charges = page.all("tbody#summary-order-charges tr").map {|row| row.all('td').map(&:text)}.take(2)
order_charges.should == [["Shipping:", "$0.00"],
order_charges.should == [["Delivery:", "$0.00"],
["Distribution:", "$54.00"]]
click_checkout_continue_button