Commit Graph

250 Commits

Author SHA1 Message Date
Maikel Linke
bd19bf5f3c Refactoring filter selectors
The FilterSelectorsService is now able to create multiple independent
lists of selectors. These lists are explicitly given to the
filter-selector directive.

For example a group's page has one set for the group's producers and one
set for the group's shops.
2016-02-04 16:08:19 +11:00
Maikel Linke
d5aea1b00d Taxon filter for group producers 2016-01-20 13:32:08 +11:00
Maikel Linke
261a464b50 Fixing display of shop list in group producer modal 2015-12-04 10:37:55 +11:00
Maikel Linke
ae96541112 Internationalisation of Javascript views 2015-10-01 11:13:45 +10:00
Rohan Mitchell
faa1d0d1c5 When cart clear is declined, revert order cycle selection change 2015-07-31 16:56:08 +10:00
Rohan Mitchell
09b4b3e659 When order cycle is changed, clear the cart 2015-07-31 16:56:08 +10:00
Rohan Mitchell
bf2bd403a4 Clear variants when order cycle changed, not when products are initially loaded 2015-07-31 16:56:08 +10:00
Rohan Mitchell
f3ae812f2b Update cart when max_quantity value changes, not just quantity 2015-07-16 10:05:19 +10:00
Rohan Mitchell
28b8e0b0c8 Update distance matches when filter settings change 2015-07-10 17:45:17 +10:00
Rohan Mitchell
0ab75fe2ea Take the first name match from the post-filter results to avoid matching off a result the user can't see 2015-07-10 17:45:17 +10:00
Rohan Mitchell
5b93ac2ae1 Remove unneeded injections, consistent spacing 2015-07-10 17:45:16 +10:00
Rohan Mitchell
7d340d5084 Update taxon search to only display taxons from enterprises on the page 2015-07-10 17:45:16 +10:00
Rohan Mitchell
d8dfb5b5ee Move most filters back out into view - they now respond to filter preference changes 2015-07-10 17:45:16 +10:00
Rohan Mitchell
651afc34cb Notify enterprise change by broadcast 2015-07-10 17:45:16 +10:00
Rohan Mitchell
5f8826533d Limit distance matches to those within 50 km 2015-07-10 17:45:16 +10:00
Rohan Mitchell
5b5c56064e Hide distance matches when there are name matches. Show with a link. 2015-07-10 17:45:16 +10:00
Rohan Mitchell
eba0a12d29 Extract filtering into controller 2015-07-10 17:45:15 +10:00
Rohan Mitchell
7f2508eeaa When a name match is found, calculate distances from that enterprise, rather than from the geocoded lookup 2015-07-10 17:45:15 +10:00
Rohan Mitchell
744beaa26a Perform shops search by proximity instead of plain string match 2015-07-10 17:45:15 +10:00
Rohan Mitchell
6f513fee77 Merge branch 'master' into redesign 2015-05-29 15:20:21 +10:00
Continuous Integration
1d08ae89da Auto-merge from CI [skip ci] 2015-05-28 14:31:25 +10:00
Maikel Linke
bf9addfa42 Merge branch 'group-custom-url' into group-pages 2015-05-28 13:27:48 +10:00
Rick Giner
62ae38372e #541 add "show more" link to producers lists in hub on home page 2015-05-11 20:31:24 +10:00
Rohan Mitchell
e662aab004 Brand story can be expanded and contracted 2015-05-06 14:54:16 +10:00
Maikel Linke
893b743973 tidy (rm comment) 2015-04-17 17:00:18 +10:00
Maikel Linke
03fd148f41 showing profile modals on groups/hubs 2015-04-17 16:58:49 +10:00
Rob Harrington
f13b52411d Merge branch master into properties 2015-04-17 13:23:33 +10:00
Maikel Linke
2fd25f6cc4 Injecting all enterprises into group page
The enterprises have related producers and hubs that need to be
dereferenced. Therefore, we need a bigger set of enterprises to be
loaded. Injecting all enterprises is simple and doesn't require changes
if the set of needed enterprise data is growing in future.
2015-04-10 17:42:54 +10:00
Rohan Mitchell
d471368412 Spacing 2015-03-27 13:09:25 +11:00
Rob Harrington
578475a403 Filter products list on shop by active properties 2015-03-06 16:14:11 +11:00
Rob Harrington
cb623b75c1 Generalising taxons-selector -> filter-selector 2015-03-05 18:15:14 +11:00
Rob Harrington
24b40182b5 clearAll for product page also clears any text search filter 2015-03-05 15:34:27 +11:00
Rob Harrington
ed94cf57d3 Adding the 'more' box for single-line-selectors 2015-03-05 15:10:42 +11:00
Rob Harrington
4afef8215a Basic implementation of single line selectors 2015-03-05 12:12:36 +11:00
Maikel Linke
718a5911a3 code style and cleanup 2015-02-19 10:48:39 +11: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
Rob Harrington
177181cd75 CurrentUser always returns a factory 2015-01-22 10:19:45 +11:00
Maikel Linke
02a276b9c9 Producer and hub lists with search
Fixing map display as well.
2015-01-14 15:18:46 +11:00
Maikel Linke
9f1a773a58 MapController: copy default config instead of referencing
Copying makes it possible to have multiple independent maps.
2015-01-14 14:34:31 +11:00
Maikel Linke
9798b05a24 TabsCtrl can show tabs that don't toggle
toggle: tabs show on first click and hide on second click
select: tabs show on every click, one tab is always active
2015-01-06 22:39:15 +11:00
Rob Harrington
6f95fa8546 Merge remote-tracking branch 'origin/shopfront-filters' 2014-12-19 15:40:01 +11:00
Rob Harrington
21e4f40616 Implementing primary taxon ordering on the shopfront 2014-12-19 14:05:23 +11:00
summerscope
515348a8fb Change the filtersActive variable for this page only 2014-12-19 12:52:57 +11:00
Rohan Mitchell
3e151c40f5 WIP: Smooth scroll to checkout errors 2014-11-06 18:29:49 +11:00
Rohan Mitchell
57e7bc9504 Checkout: When error, open offending accordion section 2014-11-06 18:29:49 +11:00
Rohan Mitchell
ca9da15ba4 Checkout: Fix shipping and payment method summary display when none selected 2014-11-06 18:29:48 +11:00
Rohan Mitchell
f2c6ee87d3 Extract duplicated checkout accordion heading to partial 2014-11-06 18:29:48 +11:00
Rohan Mitchell
cbb968d87f Pass checkout form to controller method 2014-11-06 18:29:48 +11:00
Rohan Mitchell
75b250d3fe When submitting checkout, if field is invalid, show errors 2014-11-06 18:29:48 +11:00
Rohan Mitchell
e8e5f7033c Improve all the syntax 2014-11-06 18:29:48 +11:00