Rob Harrington
|
aa7ddbcba4
|
Renaming Dist. column to Admin & Handling
|
2015-04-01 14:38:15 +11:00 |
|
Rob Harrington
|
54af6886c2
|
Line items with a quantity of zero return price_with_adjustments of 0.0
|
2015-04-01 12:34:22 +11:00 |
|
Rob Harrington
|
d49dd62124
|
Replace unused bugsnag notification with one to test for line items with a quantity of zero
|
2015-04-01 11:38:06 +11:00 |
|
Rob Harrington
|
6e77a5eebc
|
Using the correct method name duh
|
2015-03-27 16:47:12 +11:00 |
|
Rob Harrington
|
f5bacf71b7
|
Permissions for OrderCycleFormApplicator are determined internally
|
2015-03-27 16:16:13 +11:00 |
|
Rob Harrington
|
3817ef202c
|
Enterprises in simple OC create controller only load after OC initialises
|
2015-03-27 16:16:12 +11:00 |
|
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 |
|
summerscope
|
7090bb518b
|
Tweaking logic for alert bar to make messages more human readable for all use cases.
|
2015-03-20 14:24:59 +11:00 |
|
summerscope
|
0b1857771e
|
Finally got this slide animation working. stupid angular documentation!
ref: http://www.yearofmoo.com/2013/08/remastered-animation-in-angularjs-1-2.html
|
2015-03-20 13:09:45 +11:00 |
|
summerscope
|
938eff8482
|
More layout tweaks to enterprise modal template
|
2015-03-19 16:13:47 +11:00 |
|
summerscope
|
b99e94cecf
|
WIP on producer and product modals
|
2015-03-19 16:02:52 +11:00 |
|
summerscope
|
1f97052954
|
Add a min height to modals so they are not quite so stupidly small when not enough content suppied by users
|
2015-03-19 15:05:14 +11:00 |
|
summerscope
|
c76aa1d1c2
|
WIP on product modal
|
2015-03-19 14:52:09 +11:00 |
|
summerscope
|
cdd41ad651
|
change animation class
|
2015-03-19 14:52:00 +11:00 |
|
summerscope
|
3c61bf9cc4
|
Styling for no image available on product modal overlay
|
2015-03-19 14:51:41 +11:00 |
|