Rob Harrington
50738f28e9
Refactoring tag rule application
...
To allow rules to be loaded and counted before being checked for relevance
2016-05-27 16:23:26 +10:00
Maikel Linke
a624a57bfb
Pass current order to PaymentMethodSerializer
2016-05-25 17:12:47 +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
b9f6cb8800
Adding translations for all column names
2016-05-25 08:10:20 +10:00
Rob Harrington
1d8719b474
Default column visibility can be set per user using ColumnPreferences model
2016-05-25 08:10:20 +10:00
Lynne Davis
abfb8149d9
Adding configurable Shop Trial Length in business model
2016-04-15 16:51:07 +01:00
Rob Harrington
9b5bfdeb00
Allowing Order Management Report to filter by multiple payment / shipping methods at once
...
Also switched to using id rather than name to filter
2016-04-02 01:04:09 +11:00
Rob Harrington
d8c17d160a
Applying shipping method rules in checkout
2016-04-01 19:48:25 +11:00
Rob Harrington
f9acee2be4
Shipping methods can be tagged
2016-04-01 19:48:25 +11:00
Rob Harrington
443e232ea4
Renaming angular admin.shipping_methods and admin.payment_methods modules
2016-04-01 19:48:25 +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
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
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
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
f2c8ea9722
Auto-merged master into uk/account-balances on deployment.
2016-03-09 14:43:05 +11:00
Maikel Linke
f1cc3a7b0d
Apply code style following Rubocop
2016-03-09 14:32:41 +11:00
Rob Harrington
f06d909c23
WIP: Adding infrastructure to show/hide variants + overrides using inventory items
2016-03-02 12:10:22 +11:00
Rob Harrington
a66582a8fb
WIP: Using directive for EnterpriseFee index select elements, to properly bind data to the model
2016-03-02 11:56:46 +11:00
Steve Pettitt
b84f49a1c3
Satisfy style police
2016-02-24 20:39:26 +00:00
Rohan Mitchell
258e84fc0a
Replace with-tip with ofn-with-tip: misc
2016-02-24 11:26:37 +11:00
Steve Pettitt
ec3e158781
Merge current master
2016-02-20 17:24:57 +00:00
Maikel Linke
82182d24e7
Merge remote-tracking branch 'origin/master' into discourse-sso
2016-02-19 11:02:59 +11:00
Maikel Linke
f5ff5bd5b0
Merge remote-tracking branch 'origin/master' into groups
2016-02-04 16:12:57 +11:00
Maikel
3dd3cfa7ec
Auto-merged master into uk/account-balances on deployment.
2016-01-25 04:43:25 +11:00
Maikel Linke
d562f6537e
Cleaner opengraph meta tags
2016-01-20 15:42:01 +11:00
Maikel Linke
fbdeb557ca
Loading only visible enterprises for group
2016-01-20 13:32:08 +11:00
ludivinecp
a611e73bed
Opengraph facebook: images and description for shops and groups and home => ok
2016-01-15 14:03:33 +11:00
Rob Harrington
4237a83028
Moving components required for variant overrides into appropriate modules
2016-01-13 18:49:32 +11:00
stveep
698d36180d
Move query from injector to User instance method
2016-01-07 13:25:15 +00:00
Maikel Linke
217fa9a57c
UI integration of Discourse login
2016-01-07 19:01:09 +11:00
stveep
59adf88cad
Feature spec
2015-12-22 22:59:07 +00:00
stveep
48896ab3d8
More serializer specs
2015-12-22 15:09:24 +00:00
stveep
da0810382b
Sorting by most orders, currency symbol, hide until clicked, reformatting table headers
2015-12-21 22:19:00 +00:00
stveep
90e627ad60
Data manipulation and balance calc in rails instead
2015-12-21 17:40:36 +00:00
stveep
7e50cc9ce8
Data organisation in angular, basic table structure and balance calculation.
2015-12-21 14:12:38 +00:00
stveep
16ab8f04c3
Angularise /account page: Order service/controller, rough layout
2015-12-18 17:06:04 +00:00
Rob Harrington
ecd11702c3
Fixing up enterprise user account page
2015-12-16 19:18:59 +11:00
Rob Harrington
ca3c464fda
Reorganising busines model config settings, moving account invoice tax rate in busines model config settings
2015-12-16 19:18:57 +11:00
Rob Harrington
c1d04af5cc
Implementing monthly billing description logic in required pages
2015-12-16 19:18:57 +11:00
Rob Harrington
5b72f53738
Adding helper for describing monthly billing charges
2015-12-16 19:18:57 +11:00
Rob Harrington
e6a51bb49d
Adding actions dropdown to admin order view/pages
2015-12-16 11:55:23 +11:00
Continuous Integration
b7edf5e046
Auto-merge from CI [skip ci]
2015-12-16 10:58:03 +11:00
Rohan Mitchell
c74463404d
Only show order cycle options that include the chosen distributor
2015-12-11 13:06:57 +11:00
Rohan Mitchell
eb07680f1f
Inject shops and order cycles
2015-12-11 13:06:57 +11:00
Maikel Linke
cd7721a127
Using date and time of current timezone
...
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
2015-12-10 11:38:41 +11:00
Rob Harrington
66d1e4297e
WIP: Renaming admin.order_cycles to admin.orderCycles for consistency
2015-11-05 14:40:42 +11:00
Rob Harrington
9b2653aa2d
Updating order invoice template to be more legally compliant
2015-10-21 15:52:14 +11:00
