2767 Commits

Author	SHA1	Message	Date
Rohan Mitchell	48b02db70d	Order cycles are undated unless they have both open and close dates defined	2016-02-05 09:27:25 +11:00
Rohan Mitchell	533124fe91	Display receival instructions when editing order cycle	2016-01-29 12:17:20 +11:00
Maikel	eeb31f65c3	Auto-merged master into combined/cart-fit-to-screen_preserve-max-quantity on deployment.	2016-01-15 16:15:09 +11:00
Rob Harrington	9979e31220	Final tidy up after rebasing default_inventory and ng-vo onto origin/master ... Fixes a few VO feature specs and a few interface tweaks	2016-01-15 09:07:51 +11:00
Rob Harrington	669642292b	Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub	2016-01-15 09:07:51 +11:00
Rob Harrington	4103ed0ba7	Combining variant override controller specs	2016-01-15 09:07:51 +11:00
Rob Harrington	0bbae19b41	Variant Overrides Index: User can manually reset inheritance	2016-01-15 09:07:51 +11:00
Rob Harrington	607a66b6c6	WIP: Fixing a few broken VO specs	2016-01-15 09:07:50 +11:00
Steve Pettitt	a3f7ff19b0	Add new VO fields to shopping spec	2016-01-15 09:07:50 +11:00
Steve Pettitt	e423e890e0	Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly	2016-01-15 09:07:50 +11:00
Steve Pettitt	25454d3e97	Added new fields to fix VO deletion feature specs	2016-01-15 09:07:49 +11:00
Steve Pettitt	75127f2a63	Fix feature specs for VO reset	2016-01-15 09:07:49 +11:00
Rob Harrington	94785d4157	Fixing authorization for VariantOverridesController#bulk_reset	2016-01-15 09:07:49 +11:00
Steve Pettitt	5a62098b95	Cleaning up and attempt to add feature spec	2016-01-15 09:07:49 +11:00
Steve Pettitt	0ee078e232	Added toggle to enable/disable reset stock. Updated specs	2016-01-15 09:07:48 +11:00
Steve Pettitt	2921958788	Variant override controller spec added	2016-01-15 09:07:48 +11:00
Steve Pettitt	34c603a9c3	Added angular service tests for variant overrides stock reset	2016-01-15 09:07:48 +11:00
Rob Harrington	53d97dab08	WIP: Adding view and routes for resetting variant_overrides count_on_hand	2016-01-15 09:07:48 +11:00
Rob Harrington	3b7700131c	Specify controller specs as such	2016-01-15 09:07:47 +11:00
Rob Harrington	cc4dc068ab	Adding variant SKU field to BPE	2016-01-13 18:49:34 +11:00
Rob Harrington	64cd52e067	Adding SKU and on demand to a few VO specs	2016-01-13 18:49:34 +11:00
Rob Harrington	521f227f74	Adding sku and on_demand to VariantOverride	2016-01-13 18:49:33 +11:00
Rob Harrington	9eaec6061e	Pulling columns dropdown out into a shared partial	2016-01-13 18:49:32 +11:00
Rob Harrington	54e7677888	Integrating StatusMessages into save-bar, adding to variant overrides index	2016-01-13 18:49:32 +11:00
Rob Harrington	c781113a65	Adding filters to variant overrides interface	2016-01-13 18:49:32 +11:00
Rob Harrington	4237a83028	Moving components required for variant overrides into appropriate modules	2016-01-13 18:49:32 +11:00
Maikel	68e2b9a0b9	Auto-merged master into preserve-max-quantity on deployment.	2016-01-13 16:57:31 +11:00
Maikel Linke	00af6ef9de	cleanup knapsack integration	2016-01-13 15:05:48 +11:00
Maikel Linke	749061d60a	knapsack report generation	2016-01-13 15:05:48 +11:00
Rohan Mitchell	037c524df2	Preserve max quantity when reloading shopfront	2016-01-07 16:35:54 +11:00
Rohan Mitchell	71569324f4	Serialise cart updates - do not submit another until the previous has completed	2016-01-07 13:53:37 +11: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
Rohan Mitchell	a27e593924	Fix deprecation notices	2016-01-07 10:51:39 +11:00
Rob Harrington	e67e22ee73	Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security ... Conflicts: lib/open_food_network/xero_invoices_report.rb	2015-12-17 14:22:16 +11:00
Rob Harrington	7a23f671a2	Restricting access to orders within Sales Tax Report ... Managers of suppliers should not be able to generate sales tax reports for orders they only supply products for	2015-12-17 14:21:30 +11:00
Rob Harrington	d115eb816e	Restricting access to orders within Xero Invoices Report ... Managers of suppliers should not be able to generate xero invoices for orders they supply products for	2015-12-17 14:21:30 +11:00
Rob Harrington	4b5e33d5b0	Implementing new permissions for producers in reports_controller_spec	2015-12-17 14:21:30 +11:00
Rob Harrington	2f2ebf419c	Fixing customer info security for packing reports	2015-12-17 14:21:30 +11:00
Rob Harrington	2f13ab6adf	Fixing customer info security for orders and fulfillments report	2015-12-17 14:21:29 +11:00
Rob Harrington	b121984e76	Fixing customer info security for bulk coop report	2015-12-17 14:21:29 +11:00
Rob Harrington	72f7e545dc	Making sure bill > 0 for finalize account invoice spec	2015-12-17 12:04:24 +11:00
Rob Harrington	555f639026	Fixing unstable update_account_invoice specs ... Rounding first then summing != summing first then rounding	2015-12-17 09:16:19 +11:00
Rob Harrington	26a2f1a280	Adjustments on account invoices are created based on presence of a bill ... Rather than of turnover	2015-12-16 23:10:47 +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	f49722ba90	Fixing broken BMC specs	2015-12-16 19:18:58 +11:00
Rob Harrington	0370723edd	Attempt to add a sensible name and contact number to Account Invoice addresses	2015-12-16 19:18:58 +11:00
Rob Harrington	d46712de84	Obsolete BillablePeriods only deleted if their associated order is not already complete	2015-12-16 19:18:58 +11:00
Rob Harrington	199a3c38f9	Bill is capped before tax is applied, like we say it is	2015-12-16 19:18:58 +11:00
Rob Harrington	76d4f74f6b	Ammending BillablePeriod spec to be ensure tax is charged correctly	2015-12-16 19:18:58 +11:00