Rohan Mitchell
|
0458f7a6bb
|
Summarise distribution fees in checkout after cart page
|
2013-08-19 17:02:02 +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 |
|
Rohan Mitchell
|
b5479380b6
|
Refactor alternative distributors at checkout form, fixing indentation and removed double negatives
|
2013-06-17 11:41:35 +10:00 |
|
Rohan Mitchell
|
3b2508dad3
|
On local organics checkout, remove distributor change, move save button to top right
|
2013-05-20 15:29:13 +10:00 |
|
Rob H
|
2a07d61e81
|
Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue
|
2013-02-07 15:09:25 +11:00 |
|
Rob H
|
612017f143
|
WIP Upgrade to Spree 1.3
|
2013-02-05 15:01:45 +11:00 |
|
Rob H
|
f7890bd94d
|
Fixes following code review for checkout changes
|
2013-01-18 19:17:55 +11:00 |
|
Rob H
|
8a37b4e918
|
Push validation logic for changing distributor down into lib class
|
2012-12-14 11:02:01 +11:00 |
|
Rob H
|
b5a95e73dc
|
Only show alternative distributors on 'address' page of checkout process
|
2012-12-07 12:29:44 +11:00 |
|
Rob H
|
46abc2fc42
|
Add ability to change distributor based on whether products in the cart are available
|
2012-12-07 11:56:40 +11:00 |
|
Rob H
|
573ba9c8d4
|
Merge remote-tracking branch 'origin/master' into checkout-changes
|
2012-11-16 16:10:51 +11:00 |
|
Rohan Mitchell
|
6d84cf7613
|
Merge branch 'master' into enterprises
Conflicts:
app/controllers/enterprises_controller.rb
app/views/spree/checkout/_distributor.html.haml
db/schema.rb
spec/lib/open_food_web/group_buy_report_spec.rb
|
2012-11-01 11:02:02 +11:00 |
|
Rohan Mitchell
|
7dd42b7feb
|
Fix use of pickup_address and url fields with enterprises, checkout spec passes
|
2012-10-31 17:10:21 +11:00 |
|
Rohan Mitchell
|
773adca838
|
Display distributor details on product page when distributor is selected
|
2012-10-27 12:49:57 +11:00 |
|
Rob H
|
01569c2550
|
Change button text on Payments page to 'Process My Order'
|
2012-10-26 16:47:42 +11:00 |
|
Rohan Mitchell
|
8156da509e
|
Display distributor next collection time in checkout process
|
2012-07-02 14:32:53 +10:00 |
|
Rohan Mitchell
|
e0e566e625
|
Display distributor information on checkout address page
|
2012-06-26 16:04:59 +10:00 |
|
Andrew Spinks
|
2e9e441ba1
|
fix bug with states screwing up when using deface.
|
2012-04-09 10:31:47 +10:00 |
|
Andrew Spinks
|
7f5e0c406d
|
Copy spree address partial so bug can be fixed.
|
2012-04-09 10:24:18 +10:00 |
|
Andrew Spinks
|
f7372a80c2
|
add distributor to checkout
|
2012-04-09 09:56:37 +10:00 |
|
Andrew Spinks
|
b2b8bd0112
|
add selector for distributor in checkout. Not saving relation as yet.
|
2012-04-07 16:34:27 +10:00 |
|