raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-07 22:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 18 Branches 453 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

8189 Commits

Author SHA1 Message Date
Rob Harrington
a75a76840d Merging master into require_standard_variant 2015-04-17 21:18:24 +10:00
Rob Harrington
ff2e6d9ca4 Test deletion rather than destruction on variant model spec 2015-04-17 17:25:13 +10:00
Maikel Linke
893b743973 tidy (rm comment) 2015-04-17 17:00:18 +10:00
Maikel Linke
03fd148f41 showing profile modals on groups/hubs 2015-04-17 16:58:49 +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
b9f19d5777 Fixing broken specs 2015-04-17 13:00:20 +10:00
Rob Harrington
8248e382f3 Greying out disabled action button 2015-04-17 11:25:18 +10:00
Rob Harrington
4b182f9248 Can't delete final variant on a product from BPE 2015-04-17 11:25:18 +10:00
Rob Harrington
2b47c9145a Cannot delete last variant of product 2015-04-17 11:25:17 +10:00
Rob Harrington
a223a2d662 Cannot remove all variants from a product 2015-04-17 11:25:17 +10:00
Rob Harrington
28486f9e76 Only adds standard variant on create 2015-04-17 11:25:17 +10:00
Rob Harrington
869551a17c Adding a standard variant again 2015-04-17 11:25:17 +10:00
Rob Harrington
13a910c372 Replace validates_associated on master with current spree method for error reporting master saves 2015-04-17 11:25:17 +10:00
Rob Harrington
0a7b01ff07 Product requires variant_unit and master requires unit_value and/or unit_desc 2015-04-17 11:25:16 +10:00
Rob Harrington
dfb513cce7 Use after_create callback to duplicate master variant 2015-04-17 11:25:16 +10:00
Rob Harrington
3f01a459ac Adding a standard variant upon initialisation of a new instance of Spree::Product 2015-04-17 11:25:16 +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