Rohan Mitchell
|
5ffd56aad7
|
Re-write spec with new fee display at checkout
|
2013-08-19 10:41:14 +10:00 |
|
David Cook
|
725766d82e
|
Feature tests for PaymentMethod in admin and checkout
|
2013-08-13 10:57:36 +10:00 |
|
Rohan Mitchell
|
b71f7eec3d
|
Fix spec for charges by adjustment not shipping method
|
2013-08-13 09:11:26 +10:00 |
|
Rohan Mitchell
|
b5d324ec8c
|
Drop itemwise shipping method use in tests
|
2013-08-13 09:11:25 +10:00 |
|
Rohan Mitchell
|
b7ea03f7fc
|
Remove distributor fees table at checkout, pending design of new breakdown
|
2013-08-13 09:11:25 +10:00 |
|
Rohan Mitchell
|
1d5e970b47
|
Fix test regressions with multiple 'Save and Continue' buttons in checkout
|
2013-07-23 17:48:54 +10:00 |
|
Rohan Mitchell
|
dd97768947
|
Merge branch 'move-save-checkout-button'
Conflicts:
spec/features/consumer/checkout_spec.rb
|
2013-07-23 17:03:00 +10:00 |
|
Rohan Mitchell
|
638d7b1c33
|
Stylistic changes, extract commented code to private method
|
2013-07-23 17:02:06 +10:00 |
|
Andrew Spinks
|
7cb054f430
|
Merge branch 'master' into order-cycle-selection
Conflicts:
Gemfile
Gemfile.lock
app/controllers/spree/orders_controller_decorator.rb
app/models/enterprise.rb
app/models/spree/order_decorator.rb
app/views/spree/checkout/_other_available_distributors.html.erb
app/views/spree/products/_add_to_cart.html.haml
lib/open_food_web/distributor_change_validator.rb
spec/spec_helper.rb
|
2013-07-23 14:42:57 +10:00 |
|
Rohan Mitchell
|
fe61cddda6
|
Merge branch 'local-organics'
Conflicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/store/variables.css.scss
app/overrides/add_feedback_script.rb
app/views/spree/shared/_order_details_steps_data.html.erb
db/schema.rb
script/rails
spec/spec_helper.rb
|
2013-07-23 11:40:03 +10:00 |
|
David Cook
|
46043f2237
|
click new 'Save and Continue' button
|
2013-07-16 17:02:06 +10:00 |
|
Rohan Mitchell
|
a355a09a7c
|
Disable distributor change in checkout until it takes order cycles into account
|
2013-06-17 11:45:23 +10:00 |
|
Rohan Mitchell
|
cc2e8694f0
|
Move LineItem update to source of change (order update). On empty cart, re-instanciate shipping method adjustment, fixing no shipping fees after empty cart bug.
|
2013-05-20 15:01:04 +10:00 |
|
Rohan Mitchell
|
d65dda4dc5
|
When order distributor changes, update line item shipping method
|
2013-05-18 19:21:01 +10:00 |
|
Rob H
|
a59b136864
|
Spree 1.3 upgrade: fix final failing tests
|
2013-02-20 15:16:43 +11:00 |
|
Rohan Mitchell
|
f2f3bbd3ed
|
Merge branch 'order-cycles-exchange-products'
Conflicts:
Gemfile.lock
|
2013-01-22 10:40:56 +11:00 |
|
Rohan Mitchell
|
488fc2d60e
|
Upgrade capybara, spec/requests changed to spec/features
|
2013-01-15 10:10:24 +11:00 |
|