Rob Harrington
976c24cf4c
properties_h uses inherit_properties flag, and returns property id rather than presentation
2015-04-22 21:02:07 +10:00
Rob Harrington
f610a709e1
Adding inherits_properties to BPE
2015-04-22 21:02:06 +10:00
Rob Harrington
5d6f265c0a
Moving spree namespaced serializers into admin
2015-04-22 21:02:06 +10:00
Rob Harrington
a4a41ae26a
Refactor properties_h
2015-04-22 21:02:06 +10:00
Rohan Mitchell
0d9ba4257d
Merge branch 'properties'
2015-04-17 15:25:51 +10:00
Rob Harrington
c43eb9ef72
Merge branch 'email_user' into properties
2015-04-17 15:17:37 +10:00
Rob Harrington
32f14bca00
Preventing fitting of selectors when there are none
2015-04-17 15:10:41 +10:00
Rob Harrington
6d96a7a60b
Specifiy that allSelectors attribute on filterSelectors directive is optional
2015-04-17 14:43:09 +10:00
Rohan Mitchell
81324f3cc4
Do not charge tax on shipments when distributor does not charge sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
0b8a619274
When the order does not have a hub, all tax rates apply
2015-04-17 13:41:38 +10:00
Rohan Mitchell
3e8801b12b
Do not charge sales tax on items or on enterprise fees when the distributor of the order does not charge sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
a6a5fdfb3b
Require that the user selects whether their enterprise charges sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
0bdb8f7241
User can set whether an enterprise charges sales tax when registering
2015-04-17 13:41:38 +10:00
Rohan Mitchell
9bbc151cae
Admin can set enterprises to charge or not charge sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
08fef890ec
Do not show tax lines if there is no tax on the order
2015-04-17 13:41:14 +10:00
Rohan Mitchell
a93633a626
Show tax on order confirmation emails
2015-04-17 13:41:14 +10:00
Rohan Mitchell
4bd1ff2011
Extract the bulk of the confirmation emails into partials, eliminating a lot of duplication
2015-04-17 13:40:08 +10:00
Rohan Mitchell
3ce2c5b84f
Show tax on order confirmation page
2015-04-17 13:40:08 +10:00
Rohan Mitchell
77d7255243
Use short syntax for rendering partials
2015-04-17 13:39:10 +10:00
Rohan Mitchell
6bb926f811
Do not show tax in checkout
2015-04-17 13:39:09 +10:00
Rohan Mitchell
beec910445
Display tax in cart
2015-04-17 13:39:09 +10:00
Rohan Mitchell
e75c6a8e1d
Add helper to display total tax on an order
2015-04-17 13:39:09 +10:00
Rob Harrington
f13b52411d
Merge branch master into properties
2015-04-17 13:23:33 +10:00
Rob Harrington
0cf8b017b9
Pulling out taxons and properties placeholders from producer and product modals
2015-04-17 13:20:01 +10:00
Rob Harrington
524f02717b
Don't redirect to root when closing login window on checkout page
2015-04-17 10:25:38 +10:00
Rob Harrington
456a6f94f5
On enterprise confirmation: create a new user based on enterprise contact email if one does not already exist, and add it as a manager
2015-04-17 10:24:37 +10:00
Rob Harrington
afe77925ba
Allow request to specify a return value when calling user_passwords#edit
2015-04-17 10:21:25 +10:00
Rob Harrington
5940ff2b2c
Don't override devise's after_sign_in_path_for, use specific before filters for user sessions and registrations controllers instead
2015-04-16 16:56:27 +10:00
Rohan Mitchell
e9fbd74e88
Send emails via jobs instead of synchronously
2015-04-16 16:54:43 +10:00
Rohan Mitchell
bb3bdf37cd
Add jobs for user, order and enterprise emails
2015-04-16 16:54:43 +10:00
Rohan Mitchell
aef3fdf4b4
Merge branch 'group-pages'
2015-04-16 16:53:49 +10:00
Rohan Mitchell
768cfab591
Change field text at checkout
2015-04-16 10:59:15 +10:00
Rohan Mitchell
7f973604e5
Add columns to customer totals report: order cycle, payment method, customer code, tags, billing address
2015-04-16 10:59:15 +10:00
Rohan Mitchell
7f6c02ca29
Add User#customer_of to look up customers
2015-04-16 10:59:15 +10:00
Rohan Mitchell
34d1841d22
Make Variant#full_name resilient to regex chars
2015-04-16 10:59:15 +10:00
Rohan Mitchell
e570352a1b
Grant fewer permissions on enterprise creation
2015-04-16 10:59:15 +10:00
Rohan Mitchell
2e021941d1
Fix bug where new enterprises should be created as hubs, but aren't
2015-04-16 10:59:15 +10:00
Rohan Mitchell
48bf87ec73
Perpetually updating copyright year
2015-04-16 10:59:15 +10:00
Maikel Linke
548e3576b9
textAngular editor for group description
2015-04-15 17:13:10 +10:00
Maikel Linke
201bcb133a
show profiles checkbox on groups hubs page
2015-04-15 16:15:21 +10:00
Rob Harrington
0c155e6e3a
Display message when email has not been confirmed for new enterprise
2015-04-15 15:32:17 +10:00
Rob Harrington
b24cad7aeb
Providing access to order_cycle_permissions in order cycles controller
2015-04-11 23:25:30 +10:00
Rob Harrington
6ac45f3dc8
Renaming order_cycle_exchanges as visible_exchanges
2015-04-11 22:26:55 +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
Maikel Linke
2fd25f6cc4
Injecting all enterprises into group page
...
The enterprises have related producers and hubs that need to be
dereferenced. Therefore, we need a bigger set of enterprises to be
loaded. Injecting all enterprises is simple and doesn't require changes
if the set of needed enterprise data is growing in future.
2015-04-10 17:42:54 +10:00
Rob Harrington
24e3c9a9e1
Adding bugsnag notify block for catching naughty phantom fees
2015-04-10 16:41:10 +10:00
Rob Harrington
72403fd021
Fixing broken enterprise controller spec
2015-04-10 13:16:21 +10:00
Maikel Linke
1e168afd71
giving the enterprise serializer the active_distributors
2015-04-10 12:55:20 +10:00
