Rohan Mitchell
1054fd2d05
View closed shops by URL
2016-08-03 16:07:15 +10:00
Rohan Mitchell
d93d1653db
Add directive for smooth scrolling to anchor
2016-08-03 16:07:15 +10:00
Rohan Mitchell
d9d3a4a645
Set up producer filters on group producers page
2016-07-29 11:01:52 +10:00
Rohan Mitchell
13cf5d29de
Add guard for selector overflow (only seen in phantom, not selenium/firefox or dev server/chrome)
2016-07-29 11:01:52 +10:00
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
0b84afd67a
Display property filters for producers
2016-07-29 11:01:51 +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
d3c423f7ce
Only perform URL search once, not every time map tiles change
2016-07-06 11:56:41 +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
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
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
Maikel Linke
0af8377844
Add payment method fees to order during checkout
...
The fee is displayed as "Transaction fee".
2016-05-25 14:56:52 +10:00
Rob Harrington
93a4f19b40
Hash Navigation works on with Group and Shopping page tabs
2016-05-25 08:10:20 +10:00
Rob Harrington
92d8ee1a36
Making sure that hash navigation works with auth tabs
2016-05-25 08:10:20 +10:00
Rob Harrington
4b8146dd00
Fixing translation error on final registration page
2016-05-25 08:10:20 +10:00
Rob Harrington
02d093f6b6
Loading selectors into product modal to display proprties and taxons
2016-05-25 08:10:20 +10:00
Rob Harrington
e5ca494db8
Replacing bindonce with native Angularjs syntax in Darkswarm
...
Involved changing bo-text -> ng-bind, bo-href-i -> ng-href, bo-src-i -> ng-src and ng-html -> ng-bind-html
2016-05-25 08:10:20 +10:00
Rob Harrington
fe739f6a8d
angular-foundation tabs directive on shop pages is closed by default
2016-05-25 08:10:20 +10:00
Rob Harrington
02be661163
Bumping angularjs version to 1.3.15
2016-05-25 08:10:20 +10:00
Rohan Mitchell
42a327211e
Merge branch 'openstreetmap-tiles' of https://github.com/bingxie/openfoodnetwork into openstreetmap-tiles
2016-04-29 14:36:47 +10:00
Rohan Mitchell
88e9eb59cf
Do not allow invalid quantity to reach model, triggering server update
2016-04-29 11:56:48 +10:00
Rohan Mitchell
1220ff8a06
Notify when stock limit reached on shopfront rather than silently capping
2016-04-27 15:05:44 +10:00
Bing Xie
824a29624f
Tweak the map UI
2016-04-27 14:17:29 +10:00
Bing Xie
daa5b00a2a
Uses openstreetmap tiles
2016-04-27 13:50:15 +10:00
Rohan Mitchell
8f8a1191cb
Remove stock cap on max_quantity
2016-04-27 12:27:24 +10:00
Rohan Mitchell
a26266159c
Fix timing issue: change in client-side value during server update
2016-04-22 10:47:20 +10:00
Rohan Mitchell
35117f7af4
Show a modal when available stock levels have reduced
2016-04-21 09:36:23 +10:00
Rohan Mitchell
6fbbe580c5
After adding an item to the cart, when less quantity available, reduce quantity and reset client-side stock level
2016-04-21 09:36:23 +10:00
Rohan Mitchell
8a62d26af4
After adding an item to the cart, when out of stock, remove from cart and reset client-side stock level
2016-04-21 09:36:23 +10:00
Rohan Mitchell
d45b525497
When there's an out of stock product in the cart, placing order returns user to the cart
2016-04-21 09:36:22 +10:00
Maikel Linke
04f661f646
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into hide-closed-shops
...
Conflicts:
config/locales/en.yml
2016-04-01 13:02:53 +11:00
Maikel Linke
c4f92fd4cc
Hide closed shops by default, add "show" button
2016-04-01 11:45:24 +11:00
Maikel Linke
813dff8af2
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login
2016-04-01 11:04:36 +11:00
Maikel Linke
21be27d722
Remove duplicate filtering of visible enterprises
...
Increase readability of enterprises_controller.js.coffee.
2016-03-31 15:00:22 +11:00
Maikel
ca0c677d46
Auto-merged master into uk/account-balances on deployment.
2016-03-19 07:16:41 +11:00
Maikel Linke
2a9e35355e
Add auth directive to use AuthenticationService
...
The auth directive binds to all elements with the auth attribute. It
adds a click event that opens the login/register/password modal.
2016-03-18 16:46:29 +11:00
Maikel Linke
d07daede68
Merge remote-tracking branch 'origin/master' into uk/filter-producers-for-map
2016-03-18 11:04:42 +11:00
Maikel
388b25ddf9
Auto-merged master into uk/account-balances on deployment.
2016-03-12 09:11:42 +11:00
Maikel Linke
61fb34e738
Use user's email address as enterprise.email
...
During registration, use the given email address only as public visible
profile email address. Set the internal notification email address
`enterprise.email` to the owner's email address. That can be changed
later.
2016-03-09 14:52:52 +11:00
Maikel Linke
d925c2aefc
Translate Spree payment, shipment and order states
...
- Copied translations for payment_states, shipment_states and order_states
into locale en.yml.
- Enabled global Javascript function `translate` to deal with scopes like
'spree.shipment_states'.
- Removed `humanize` call from order serializer and added translation
scopes to accounts page.
- Test OrderSerializer for untranslated attributes
- Require spec helper in serializer specs
2016-03-09 14:29:54 +11:00
