5852 Commits

Author	SHA1	Message	Date
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
Steve Pettitt	667d1c5428	More reliable spec	2016-01-10 16:16:30 +00:00
stveep	81b688f0e8	Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances	2016-01-07 13:26:13 +00: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
stveep	59adf88cad	Feature spec	2015-12-22 22:59:07 +00:00
stveep	48896ab3d8	More serializer specs	2015-12-22 15:09:24 +00:00
stveep	668c6ff74f	Order serializer spec	2015-12-21 23:22:15 +00: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
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	85f61364f8	BillablePeriods use global config to calculate bills	2015-12-16 19:18:57 +11:00
Rob Harrington	5b72f53738	Adding helper for describing monthly billing charges	2015-12-16 19:18:57 +11:00
Rob Harrington	da325780b1	Adding BMC link to configurations menu	2015-12-16 19:18:57 +11:00
Rob Harrington	a40a03905f	Reorganising BMC edit view	2015-12-16 19:18:57 +11:00
Rob Harrington	044e423543	Adding update logic to business model config controller	2015-12-16 19:18:57 +11:00
Rob Harrington	e20b06bb97	Adding basic route and controller for business model configuration	2015-12-16 19:18:56 +11:00
Rob Harrington	cc4f9dd09b	Making lettuceshare report spec more robust	2015-12-16 18:14:19 +11:00
Rob Harrington	18ea0c1717	Pulling VariantOverride scoping down into products and inventory report base	2015-12-16 14:23:43 +11:00
Rob Harrington	2bb85eb8e0	Revert "Add SKU to LettuceShare report" ... This reverts commit 15ea64b409.	2015-12-16 13:42:58 +11:00
Rob Harrington	5d28a7fdf8	Adding SKU to Products and Inventory reports (except lettuceshare)	2015-12-16 13:37:19 +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
Rob Harrington	c91f1301f0	Adding preferences to enterprises for sorting of order cycles in shopfront list	2015-12-16 11:55:23 +11:00
Rob Harrington	e6a51bb49d	Adding actions dropdown to admin order view/pages	2015-12-16 11:55:23 +11:00
Continuous Integration	b7edf5e046	Auto-merge from CI [skip ci]	2015-12-16 10:58:03 +11:00