21845 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob H	108dd6e619	Update Rails to 3.2.13 from 3.2.11	2013-07-23 10:42:07 +10:00
Rob H	19fbbb8374	BPUR: match product supplier on clone	2013-07-23 10:40:42 +10:00
Rob H	c826b18584	Wait for variants and products to be deleted	2013-07-23 10:40:42 +10:00
Rob H	f169dcda88	BPUR: Fix final unstable tests, js concurrency etc.	2013-07-23 10:40:42 +10:00
Rob H	ba840124d2	Install rabl and oj	2013-07-23 10:40:42 +10:00
Rob H	2384c4a43e	Remove naughty pry	2013-07-23 10:37:51 +10:00
Rob H	126f11683d	BPUR: Add datetimepicker to Available On	2013-07-23 10:37:51 +10:00
Rob H	23a56ff4f1	BPUR: toggle visbility of columns	2013-07-23 10:37:51 +10:00
Rob H	f750251cb8	BPUR: Visually differentiate products and variants in table	2013-07-23 10:37:51 +10:00
Rob H	5d30df5717	BPUR: add supplier name to product model to allow searching	2013-07-23 10:37:50 +10:00
Rob H	f9832d1375	BPUR: Remove unnecessary setValidity method in ngDecimal	2013-07-23 10:37:50 +10:00
Rob H	4ae5085192	BPUR: Remove unnecessary collections of products on bulk edit page	2013-07-23 10:37:50 +10:00
Rob H	0ddd9cc6d0	BPUR: use where rather than select for product collection	2013-07-23 10:37:50 +10:00
Rob H	9beb560b72	BPUR: cancel any pre-existing timeouts on message models when new message set	2013-07-23 10:37:50 +10:00
Rob H	b775145b16	BPUR: Add ability to filter by search and toggle variants	2013-07-23 10:37:50 +10:00
Rob H	57f2eff1b0	BPUR: Add warnings before deleting products/variants or directing to edit page	2013-07-23 10:37:50 +10:00
Rob H	ef435dc6da	Typo	2013-07-23 10:37:50 +10:00
Rob H	8453b43c25	BPUR: Allow updating of delegated variant properties	2013-07-23 10:37:50 +10:00
Rob H	1bd4875a6f	BPUR: Can clone products	2013-07-23 10:37:50 +10:00
Rob H	89e684a328	BPUR: add js tests for deleting products and variants	2013-07-23 10:37:50 +10:00
Rob H	e8f24dc2dd	BPUR: Add edit link for products and variants	2013-07-23 10:37:50 +10:00
Rob H	febb9a44a2	Remove commented (unrequired) lines on code	2013-07-23 10:37:50 +10:00
Rob H	c503c1b10c	BPUR: refactor of filterSubmitProducts	2013-07-23 10:37:50 +10:00
Rob H	dcf6446450	BPUR: can delete variants	2013-07-23 10:37:50 +10:00
Rob H	5db0d839fa	BPUR: can delete products	2013-07-23 10:37:50 +10:00
Rob H	8179f45272	BPUR: remove unused product update js and tests	2013-07-23 10:37:50 +10:00
Rob H	5258cba2a2	BPUR: change to live tracking of dirty properties (variant price update still failing)	2013-07-23 10:37:50 +10:00
Rob H	c80cba7fa5	BPUR: Don't use master variant to update attributes. Changes to product filtering.	2013-07-23 10:37:50 +10:00
Rob H	0ca0abd0b2	Can alter on_hand and price of individual variants	2013-07-23 10:37:50 +10:00
Rob H	f3d778af1a	BPUR: can update master on_hand	2013-07-23 10:37:50 +10:00
Rob H	fbb3657bdc	BPUR: can update master price. Test refactor and added angular ng-decimal directive	2013-07-23 10:37:50 +10:00
Rob H	44ad7584f0	BPUR: can update available_on	2013-07-23 10:37:50 +10:00
Rob H	f12c1c00d0	BPUR: rearrange acceptance tests	2013-07-23 10:37:50 +10:00
Rob H	344a084494	BPUR: can update supplier	2013-07-23 10:37:50 +10:00
Rob H	1e64dab9f7	Bulk product update rewrite: basic integration test passing	2013-07-23 10:37:50 +10:00
Rob H	246c6de495	WIP: remove reference to pry	2013-07-23 10:37:50 +10:00
Rob H	6b097eb9f8	WIP: minor fixes to bulk product update js	2013-07-23 10:37:50 +10:00
Rob H	3c57680303	WIP: bulk product update: basic integration test failing because rails infrastructure does not exist yet	2013-07-23 10:37:50 +10:00
Rob H	74291ab1f7	remove leftover debugger; call in code	2013-07-23 10:37:50 +10:00
Rob H	554c67f1a3	WIP: specs and basic js infrastructure for bulk product update	2013-07-23 10:37:50 +10:00
Rob H	731127d55c	WIP: Bulk Product Update Rewrite: initial acceptance testing	2013-07-23 10:37:50 +10:00
alexs	bcac56df0e	Upgraded pry-debugger.	2013-07-23 10:16:48 +10:00
David Cook	2e2dc216fa	WIP: writing order scope test	2013-07-22 17:33:50 +10:00
alexs	15f212713b	Updated rvmrc with rvm auto generated scripts.	2013-07-22 17:33:34 +10:00
David Cook	9f1a7746a4	WIP: start writing order scope test	2013-07-22 17:30:01 +10:00
David Cook	8017d79de4	remove report tests (will test scope not_state instead)	2013-07-22 17:17:18 +10:00
Andrew Spinks	4cdd858f48	Disable order cycles in the front end by default.	2013-07-22 17:16:55 +10:00
Rohan Mitchell	bc913fd355	Reset ActionMailer::Base.deliveries at start of test - http://stackoverflow.com/questions/5843284/clearing-out-activemailerbase-deliveries-after-rspec-test	2013-07-22 16:58:53 +10:00
Rohan Mitchell	f5f5433738	Require pry in test env outside of Travis	2013-07-22 16:56:00 +10:00
Rohan Mitchell	452ccfdb68	Remove debug statement	2013-07-22 16:55:44 +10:00