raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-19 04:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,369 Commits 17 Branches 457 Tags
a36b7ce01ac4aa2bcccb2f83ec6eadcb6b7b06fd
Commit Graph

4133 Commits

Author SHA1 Message Date
Maikel Linke
11acb3ba59 Allow to remove adjustments 
Managers of an order cycle and the distributor of an order are allowed
to remove an adjustment from the order.
 2015-05-01 15:59:46 +10:00
Rohan Mitchell
e91de69d5a Merge branch 'master' into pin-refunds 2015-05-01 14:58:19 +10:00
Maikel Linke
e6e063670c Allow managers to remove line items from order 
Managers of an order cycle and the distributor of an order are allowed to
remove a line item from the order.
 2015-05-01 14:49:34 +10:00
Maikel Linke
af78859db6 Merge remote-tracking branch 'origin/master' into single-order-patches 2015-04-30 17:18:02 +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
a207f50aeb Merge branch 'master' into delay-devise-emails 
Conflicts:
	script/run_tests.sh
 2015-04-30 12:29:06 +10:00
Rob Harrington
992fb2347d Merging master branch into require_standard_variant 2015-04-29 14:30:49 +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
1268108877 handle ship event on order 2015-04-29 12:03:11 +10:00
Maikel Linke
2b0f867ed8 new order method ready_to_ship? 2015-04-29 11:42:35 +10:00
Lynne Davis
6bbd3f7c13 Added auth for order_cycle_management_report. This report was breaking supplier enterprises reports due to incorrect authorization. 2015-04-26 11:02:06 +01:00
Rob Harrington
7b83438b5e Pulling property values into the shopfront 2015-04-23 13:51:49 +10:00
Maikel Linke
f1a8011e13 Documentation of Variant.full_name 
The code was confusing for all developers here. Maybe a bit of doco
helps.
 2015-04-23 10:02:32 +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
a4a41ae26a Refactor properties_h 2015-04-22 21:02:06 +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
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
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
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
9bbc151cae Admin can set enterprises to charge or not charge sales tax 2015-04-17 13:41:38 +10:00
Rob Harrington
b9f19d5777 Fixing broken specs 2015-04-17 13:00:20 +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
Rohan Mitchell
e9fbd74e88 Send emails via jobs instead of synchronously 2015-04-16 16:54:43 +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
Rob Harrington
0c155e6e3a Display message when email has not been confirmed for new enterprise 2015-04-15 15:32:17 +10:00
Rob Harrington
96c173414b Adding has_permission method to enterprise_relationship 2015-04-10 12:48:27 +10:00
Rob Harrington
7eb735f87e Adding for_enterprises scope on enterprise fee 2015-04-06 10:24:40 +10:00
Rob Harrington
7448d41b27 Adding abilities for new for_order_cycle action 2015-04-06 10:23:39 +10:00
Rob Harrington
3b9824171a Adding with_order_cycles_as_supplier_outer scope to Enterprise 2015-04-02 15:53:32 +11:00
Rob Harrington
ca1a5b5f8d Ignoring any new producer properties submitted by the user 2015-04-02 08:54:35 +11:00
Rob Harrington
94a88278a9 Ignore the unit_to_display when it is wholly contained within display_name or vice versa 2015-04-01 15:46:11 +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