1134 Commits

Author	SHA1	Message	Date
Rob Harrington	137003c671	Correct calculation of tax on EnterpriseFees with TaxRates where included_in_price=false	2016-03-02 11:56:46 +11:00
Rohan Mitchell	8928e461d4	Refresh cache when option type changed	2016-02-26 09:59:16 +11:00
Rohan Mitchell	b5204a4820	Refresh cache when option value changed or destroyed	2016-02-25 11:08:53 +11:00
Steve Pettitt	b84f49a1c3	Satisfy style police	2016-02-24 20:39:26 +00:00
Rohan Mitchell	62c6530ca9	Do not refresh products cache when price destroyed - variant destruction is main (only?) trigger, it causes refresh	2016-02-24 15:05:03 +11:00
Rohan Mitchell	f78826c9c7	Fix rare case where price is saved without variant	2016-02-24 15:05:03 +11:00
Rohan Mitchell	339f3fc2f0	Refresh products cache when price is changed or destroyed	2016-02-24 15:05:02 +11:00
Rohan Mitchell	d8d803546b	Refresh products cache when master variants or images are changed or destroyed	2016-02-24 15:05:02 +11:00
Rohan Mitchell	6d80d91873	Refresh products cache when taxons or classifications are changed or destroyed	2016-02-24 15:05:02 +11:00
Rohan Mitchell	7c4e9e5838	Refresh products cache when product properties are changed	2016-02-24 15:05:02 +11:00
Rohan Mitchell	f756749e02	Fix specs	2016-02-24 15:05:02 +11:00
Rohan Mitchell	0c0c98a0b0	Refresh products cache on product change	2016-02-24 15:05:01 +11:00
Rohan Mitchell	6d39cc39c6	When a variant is destroyed, update product cache	2016-02-24 15:05:01 +11:00
Rohan Mitchell	eba636c929	When variant is changed/destroyed, trigger product cache refresh	2016-02-24 15:05:01 +11:00
Nicolas Blanc	2be005d344	i18n from berlin hackathon	2016-01-31 12:16:33 +00:00
Steve Pettitt	4438cbd5d0	Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances	2016-01-30 19:53:53 +00:00
Steve Pettitt	5b73b80e81	sorting orders in reverse date order	2016-01-28 23:10:27 +00:00
Maikel	3dd3cfa7ec	Auto-merged master into uk/account-balances on deployment.	2016-01-25 04:43:25 +11:00
Rob Harrington	94785d4157	Fixing authorization for VariantOverridesController#bulk_reset	2016-01-15 09:07:49 +11:00
Rob Harrington	d01da727f0	Removing :bulk_update action from actions allowed on nil object, using collection_actions methods on controller instead	2016-01-15 09:07:49 +11:00
Continuous Integration	e070168c4a	Auto-merge from CI [skip ci]	2016-01-15 03:30:02 +11:00
Rob Harrington	521f227f74	Adding sku and on_demand to VariantOverride	2016-01-13 18:49:33 +11:00
stveep	698d36180d	Move query from injector to User instance method	2016-01-07 13:25:15 +00:00
Rohan Mitchell	257b5a9eef	Move premature Spree::Order#update prevention up a level, for even greater efficiency gains	2016-01-07 12:09:57 +11:00
Rohan Mitchell	e24027a8d0	Speed up add to cart: Update the order once per fee calculation, rather than for every line item x fee	2016-01-07 10:52:36 +11:00
stveep	90e627ad60	Data manipulation and balance calc in rails instead	2015-12-21 17:40:36 +00:00
Emmanuel	5e081ce3ee	Translations of validation messages in app/models	2015-12-21 10:11:08 +01:00
Continuous Integration	23b9dd5c71	Auto-merge from CI [skip ci]	2015-12-17 13:02:37 +11:00
Maikel Linke	bc6110c178	Re-defining in_distributor scope as method to allow chaining	2015-12-17 12:42:28 +11:00
Rob Harrington	ecd11702c3	Fixing up enterprise user account page	2015-12-16 19:18:59 +11:00
Rob Harrington	fe0652e243	When updating a line_item quantity from 0, final_weight_volume is recalculated from the variants unit value	2015-12-16 19:18:59 +11:00
Rob Harrington	ca3c464fda	Reorganising busines model config settings, moving account invoice tax rate in busines model config settings	2015-12-16 19:18:57 +11:00
Rob Harrington	58031408f1	Adding basic business model configuration variables to app config	2015-12-16 19:18:56 +11:00
Rob Harrington	befc558224	Pulling product_and_variant_name down into VariantAndLineItemNaming, renaming to product_and_full_name ... Also allowing this method to be used in reports (Xero), to reflect appropriate name for weight/volume adjusted line items	2015-12-16 11:55:24 +11:00
Continuous Integration	b7edf5e046	Auto-merge from CI [skip ci]	2015-12-16 10:58:03 +11:00
Maikel Linke	1d46c2febd	LettuceShare report: display only if count_on_hand > 0 ... Use the inventory of a distributor if selected.	2015-12-11 15:12:27 +11:00
Maikel Linke	cd7721a127	Using date and time of current timezone ... Using Time.zone.now and Date.current instead of Time.now and Date.today. This should make all specs timezone independent.	2015-12-10 11:38:41 +11:00
Rohan Mitchell	10edb2b056	Fix delayed job startup - prevent error caused by double load	2015-12-02 10:48:50 +11:00
Rob H	baeacfb8a9	LineItem inherits display_name from variant ... Allows line_items to be named correctly.	2015-11-29 17:25:28 +11:00
Rob Harrington	a5a886c51f	Only test for coordination when orders actually have order_cycles	2015-11-25 15:27:27 +11:00
Rob Harrington	7e6b43266f	Making sure that price and final_weight_volume can be updated (by distributor or coordinator)	2015-11-25 14:23:55 +11:00
Rob Harrington	4bdc1bc418	LineItem final_weight_volume is updated whenever quantity is changed, though can be set directly	2015-11-18 16:22:36 +11:00
Rob Harrington	75846a4d1f	Merge branch 'master' into line_item_naming	2015-11-16 10:38:42 +11:00
Rohan Mitchell	a86cc96452	Use pluck instead of map	2015-11-13 14:03:07 +11:00
Rohan Mitchell	178e5f59e6	Update cart by applying differences rather than clear-and-readd every time	2015-11-13 14:03:07 +11:00
Rohan Mitchell	7fffa03d8d	Fix bug: set difference comparison of string with number	2015-11-13 14:03:07 +11:00
Rohan Mitchell	d3c7c46800	Add method to remove a variant from an order	2015-11-13 14:03:07 +11:00
Rohan Mitchell	c432ed9e08	Build list of variants removed from the cart when overwriting	2015-11-13 14:03:07 +11:00
Rohan Mitchell	e175149e76	Add method to check whether a passed-in cart value varies from the cart	2015-11-13 14:03:07 +11:00
Rohan Mitchell	1b5901317d	Separate concerns: reading products hash and adding items to cart	2015-11-13 14:03:07 +11:00