Maikel Linke
|
8e73a2e0d6
|
Dereference enterprises and taxons later
|
2016-07-06 16:20:07 +10:00 |
|
Maikel Linke
|
f733c7f207
|
Include shop enterprise on shop front
|
2016-07-06 12:45:12 +10:00 |
|
Maikel Linke
|
52f68dac33
|
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load
|
2016-07-06 11:35:26 +10:00 |
|
Maikel Linke
|
f984871b23
|
Inject only needed enterprises into cart and checkout
|
2016-07-06 11:14:13 +10:00 |
|
Bing Xie
|
78b22c4a82
|
Fix incorrectly aligned columns
|
2016-06-30 21:38:10 +10:00 |
|
Maikel Linke
|
c253d73d11
|
Refactoring with feedback on pr #1073
|
2016-06-29 15:46:51 +10:00 |
|
Maikel Linke
|
08fdc8a5bd
|
Load producers of all or selected order cycles into shop
|
2016-06-29 12:57:09 +10:00 |
|
Rohan Mitchell
|
9cc0bb831a
|
Show properties alongside taxons on producer fat view
v1.8.2
|
2016-06-24 07:57:06 +10:00 |
|
Rohan Mitchell
|
a5a00e9cef
|
Show taxons and properties on producer modal (seen on map, shop producer info)
|
2016-06-24 07:57:06 +10:00 |
|
Rohan Mitchell
|
4134cbfc9c
|
Include producer properties on producer listing
|
2016-06-24 07:57:06 +10:00 |
|
Rohan Mitchell
|
58379a5e28
|
Extract property merging to lib class
|
2016-06-24 07:57:06 +10:00 |
|
Rohan Mitchell
|
aae1689a27
|
Show product properties on producers page
|
2016-06-24 07:57:06 +10:00 |
|
Rohan Mitchell
|
4338f632f6
|
Add scope: Spree::Property.applied_by
|
2016-06-24 07:57:06 +10:00 |
|
Rohan Mitchell
|
fa0cc6f2c8
|
Add spec for filtering producers by taxon
|
2016-06-24 07:57:06 +10:00 |
|
Maikel Linke
|
e284ad62b2
|
Inject only relative enterprises into shopfront
Other shops displayed in producer modals are lazy loaded when opening
their modal.
|
2016-06-17 17:15:16 +10:00 |
|
Rob Harrington
|
d28c0159ab
|
Use have_selector x, count: y; instead of all(x).count.should == y
|
2016-06-17 16:44:02 +10:00 |
|
Rob Harrington
|
e40ecae681
|
Removing inline styles for links dropdown
|
2016-06-17 16:44:02 +10:00 |
|
Rob Harrington
|
1e142aa628
|
Refactoring OrderCycleFormApplicator logic for improved update speed
|
2016-06-17 16:44:02 +10:00 |
|
Rob Harrington
|
6586e67a5c
|
Better messaging around deletion of customers
|
2016-06-17 14:47:04 +10:00 |
|
Rob Harrington
|
d9b3366a5c
|
Auto-select shop on customers index when only one available
|
2016-06-17 11:28:20 +10:00 |
|
Rob Harrington
|
61969f5c84
|
Ensure CustomersController#update.json gives an appropriate response
pendingChanges submits an empty string when a field is blank (rather than undefined)
|
2016-06-16 22:42:53 +10:00 |
|
Rob Harrington
|
2a4737147f
|
Tweaking the way new customer form error messages are display for latest version of AngularJS
|
2016-06-16 16:32:10 +10:00 |
|
Rob Harrington
|
a909f0ddb8
|
Merge remote-tracking branch 'origin/master' into pr/1033
|
2016-06-16 15:12:30 +10:00 |
|
Rob Harrington
|
25cdd4af8e
|
Preventing shop from being changed when unsaved customer changes exist
Also making layout of filters on customer index more consistent with other pages
|
2016-06-16 15:10:16 +10:00 |
|
Maikel Linke
|
be7e46300c
|
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into prod-log-warn
|
2016-06-15 11:56:29 +10:00 |
|
Continuous Integration
|
9ba07a2afb
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2016-06-15 11:26:02 +10:00 |
|
Bing Xie
|
a39d15d685
|
Fix failed adds a new tag rule js test
|
2016-06-15 10:51:34 +10:00 |
|
Rob Harrington
|
d424c2eb20
|
Enterprise form SaveBar becomes available when adding a new rule
|
2016-06-15 10:51:34 +10:00 |
|
Rob Harrington
|
c8c8f0d02d
|
Removing old cancel button from bottom of OC forms
|
2016-06-15 10:51:34 +10:00 |
|
Rob Harrington
|
8221f1f193
|
Use scope. to ensure that tag rule sorting is applied
|
2016-06-15 10:51:34 +10:00 |
|
Bing Xie
|
c83952571f
|
Fix failed test
|
2016-06-15 10:51:34 +10:00 |
|
Bing Xie
|
18a8efed5f
|
Resize window to fix failed test
|
2016-06-15 10:51:34 +10:00 |
|
Bing Xie
|
82dc2a8c98
|
Update bulk products editing page
|
2016-06-15 10:51:34 +10:00 |
|
Bing Xie
|
001ae19b26
|
Update create and update order cycle page save-bar
|
2016-06-15 10:51:34 +10:00 |
|
Bing Xie
|
c003dcded9
|
Update editing enterprise page save-bar
|
2016-06-15 10:51:34 +10:00 |
|
Bing Xie
|
7aa8f2c73c
|
Fix failed tests
|
2016-06-15 10:51:34 +10:00 |
|
Bing Xie
|
41837eb31d
|
Tweak create order cycle spec
|
2016-06-15 10:51:34 +10:00 |
|
Bing Xie
|
860a537f30
|
Add save bar to bulk editing product page
|
2016-06-15 10:51:34 +10:00 |
|
Bing Xie
|
33fd88507d
|
Fix failed tests
|
2016-06-15 10:51:34 +10:00 |
|
Bing Xie
|
d8bf66a6c9
|
Use save bar on enterprise editing page
|
2016-06-15 10:51:34 +10:00 |
|
Bing Xie
|
2065d81bb4
|
Use save bar directive in enterprise editing page
|
2016-06-15 10:51:34 +10:00 |
|
Bing Xie
|
7994e2594a
|
Update create order cycle feature test
|
2016-06-15 10:51:34 +10:00 |
|
Bing Xie
|
baa6fda3e0
|
Use save bar in create order cycle page
|
2016-06-15 10:51:34 +10:00 |
|
David Ajnered
|
fb33be78dd
|
#591 show selected hub dropdown on customers page and enable easy switch to different hub
|
2016-06-10 15:42:40 +02:00 |
|
Maikel Linke
|
db3637fe84
|
Allow removing customer codes
|
2016-06-10 18:14:19 +10:00 |
|
Maikel Linke
|
ee0a226388
|
Try to remove random failure from spec
|
2016-06-10 10:06:35 +10:00 |
|
Maikel Linke
|
5cd269411d
|
Trigger order button instead of click
|
2016-06-10 09:46:56 +10:00 |
|
Maikel Linke
|
cb679a6aba
|
Remove duplicate "What's this?" from order cycles overview
|
2016-06-10 09:18:26 +10:00 |
|
Maikel Linke
|
ad1ef877c0
|
Warn about duplicate customer codes
The admin customer page displays a warning you change a code to an
existing one.
|
2016-06-10 09:09:56 +10:00 |
|
Rob Harrington
|
c5ba0b8f8c
|
Merge branch 'master' into 1014-image-diet
v1.8.1
|
2016-06-08 15:12:33 +10:00 |
|