725 Commits

Author	SHA1	Message	Date
Maikel Linke	6300f87987	Use have_no_selector in VO spec	2016-03-04 10:23:13 +11:00
Maikel Linke	587d06dced	Merge remote-tracking branch 'origin/master' into groups ... Conflicts: db/schema.rb	2016-03-02 15:31:35 +11:00
Rob Harrington	465649475d	Revoke ability to overide variants based on shared management/ownership (ie. only explicit permissions)	2016-03-02 12:10:49 +11:00
Rob Harrington	aff346071f	Automatically selecting a hub on inventory page when it is the only option	2016-03-02 12:10:49 +11:00
Rob Harrington	3f466e86b6	Renaming 'Override Variant Details' permission to 'Add Products To Inventory' ... Style changes to make enterprise relationships page more useable	2016-03-02 12:10:49 +11:00
Rob Harrington	186d1c1f26	Revoking ability to create variant overrides via OC permission	2016-03-02 12:10:49 +11:00
Rob Harrington	4de0a5c220	Renaming 'Variant Overrides' index page to 'Inventory'	2016-03-02 12:10:22 +11:00
Rob Harrington	28b143da73	WIP: Splitting Variant overrides into views	2016-03-02 12:10:22 +11:00
Rob Harrington	f06d909c23	WIP: Adding infrastructure to show/hide variants + overrides using inventory items	2016-03-02 12:10:22 +11:00
Rob Harrington	caa8818f02	Adding option to 'Inherit From Product' for enterprise_fee tax categories	2016-03-02 11:56:46 +11:00
Rob Harrington	a66582a8fb	WIP: Using directive for EnterpriseFee index select elements, to properly bind data to the model	2016-03-02 11:56:46 +11:00
Maikel Linke	098d313163	Using should syntax in payment method spec	2016-02-24 16:33:31 +11:00
Maikel Linke	a7e3b2d9df	Update enterprise email tests	2016-02-24 16:21:18 +11:00
Rohan Mitchell	977ff7b35d	Fix compatibility issues with new version of select2	2016-02-24 11:26:37 +11:00
Rohan Mitchell	533124fe91	Display receival instructions when editing order cycle	2016-01-29 12:17:20 +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	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	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
Steve Pettitt	5a62098b95	Cleaning up and attempt to add feature spec	2016-01-15 09:07:49 +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	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	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	f49722ba90	Fixing broken BMC specs	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	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	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
Em-AK	81f244025f	Update due_date in feature test ... due_date = invoice_date + 1 month	2015-12-13 18:42:27 +01:00
Maikel Linke	15ea64b409	Add SKU to LettuceShare report	2015-12-11 15:12:27 +11:00
Maikel Linke	6787709693	LettuceShare report: total in unit value column and total blank	2015-12-11 15:12:27 +11:00
Rohan Mitchell	3f8d470d23	When admin associates user with an order, look up last used address	2015-12-11 13:06:59 +11:00
Rohan Mitchell	ae3061df80	All orders specs use JS	2015-12-11 13:06:59 +11:00
Rohan Mitchell	e33ede0ec2	Include order cycle status in new order form	2015-12-11 13:06:58 +11:00
Rohan Mitchell	76d4fbccf9	Use select2 for order cycle selection	2015-12-11 13:06:58 +11:00
Rohan Mitchell	222b390b31	Fix error display	2015-12-11 13:06:57 +11:00
Rohan Mitchell	3419198635	Disable distributors that do not have an order cycle	2015-12-11 13:06:57 +11:00
Rohan Mitchell	1026b81d0c	Do not show order cycle choice until distributor is chosen	2015-12-11 13:06:57 +11:00
Rohan Mitchell	c74463404d	Only show order cycle options that include the chosen distributor	2015-12-11 13:06:57 +11:00
Rohan Mitchell	2081744cf6	Fix spec	2015-12-11 13:06:57 +11:00