raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,390 Commits 21 Branches 450 Tags
30bb948d35f392cb59cd7983626cdbe03cd5997c
Commit Graph

2222 Commits

Author SHA1 Message Date
Rohan Mitchell
7b4130972b Fix first feature spec sometimes timing out 2015-05-06 18:12:17 +10:00
Rohan Mitchell
e91de69d5a Merge branch 'master' into pin-refunds 2015-05-01 14:58:19 +10:00
Rohan Mitchell
03ae740cd6 Revert "Display header for Xero invoices report" 
This reverts commit a6cecdcc25.
 2015-05-01 14:55:26 +10:00
Rohan Mitchell
153604dd64 Merge branch 'single-order-patches' 2015-05-01 14:39:17 +10:00
Rohan Mitchell
a6cecdcc25 Display header for Xero invoices report 2015-05-01 11:59:52 +10:00
Maikel Linke
af78859db6 Merge remote-tracking branch 'origin/master' into single-order-patches 2015-04-30 17:18:02 +10:00
Maikel Linke
5efc0a5110 quick fix: update fees after updating order 2015-04-30 16:29:51 +10:00
Rohan Mitchell
b498c28632 Payments can be refunded 2015-04-30 15:49:48 +10:00
Rohan Mitchell
8184a7c7b2 Pin payments can't void or credit, but they can refund 2015-04-30 15:49:48 +10:00
Rohan Mitchell
b09ae550c8 Add spec for payment actions 2015-04-30 15:49:48 +10:00
Rohan Mitchell
a207f50aeb Merge branch 'master' into delay-devise-emails 
Conflicts:
	script/run_tests.sh
 2015-04-30 12:29:06 +10:00
Maikel Linke
f6d87eee87 Merge remote-tracking branch 'origin/master' into single-order-patches 2015-04-29 13:20:44 +10:00
Maikel Linke
2b0f867ed8 new order method ready_to_ship? 2015-04-29 11:42:35 +10:00
Rob Harrington
c66a7e44b6 Updating product model specs to reflect changes to properties 2015-04-23 15:37:41 +10:00
Maikel Linke
a937fd3c61 Using variant overrides in variant seach on order edit page 2015-04-23 11:37:10 +10:00
Rob Harrington
0251d8962d Adding sku to BPE 2015-04-22 21:02:07 +10:00
Rob Harrington
e546388784 Rename properties_h to properties_including_inherited 2015-04-22 21:02:07 +10:00
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
Rohan Mitchell
7b8938b5f6 Run password reset job for spec that requires it 2015-04-22 07:32:22 +10:00
Rohan Mitchell
700cb73b8f Send enterprise confirmation emails asynchronously 2015-04-21 16:19:02 +10:00
Rohan Mitchell
9d225142c8 Send password reset instructions asynchronously 2015-04-21 16:10:40 +10:00
Rohan Mitchell
a1673afff0 Allow more time for phantomjs, required by first admin spec where assets are compiled 2015-04-17 15:46:51 +10:00
Rohan Mitchell
0d4dbd23fd Remove redundant spec line, test that sells is not changed 2015-04-17 15:42:42 +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
46690faffb Fixing Darkswarm Angular Product Controller spec 2015-04-17 15:14:19 +10:00
Rohan Mitchell
042e076b58 Fix tax-related spec failures 2015-04-17 14:46:32 +10:00
Rob Harrington
c8bf207187 Fixing trial expiry test 2015-04-17 14:33:47 +10:00
Rohan Mitchell
9e8483348f Fix spec - enterprise needs to charge sales tax for tax to be charged 2015-04-17 13:41:38 +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
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
a93633a626 Show tax on order confirmation emails 2015-04-17 13:41:14 +10:00
Rohan Mitchell
2914990444 Add save_and_open spec helper method to open HTML emails in the browser 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
6bb926f811 Do not show tax in checkout 2015-04-17 13:39:09 +10:00
Rohan Mitchell
829d11d4b2 Deliver a warning if attempting to create an invalid taxed_product from factory 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
68f0e51c02 Change add_product_to_cart spec helper to use OrderPopulator, reducing inconsistencies in order adjustments, tax etc. 2015-04-17 13:39:09 +10:00
Rohan Mitchell
210c76eddc Checkout won't load without payment and shipping methods; move spec to context where it can test the checkout 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
b44f2bcdf5 Fixing trial expiry test 2015-04-17 13:30:36 +10:00
Rob Harrington
f13b52411d Merge branch master into properties 2015-04-17 13:23:33 +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