Rohan Mitchell
|
7cc2bc4fde
|
Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.
|
2015-06-18 13:11:11 +10:00 |
|
Maikel Linke
|
903bd21577
|
Merge remote-tracking branch 'origin/master' into group-pages-merge
Conflicts:
README.markdown
db/schema.rb
|
2015-02-13 15:42:36 +11:00 |
|
Maikel Linke
|
6b5a1255f8
|
fixing a bunch of tests
|
2015-02-12 16:36:18 +11:00 |
|
Rohan Mitchell
|
0431e0048c
|
Merge branch 'master' into variant-overrides-frontend
Conflicts:
app/controllers/shop_controller.rb
app/views/shop/products/_form.html.haml
spec/controllers/shop_controller_spec.rb
|
2015-01-12 16:48:51 +11:00 |
|
Rohan Mitchell
|
20bde803c8
|
Display overridden prices when products are in the cart
|
2015-01-12 14:58:35 +11:00 |
|
Rohan Mitchell
|
d2e0d4f44a
|
Fix grammar
|
2015-01-08 10:39:51 +11:00 |
|
Rohan Mitchell
|
ab26902e4e
|
Move money decorator to lib dir, as it's a decorator for a lib class, not a model
|
2015-01-08 10:39:14 +11:00 |
|
Rohan Mitchell
|
6c86254a90
|
Extract sign_in_as_user method, test managed orders API access for normal user and enterprise user
|
2014-04-24 13:20:16 +10:00 |
|
Rohan Mitchell
|
95a6e34523
|
Spec access denied to regular user when soft-deleting variants
|
2014-04-24 13:20:16 +10:00 |
|
Rohan Mitchell
|
e28a450875
|
Add API call to soft-delete a variant
|
2014-04-24 13:20:16 +10:00 |
|
Rohan Mitchell
|
5fac29d2ed
|
Do not merge current and incomplete orders when logging in - fixes #20
|
2013-08-14 10:44:02 +10:00 |
|
Rohan Mitchell
|
02b524bfce
|
Fix our monkey-patch of spree's order merging to accomodate orders having an order cycle
|
2013-04-05 15:00:42 +11:00 |
|
Rob H
|
c956706d78
|
Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test
|
2013-02-14 15:12:50 +11:00 |
|
Rohan Mitchell
|
077098e6c1
|
Refactor libs to use enterprise instead of supplier and distributor
|
2012-10-29 14:57:03 +11:00 |
|
Rohan Mitchell
|
c46019d68c
|
WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace
|
2012-10-25 10:45:39 +11:00 |
|
Rohan Mitchell
|
9adfe58086
|
Display distributor filter as links instead of checkboxes, style in the same way as taxonomy selectors
|
2012-06-20 15:05:54 +10:00 |
|
Rohan Mitchell
|
1207062f7c
|
Filter products by distributor
|
2012-06-20 14:20:07 +10:00 |
|