Paul Mackay
|
9103e83ce2
|
#275: spec test for controller method. Other small fixes.
|
2015-04-11 18:28:31 +01:00 |
|
Rob Harrington
|
b24cad7aeb
|
Providing access to order_cycle_permissions in order cycles controller
|
2015-04-11 23:25:30 +10:00 |
|
Rob Harrington
|
e3138c3cd2
|
Renaming order_cycle_enterprises_for as visible_enterprises
|
2015-04-11 22:25:23 +10:00 |
|
Paul Mackay
|
99709b53ed
|
Change controller action to 'notify_producers'.
Add flash message on completion.
Simplify job variables.
Improve mailer query.
Spec for job.
|
2015-04-11 13:19:48 +01:00 |
|
Rob Harrington
|
26d55baa35
|
Moving order cycle permissions to their own permissions class
|
2015-04-11 21:11:10 +10:00 |
|
Rob Harrington
|
72403fd021
|
Fixing broken enterprise controller spec
|
2015-04-10 13:16:21 +10:00 |
|
Rob Harrington
|
2280a71b23
|
Replace for_order_cycle rabl template with a serializer
|
2015-04-10 09:25:40 +10:00 |
|
Rob Harrington
|
60a3d8e0d1
|
Restrict bulk updating order cycles at controller level
|
2015-04-09 12:27:43 +10:00 |
|
Rob Harrington
|
adc1b639bc
|
Merge remote-tracking branch 'origin/master' into complex_oc
|
2015-04-08 14:38:27 +10:00 |
|
Rob Harrington
|
32cc17745a
|
Non-coordinating user cannot alter important attributes of order cycle
|
2015-04-08 14:12:49 +10:00 |
|
Rob Harrington
|
104a8ddecf
|
Refactor order_cycle_enterpises_for permission method, now requires an order cycle
|
2015-04-08 13:00:17 +10:00 |
|
Rob Harrington
|
d516795774
|
Fetching Enterprise Fees for order cycle, using new enterprisefee serializer
|
2015-04-06 13:06:21 +10:00 |
|
Rob Harrington
|
5020eb4e32
|
And again: override redirect to index page when editing properties from edit page
|
2015-04-02 14:14:16 +11:00 |
|
Rob Harrington
|
cb376602f2
|
Override redirect to index page when editing properties from edit page
|
2015-04-02 14:03:51 +11:00 |
|
Rob Harrington
|
3aa5f6e023
|
Adding properties tab to admin enterprise edit form
|
2015-04-02 11:30:32 +11:00 |
|
Rob Harrington
|
ca1a5b5f8d
|
Ignoring any new producer properties submitted by the user
|
2015-04-02 08:54:35 +11:00 |
|
Rob Harrington
|
f5bacf71b7
|
Permissions for OrderCycleFormApplicator are determined internally
|
2015-03-27 16:16:13 +11:00 |
|
Rob Harrington
|
43d2eb4d22
|
Adding 'new' method to admin order cycle service, for loading data from serializer for new OCs
|
2015-03-27 16:16:12 +11:00 |
|
Rob Harrington
|
193a061c44
|
Order cycle form applicator only updates visible variants, should add an 'editable variants' scope to permissions
|
2015-03-27 16:16:11 +11:00 |
|
Rob Harrington
|
d115ef5f7e
|
Scoping old generalised order cycle helper methods to a specific order cycle
|
2015-03-27 16:16:10 +11:00 |
|
Rob Harrington
|
35b27fcfd2
|
Delegating responsibility for returning an empty scope when no options are passed to order_cycle_enterprises_for
|
2015-03-27 16:16:10 +11:00 |
|
Rob Harrington
|
45f6042d3d
|
Enterprises etched by for_order_cycle action now use permissions scoped using an order cycle or coordinator
|
2015-03-27 16:16:10 +11:00 |
|
Rob Harrington
|
c9f343f680
|
Swapping over scoping method for displayed enterprises in OC index page from order_cycle_enterprises to enterprises_for(order_cycle)
|
2015-03-27 16:15:28 +11:00 |
|
Rob Harrington
|
d8c4e292c8
|
Adding method for determining variant override hubs
|
2015-03-27 16:09:45 +11:00 |
|
Rob Harrington
|
e9f2e743ce
|
Replacing old representative template for OCs with active model serializers
|
2015-03-27 16:07:38 +11:00 |
|
Rob Harrington
|
a9c7e4b716
|
Order cycles index shows all OrderCycles I am involved in
|
2015-03-27 15:56:06 +11:00 |
|
Rohan Mitchell
|
8037811735
|
Only make new enterprises as hubs when current user *owns*, not just manages a hub.
|
2015-03-27 14:38:21 +11:00 |
|
Rohan Mitchell
|
09a102bd8b
|
When an enterprise user with a hub creates a new producer, it does not default to sells any #453
|
2015-03-27 12:02:20 +11:00 |
|
Rohan Mitchell
|
5da9bdc614
|
Merge branch 'victornava-legacy-login-fix'
|
2015-03-25 10:37:14 +11:00 |
|
Rohan Mitchell
|
ab9bc7b1dc
|
Output debugging information to help investigate bogus changes to the sells field through the enterprises bulk edit action
|
2015-03-18 12:50:25 +11:00 |
|
Rohan Mitchell
|
a6f0d8f69a
|
Show a nice error message instead of 500 error when deleting a referenced order cycle
|
2015-03-16 12:42:35 +11:00 |
|
Rohan Mitchell
|
4491d3cc73
|
Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix
Conflicts:
app/views/admin/order_cycles/_row.html.haml
spec/features/admin/order_cycles_spec.rb
|
2015-03-16 12:14:54 +11:00 |
|
Rohan Mitchell
|
1a44e74a9d
|
When enterprise user creates an enterprise, make it a hub if they have other hubs
|
2015-03-13 16:06:42 +11:00 |
|
Rohan Mitchell
|
5609354136
|
Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs
|
2015-03-13 10:45:38 +11:00 |
|
Victor Nava
|
208fa02ec0
|
Create a 'Show More' button at the top of the page, next to New Order on on admin order cycles index page
|
2015-03-11 13:14:45 +11:00 |
|
Victor Nava
|
2c89573441
|
Shave off a few seconds when showing order_cycles#index by loading order_cycle_enterprises only once.
|
2015-03-11 11:59:25 +11:00 |
|
Victor Nava
|
1b709a3e03
|
Do not load Order Cycles that closed more than a month a go
|
2015-03-05 16:04:36 +11:00 |
|
Rohan Mitchell
|
53fa71d1f3
|
Admin can set enterprise fee's tax category
|
2015-03-05 10:44:25 +11:00 |
|
Paul Mackay
|
ca665dc6bc
|
Merge master into producer-emails.
|
2015-03-04 19:09:43 +00:00 |
|
Rob Harrington
|
85b8adb1aa
|
call to order_cycle_hub_enterprises has no arguments
|
2015-03-01 15:33:16 +11:00 |
|
Rob Harrington
|
c91699a11e
|
Using @order_cycle.coordinator instead of @coordinator
|
2015-02-27 17:24:37 +11:00 |
|
Rob Harrington
|
5563d23beb
|
Rename set_coordinator method to require_coordinator
|
2015-02-27 17:24:36 +11:00 |
|
Rob Harrington
|
8de6f983a2
|
User must set the coordinator first when creating an order cycle
|
2015-02-27 17:24:36 +11:00 |
|
Maikel Linke
|
3beff77164
|
Merge remote-tracking branch 'origin/master' into group-pages
|
2015-02-26 17:22:13 +11:00 |
|
Rohan Mitchell
|
176db78e64
|
Extract data fetching from views
|
2015-02-20 11:17:01 +11:00 |
|
Maikel Linke
|
98063dae60
|
setting default country by id in groups controller
|
2015-02-19 16:57:19 +11:00 |
|
Maikel Linke
|
c01d45e3af
|
Serialize move_up and move_down methods of groups
There have been race conditions in other projects using the acts_as_list
gem which could be solved by serializing.
|
2015-02-19 16:51:58 +11:00 |
|
Maikel Linke
|
ecd7b16ef5
|
revert setting default country by name in enterprise controller
|
2015-02-19 11:09:43 +11:00 |
|
Rohan Mitchell
|
f83ceae5d1
|
Fix feature: Enterprises list is shortened when error in bulk update
|
2015-02-18 15:32:56 +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 |
|