Rob Harrington
|
0c155e6e3a
|
Display message when email has not been confirmed for new enterprise
|
2015-04-15 15:32:17 +10:00 |
|
Rob Harrington
|
e3138c3cd2
|
Renaming order_cycle_enterprises_for as visible_enterprises
|
2015-04-11 22:25:23 +10:00 |
|
Rob Harrington
|
26d55baa35
|
Moving order cycle permissions to their own permissions class
|
2015-04-11 21:11:10 +10:00 |
|
Rob Harrington
|
02f8f293da
|
Only allow managers or coordinator to add/remove fees from exchanges
|
2015-04-11 18:32:04 +10:00 |
|
Rob Harrington
|
226e2f0e2c
|
Fixing error caused by order show template doing a lookup based on current distributor rather than order distributor
|
2015-04-10 09:26:20 +10:00 |
|
Rob Harrington
|
2280a71b23
|
Replace for_order_cycle rabl template with a serializer
|
2015-04-10 09:25:40 +10:00 |
|
Rob Harrington
|
81a745420e
|
Only check editable status of variants when actually selecting
|
2015-04-09 15:24:45 +10:00 |
|
Rob Harrington
|
69004ac477
|
Select all box only selects variants I have permission to edit
|
2015-04-09 13:29:25 +10:00 |
|
Rob Harrington
|
430320e3f9
|
Oopsie!
|
2015-04-09 13:28:41 +10:00 |
|
Rob Harrington
|
8a3126f117
|
Using helper to disable form elements on order cycle index page
|
2015-04-09 11:11:46 +10:00 |
|
Rob Harrington
|
c7157ce7bd
|
Applying new helper to order cycle name and timing partial
|
2015-04-09 11:11:06 +10:00 |
|
Rob Harrington
|
fbcfe9b2a4
|
Add viewing_as_coordiantor flag to serialized order cycles and a managed flag to serialized enterprises for_order_cycle(s)
|
2015-04-09 10:31:17 +10:00 |
|
Rob Harrington
|
f6e635466b
|
Rearranging elements on the order cycle form a little bit
|
2015-04-08 14:31:18 +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
|
36c5cdf556
|
Only show enterprises with fees in order cycle edit page
|
2015-04-06 14:08:10 +10:00 |
|
Rob Harrington
|
a4b80b1f33
|
Implement editable scope for variants on order cycles page
|
2015-04-06 09:15:14 +10:00 |
|
Rob Harrington
|
009b25a491
|
Adding an editable variants scope for incoming exchanges
|
2015-04-05 13:59:00 +10:00 |
|
Rob Harrington
|
3aa5f6e023
|
Adding properties tab to admin enterprise edit form
|
2015-04-02 11:30:32 +11:00 |
|
Rob Harrington
|
5b235f356e
|
Replace free text with with select dropdown for property names when not super admin
|
2015-04-02 08:56:36 +11:00 |
|
Rob Harrington
|
8d95ba2c69
|
Display full name of variant on order cycle edit form
|
2015-04-01 15:46:19 +11:00 |
|
Rob Harrington
|
6e77a5eebc
|
Using the correct method name duh
|
2015-03-27 16:47:12 +11:00 |
|
Rob Harrington
|
887579ecb8
|
Use managed_by scope on Enterprise instead of user.enterprises
|
2015-03-27 16:16:12 +11:00 |
|
Rob Harrington
|
9430999540
|
Filtering exchange variants, for outgoing exchange variant count
|
2015-03-27 16:16:12 +11:00 |
|
Rob Harrington
|
99bd6244ed
|
Filtering the list of variants visible within each exchange based on 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
|
7e24e6743e
|
enterprises_for is now order_cycle_enterprises_for, and can be passed an order_cycle or a coordinator (for new order_cycles)
|
2015-03-27 16:16:09 +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
|
e9f2e743ce
|
Replacing old representative template for OCs with active model serializers
|
2015-03-27 16:07:38 +11:00 |
|
Rob Harrington
|
1c09b8b76f
|
Limiting variants loaded into representative template to those a visible to the current user
|
2015-03-27 16:07:38 +11:00 |
|
Rob Harrington
|
75a37e16e3
|
Remove elements of order cycle form that coordinators cannot edit
|
2015-03-27 15:56:07 +11:00 |
|
Rob Harrington
|
75ed259554
|
Conditionally show input for coordinator
Conflicts:
app/views/admin/order_cycles/_form.html.haml
|
2015-03-27 15:56:07 +11:00 |
|
Rohan Mitchell
|
d471368412
|
Spacing
|
2015-03-27 13:09:25 +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
|
cf4ccc268a
|
Admin may set no tax category on product unless tax category is required
|
2015-03-18 10:12:32 +11:00 |
|
Rohan Mitchell
|
7af17242f9
|
EnterpriseFee admin interface allows selecting no fee
|
2015-03-16 14:05:04 +11:00 |
|
Rohan Mitchell
|
95c09315f5
|
Change class delete-product -> delete-order-cycle
|
2015-03-16 12:42:05 +11:00 |
|
Rohan Mitchell
|
e125bcf451
|
Add column header for extra action column
|
2015-03-16 12:15:43 +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 |
|
Rob Harrington
|
d684a88697
|
Merge branch 'order-confirmation' into ready-to-merge
|
2015-03-13 18:11:53 +11:00 |
|
summerscope
|
d2fbf9f14d
|
Fixing logic for instance where collection instructions are not entered
|
2015-03-13 18:00:36 +11:00 |
|
Rob Harrington
|
dd8c769ea9
|
Hiding fee breakdown on cart page for now
|
2015-03-13 16:50:57 +11:00 |
|
summerscope
|
864c9ec1da
|
This changes the user menu labels to show Account next to user email.
Small tweak to user account page to make it less awful.
|
2015-03-13 16:49:26 +11:00 |
|
Rob Harrington
|
b0cfa6a17c
|
Shipping method prices displayed next to options in checkout
|
2015-03-13 16:18:49 +11:00 |
|
Rob Harrington
|
51258b242c
|
Merge remote-tracking branch 'origin/order-confirmation' into order-confirmation
|
2015-03-13 16:07:17 +11:00 |
|
Rohan Mitchell
|
efbf2c7ffa
|
Display extended variant name in quick cart
|
2015-03-13 12:58:53 +11:00 |
|
Rob Harrington
|
cce65aa462
|
Merge remote-tracking branch 'origin/master' into order-confirmation
|
2015-03-12 16:20:21 +11:00 |
|
Rob Harrington
|
44511b8b61
|
Only display shipping description if it exists
|
2015-03-12 16:18:30 +11:00 |
|
Rob Harrington
|
6cd6b751c8
|
Merge branch 'master' into order-confirmation
|
2015-03-12 15:34:49 +11:00 |
|