Rob Harrington
|
aa170ef5f6
|
Order cycle simple create controller uses 'new' method on OC service to initialise
|
2015-03-27 16:16:12 +11:00 |
|
Rob Harrington
|
4d14acb64d
|
Don't send non-attributes of js order_cycle object to server
|
2015-03-27 16:16:12 +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
|
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
|
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
|
5e015f0611
|
Rename visibleVariants filter to visibleProductVariants
|
2015-03-27 16:16:11 +11:00 |
|
Rob Harrington
|
681dada5df
|
Simple OC form loads coordinator into JS
|
2015-03-27 16:16:11 +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
|
63e345f819
|
Exchange serializer cuts down list of variants visible to the current user, 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
|
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
|
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
|
d8c4e292c8
|
Adding method for determining variant override hubs
|
2015-03-27 16:09:45 +11:00 |
|
Rob Harrington
|
4dff3fe79c
|
Removing unused distributable action from products api
|
2015-03-27 16:07:38 +11:00 |
|
Rob Harrington
|
1927bc55d0
|
Load actual variants in the exchange, wrong behaviour was implemented in previous two commits
|
2015-03-27 16:07:38 +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
|
2310a6a7db
|
Splitting out order cycle abilities from general order management abilities
|
2015-03-27 16:07:37 +11:00 |
|
Rob Harrington
|
85e4b3970c
|
Adding an 'involved' scope to exchanges
|
2015-03-27 15:56:07 +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
|
f8a9652333
|
Moving SASS comments to thier own lines
|
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 |
|
Rob Harrington
|
a9c7e4b716
|
Order cycles index shows all OrderCycles I am involved in
|
2015-03-27 15:56:06 +11:00 |
|
Rob Harrington
|
0b082c964b
|
Restricting which enterprises can coordinate an order cycle
|
2015-03-27 15:51:27 +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
|
0ed1eeffd6
|
When registering a new enterprise, if user is signed in, owns a hub and is not making a producer, the new enterprise becomes a hub
|
2015-03-27 14:05:58 +11:00 |
|
Rohan Mitchell
|
d471368412
|
Spacing
|
2015-03-27 13:09:25 +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
|
d8656a36c6
|
Consistency in tax calculations, remove some unneeded local vars
|
2015-03-25 16:31:15 +11:00 |
|
Rohan Mitchell
|
89d4a59e9d
|
Extract order total tax calculations to model
|
2015-03-25 16:27:29 +11:00 |
|
Rohan Mitchell
|
9650692699
|
Calculate total tax on enterprise fees for an order
|
2015-03-25 16:27:29 +11:00 |
|
Rohan Mitchell
|
7fb8370c36
|
Look up shipping tax on an order
|
2015-03-25 16:27:29 +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
|
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
|
95c09315f5
|
Change class delete-product -> delete-order-cycle
|
2015-03-16 12:42:05 +11:00 |
|
Rohan Mitchell
|
e38772ada0
|
Enterprise user can delete unreferenced order cycles
|
2015-03-16 12:41:06 +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
|
bdeca54377
|
Reloading stale enterprise object in test
|
2015-03-14 16:17:16 +11:00 |
|
Rob Harrington
|
cb28843af1
|
Reload manager before ensuring owner is a manager
|
2015-03-14 10:41:49 +11:00 |
|
Rob Harrington
|
d684a88697
|
Merge branch 'order-confirmation' into ready-to-merge
|
2015-03-13 18:11:53 +11:00 |
|
summerscope
|
d0f66a6053
|
Fixing label for cart popover to make it write name of product variant without page load
|
2015-03-13 18:10:59 +11:00 |
|
summerscope
|
d2fbf9f14d
|
Fixing logic for instance where collection instructions are not entered
|
2015-03-13 18:00:36 +11:00 |
|
Rohan Mitchell
|
8d3f25bb39
|
Fix intermittent 500 error when updating the cart
|
2015-03-13 17:50:01 +11:00 |
|