520 Commits

Author	SHA1	Message	Date
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	0ee078e232	Added toggle to enable/disable reset stock. Updated specs	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	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	cab6871de3	Pulling bulk actions dropdown out into partial	2016-01-13 18:49:33 +11:00
Rob Harrington	7cd8f35ac8	Tidying up styling and use of skeleton columns on index pages	2016-01-13 18:49:33 +11:00
Rob Harrington	2b70ddb23c	Adding columns toggle to variant overrides index	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
Rob Harrington	e0da49e4df	Formatting dates for account invoices in rails time zone	2015-12-17 11:34:06 +11:00
Rob Harrington	83e3fb98f7	Only display billable period adjustments where the amount in > 0 ... Rather than where the bill (which is calculated according to current settings) is > 0	2015-12-16 19:18:59 +11:00
Rob Harrington	ecd11702c3	Fixing up enterprise user account page	2015-12-16 19:18:59 +11:00
Rob Harrington	0ed8cf973d	Adding an example bill calculator to business model config edit page ... To allow super admin to see the effects of any changes they make to BMC settings	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	c1d04af5cc	Implementing monthly billing description logic in required pages	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	cb9b61f393	WIP: Adding an edit view for BMC variables	2015-12-16 19:18:56 +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
Continuous Integration	ae945ace9d	Auto-merge from CI [skip ci]	2015-12-11 11:09:54 +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	921210012a	Swap in StatusMessage service for custom message display in order cycles interface	2015-12-10 09:17:25 +11:00
Rohan Mitchell	ccb23cd186	Do not allow re-adding exchange	2015-12-10 09:17:25 +11:00
Rohan Mitchell	d4ee20455e	Remove enterprise options from list when added	2015-12-10 09:17:25 +11:00
Rohan Mitchell	1a4448c6d2	Do not allow adding blank enterprises	2015-12-10 09:17:25 +11:00
Rohan Mitchell	a78d8fa6af	Build exchange form on front-end	2015-12-10 09:17:25 +11:00
Rohan Mitchell	3dcbdad088	Show/hide all products	2015-12-10 09:17:25 +11:00
Rohan Mitchell	7820c31976	Show supplier as secondary in information hierarchy	2015-12-10 09:17:25 +11:00
Rohan Mitchell	2efaedc225	Add .exchange-products container div, fill full row with products	2015-12-10 09:17:25 +11:00
Rohan Mitchell	c5e2ed5aa1	Order outgoing products by name	2015-12-10 09:17:24 +11:00
Rohan Mitchell	8f917817b8	Fix broken styles	2015-12-10 09:17:24 +11:00
Rohan Mitchell	9fef0a9909	When order cycle is updated, display message instead of reloading the page	2015-12-10 09:17:24 +11:00
Rohan Mitchell	29bfac5f54	Order cycle interface may update or update and close	2015-12-10 09:17:24 +11:00
Rohan Mitchell	bd854bf2dd	Remove receival_time from exchange, just use receival_instructions	2015-12-02 15:05:49 +11:00
Rob Harrington	a96cdd5ee7	Merge branch 'master' into line_item_naming ... Conflicts: app/views/admin/order_cycles/edit.html.haml	2015-11-13 09:54:26 +11:00
Rob Harrington	66d1e4297e	WIP: Renaming admin.order_cycles to admin.orderCycles for consistency	2015-11-05 14:40:42 +11:00
Rob Harrington	ae7e744644	WIP: BOM Refactor, adding for_line_items action to enterprises controller	2015-11-04 15:02:29 +11:00
Rohan Mitchell	ecc3bad8c8	Merge branch 'master' into folklabs-producer-emails	2015-10-16 12:38:54 +11:00
Rob Harrington	1c6f3f4877	Translating words on admin accounts page	2015-09-17 22:38:29 +10:00
Rob Harrington	2dcbe2b4f2	Updating the admin account view to show use the new account_invoice model to display data	2015-09-17 22:38:29 +10:00
Rob Harrington	ae30007fed	Redesignating all references to user_invoices as account_invoices	2015-09-17 22:38:28 +10:00
Rob Harrington	01c9560a19	Account page reads from created at date of invoice	2015-09-17 22:38:13 +10:00
Rob Harrington	6cc403cd92	Preventing double creation of invoices by recognising completed invoices within the specifed period	2015-09-17 22:38:13 +10:00