Maikel
7bec139987
Auto-merged master into products-caching-add-to-cart on deployment.
2016-04-22 10:58:26 +10:00
Rob Harrington
28d40bf27d
Fixing font styling on enterprise name in shop product summary
2016-04-21 21:27:52 +10:00
Rohan Mitchell
cfe062918b
When a variant goes out of stock, disable the input and grey out the row
2016-04-21 09:36:23 +10:00
Lynne Davis
cbd0ace098
Code tidying and currency symbol internationalisation
2016-04-15 16:56:09 +01:00
Lynne Davis
30ed6df38d
Adding super admin configuration for the minimum billable turnover functionality
2016-04-15 16:56:09 +01:00
Lynne Davis
4033a78887
Removing incorrect angular watch
2016-04-15 16:55:07 +01:00
Lynne Davis
51629cd0c0
Adding translations for shop front trials
2016-04-15 16:55:06 +01:00
Lynne Davis
abfb8149d9
Adding configurable Shop Trial Length in business model
2016-04-15 16:51:07 +01:00
Steve Pettitt
0b820361de
Merge master
2016-04-15 08:29:52 +01:00
Steve Pettitt
fc719230a3
Add failed payments, update spec
2016-04-15 08:26:12 +01:00
Maikel Linke
831df0b222
Create and delete customers in admin interface
...
Removed Customers service and extended CustomerResource.
2016-04-15 11:12:22 +10:00
Maikel Linke
9e4610f9bd
Customers: enable change of hub if no customers
...
Fix #588 .
And show search bar even when no customers are shown. Previously, the
search bar disappeared when you entered a search without results.
2016-04-15 11:12:22 +10:00
elf Pavlik
f15e948085
small i18n fixes #878
2016-04-14 16:10:21 -05:00
Steve Pettitt
1483023769
Add a sweet warning sign
2016-04-10 22:48:38 +01:00
Steve Pettitt
bc048a943c
Show all payments, format unsuccessful payments grey, add 'invalid' translation.
2016-04-10 22:23:39 +01:00
Rob Harrington
44077a2c6f
Fixing styling (bottom margin for save-bar) on inventory page
2016-04-06 15:43:55 +10:00
Rob Harrington
d278b72289
Updating Tag Rules UI to allow management of new FilterShippingMethods rule type
2016-04-01 19:48:25 +11:00
Rob Harrington
c74c274a9e
Renaming shippingMethodCtrl to shippingMethodsCtrl
2016-04-01 19:48:25 +11:00
Rob Harrington
bf72864c2b
Tag Rules can be deleted
2016-04-01 19:48:25 +11:00
Rob Harrington
4c2552e0bf
Enterprise users can create tag rules
2016-04-01 19:48:25 +11:00
Rob Harrington
066190c16f
First cut at an interface for updating tag rules
2016-04-01 19:48:25 +11:00
Maikel Linke
97bcbb81b9
Change text of register call in the dropdown
...
Unified code for the dropdown and the footer.
Both contain the register call and are both pointing to the register
path now. The footer still pointed to the global site before.
2016-04-01 14:39:43 +11: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
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
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
stveep
d67db76b88
Formatting credit/debit green/red
2016-03-28 20:35:14 +01: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
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
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
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
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
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
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
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
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
f2c8ea9722
Auto-merged master into uk/account-balances on deployment.
2016-03-09 14:43:05 +11:00
