raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-24 01:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,029 Commits 16 Branches 454 Tags
07a42e8a2127377e7dcdc8f1136838cdafcfc46b
Commit Graph

11245 Commits

Author SHA1 Message Date
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
db0b345241 Add "Show all on map" button under shops 2016-03-31 15:24:43 +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 Linke
3d31a37dd3 Remove unused method Enterprise::find_near 2016-03-31 15:00:22 +11:00
Maikel Linke
17f168ed06 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances 
Applied code conventions.

Conflicts:
	config/locales/en.yml
 2016-03-30 13:30:44 +11:00
Maikel Linke
de35940341 Apply coding standards 2016-03-30 09:45:45 +11:00
stveep
d67db76b88 Formatting credit/debit green/red 2016-03-28 20:35:14 +01:00
stveep
5a6caa294e Revert to Arel query and separate filtering 2016-03-28 20:13:30 +01:00
Maikel Linke
c4f499d518 Allow admins and managers to see restricted shops 2016-03-25 12:04:26 +11:00
Maikel Linke
5149c5118b Change text and style for shops requiring login 2016-03-24 21:42:21 +11:00
Maikel Linke
df36386757 Require customer instead of user 
If a shop requires a login, then a customer needs to be logged in, not
just any user.
 2016-03-24 18:24:46 +11:00
Maikel Linke
31302fb930 Translate unsaved products message correctly 2016-03-23 17:57:22 +11:00
Maikel
d51cfccd7e Auto-merged master into i18n-hackathon on deployment. 2016-03-23 10:09:36 +11:00
Maikel Linke
79ad05d405 i18n group image help text 2016-03-23 10:01:04 +11:00
elf Pavlik
6d0dc438a7 i18n fixes after @sstead feedback in #799 2016-03-21 16:55:57 -06:00
Maikel
ca0c677d46 Auto-merged master into uk/account-balances on deployment. 2016-03-19 07:16:41 +11:00
Maikel Linke
41970ecf07 Use auth directive for Login button 
Use the auth directive instead of the AuthenticationCtrl for the Login
button in the menu and on checkout.
 2016-03-18 17:08:32 +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
a48b992ec0 Shops can require users to login 
Enterprise users have a new option to restrict their shopfronts to
logged in users only. If a guest visits one of these shopfornts, the
guest is prompted to login and is not shown any products.

Closes #849.
 2016-03-18 16:46:28 +11:00
Maikel Linke
599e39ce16 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/filter-producers-for-map 2016-03-18 13:41:45 +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
Rohan Mitchell
16741598fd Merge branch 'master' into products-caching 
Conflicts:
	spec/features/admin/variant_overrides_spec.rb
 2016-03-18 09:59:56 +11:00
Maikel Linke
6eb6a01339 Filter incomplete payments on database level 
Using explicit `LEFT OUTER JOIN ... ON ...` to query only completed
payments for the order overview of consumers.

They were filtered in Ruby before.
 2016-03-16 11:12:09 +11:00
Maikel
388b25ddf9 Auto-merged master into uk/account-balances on deployment. 2016-03-12 09:11:42 +11:00
Steve Pettitt
e81ef564e3 Capitalize Spree state translations 2016-03-11 22:01:09 +00:00
Steve Pettitt
e1fdd3a210 Apply style guide 2016-03-11 21:59:22 +00:00
Maikel Linke
2546603a67 Remove what_is_this from locale 
It got replaced by admin.whats_this.
Changed views to use the new key.
 2016-03-11 17:08:13 +11:00
Maikel Linke
e81343c8e4 Merge remote-tracking branch 'origin/master' into i18n-hackathon 2016-03-11 16:50:48 +11:00
Maikel Linke
51f94119ff Restore links_dropdown 2016-03-11 16:39:07 +11:00
Maikel Linke
ac88817a34 Add translation for unsaved_changes_warning 2016-03-11 15:46:29 +11:00
Maikel Linke
2a3b3b6dd2 Merge remote-tracking branch 'origin/master' into i18n-hackathon 
Conflicts:
	app/assets/javascripts/admin/enterprise_fees.js
	app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
	app/views/admin/shared/_columns_dropdown.html.haml
	app/views/admin/variant_overrides/_header.html.haml
	app/views/admin/variant_overrides/_products.html.haml
	spec/features/admin/bulk_order_management_spec.rb
	spec/features/admin/variant_overrides_spec.rb
 2016-03-11 15:38:28 +11:00
Maikel Linke
711f525d98 Remove   from locale en.yml 2016-03-11 14:45:43 +11:00
Maikel Linke
21a7942de6 Merge remote-tracking branch 'origin/master' into indicate-required-fields-for-new-enterprise-form 2016-03-11 14:14:45 +11:00
Maikel Linke
b7320a0bd7 Translate "Price" in Bulk Order Management 2016-03-11 12:48:35 +11:00
Maikel Linke
5225686d8f Re-merge bulk order view 2016-03-11 12:23:12 +11:00
Maikel Linke
3e5f53b082 Rename i18n key what_is_this 2016-03-11 12:13:17 +11:00
Steve Pettitt
b324207121 Merge current master 2016-03-10 21:48:13 +00:00
Steve Pettitt
fe3c0b8d29 Move data processing to model, add payment method preload 2016-03-10 21:42:42 +00:00
Maikel Linke
02cc5adf78 Revert false HAML indent 2016-03-09 19:04:37 +11:00
Maikel Linke
02cbad2697 Remove duplicate lines from merging 2016-03-09 18:49:35 +11:00
Maikel Linke
071ee9ab54 Add brackets to t call in js line items controller 
The missing brackets made all columns of the bulk order management
invisible.

Also removed trailing whitespaces.
 2016-03-09 18:39:23 +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
f2c8ea9722 Auto-merged master into uk/account-balances on deployment. 2016-03-09 14:43:05 +11:00
Maikel Linke
b6406b54b4 Apply code style 2016-03-09 14:40:04 +11:00
Maikel Linke
f1cc3a7b0d Apply code style following Rubocop 2016-03-09 14:32:41 +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
Rohan Mitchell
9645ec727b Refresh products cache when inventory items are changed 2016-03-09 14:07:04 +11:00
Rohan Mitchell
6f29a8b642 Refresh cache when inventory setting product_selection_from_inventory_only is changed 2016-03-09 13:29:33 +11:00
Rohan Mitchell
27d7b3026b Move OpenFoodNetwork::ProductsCacheIntegrityChecker.active_exchanges to Exchange model 2016-03-09 12:28:09 +11:00