Rohan Mitchell
1257ee09f2
Reorder methods for clarity
2016-07-29 11:01:52 +10:00
Rohan Mitchell
e3173c955d
Refit filters when box opens
2016-07-29 11:01:51 +10:00
Rohan Mitchell
69382c4c13
Move properties filter dropdown in front of search results
2016-07-29 11:01:51 +10:00
Rohan Mitchell
0b84afd67a
Display property filters for producers
2016-07-29 11:01:51 +10:00
Rohan Mitchell
6f947380cb
Remove unused overrides and views
2016-07-29 09:18:31 +10:00
Rohan Mitchell
932edeb1c1
Remove CMS style shim - Spree/CMS compatibility
2016-07-29 09:18:30 +10:00
Rohan Mitchell
d3ad823d97
Remove CMS configuration, gem. Fix permalink check dependent on CMS glob path.
2016-07-29 09:18:30 +10:00
Rohan Mitchell
b637b5b75a
Remove CMS helper: home_page_cms_content
2016-07-29 09:14:36 +10:00
Rohan Mitchell
eb8cedc497
Remove CMS views and overrides
2016-07-29 09:14:36 +10:00
Maikel Linke
84c434c279
Remove unused/broken multi-cart feature and views
...
This removes ten old overrides of the Spree view. Since the Spree view
is not used any more and got completely replaced by custom views, the
overrides were just adding noise to the code base.
2016-07-22 13:49:20 +10:00
Maikel Linke
984641e46c
Merge remote-tracking branch 'origin/master' into uk/trial-length
...
Conflicts:
config/locales/en.yml
2016-07-20 11:40:52 +10:00
Maikel Linke
ddb54d1924
Delete fee on payment method if payment invalid
...
PayPalExpress is always creating two payments. The first one is
invalidated and the second one succeeds. Without deleting the old fee on
the invalidated payment, the order lists the fee twice.
2016-07-15 17:43:26 +10:00
Maikel Linke
af6d0ec107
Remove unused code from order confirmation page
2016-07-13 13:54:55 +10:00
Maikel Linke
e693f71775
Inject only needed enterprises into order confirmation page
2016-07-13 13:54:32 +10:00
Maikel Linke
0ff1c95c3d
Keep unreferenced entries when dereferencing in js
2016-07-13 12:08:11 +10:00
Maikel Linke
b5bc3a4ca3
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load
2016-07-13 10:01:16 +10:00
Maikel Linke
8e73a2e0d6
Dereference enterprises and taxons later
2016-07-06 16:20:07 +10:00
Rohan Mitchell
13c8f0a230
Improve spec reliability
...
It seems that the success message on the customers page is disappearing before the spec can
detect it. This seems unlikely since it's present for 3 s, but this is my best theory right now.
2016-07-06 15:29:04 +10:00
Maikel Linke
f733c7f207
Include shop enterprise on shop front
2016-07-06 12:45:12 +10:00
Rohan Mitchell
d3c423f7ce
Only perform URL search once, not every time map tiles change
2016-07-06 11:56:41 +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
Rohan Mitchell
f09cd9e477
Allow groups to be searched by URL
2016-07-06 11:08:38 +10:00
Rohan Mitchell
34b2f72ae8
When query changed (typing or autocomplete), update URL. When page loads, perform query search.
2016-07-06 10:44:25 +10:00
Rohan Mitchell
e6bdd2303d
Extract showing search result
2016-07-06 10:44:25 +10:00
Rohan Mitchell
a9a68151ec
Syntax
2016-07-06 10:44:25 +10:00
Rohan Mitchell
f586dbc3e1
Extract OSM tile setup to own directive
2016-07-06 10:44:19 +10:00
Rohan Mitchell
54028f4e7e
Split directive into functions
2016-07-01 15:31:32 +10:00
Rohan Mitchell
e8b83bef41
Simplify responding to search
2016-07-01 15:31:32 +10:00
Continuous Integration
e252414263
Auto-merge from CI [skip ci]
2016-06-30 01:30:53 +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
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
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
e40ecae681
Removing inline styles for links dropdown
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
Continuous Integration
9ba07a2afb
Merge remote-tracking branch 'origin/master' into HEAD
2016-06-15 11:26:02 +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
