383 Commits

Author	SHA1	Message	Date
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	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	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
Rohan Mitchell	772d01abf7	Merge branch 'favicon'	2013-06-14 12:22:51 +10:00
Rohan Mitchell	1e94f88c5e	Ensure order decorator is required, fix test fragility	2013-06-07 15:40:03 +10:00
David Cook	0f8cd4705a	Regenerate favicon.ico from higher quality image	2013-05-24 10:14:40 +10:00
David Cook	731cf33f86	Add new favicon.ico file with size 16, 32 and 64	2013-05-22 16:21:13 +10:00
Rob H	055c07a466	Add before_payment method to checkout controller (fixes issues with spree_paypal_express)	2013-02-20 14:04:10 +11:00
Rob H	046eb256ff	Fix issues causing enterprise fee tests to break	2013-02-15 14:10:56 +11:00
Rob H	2cdf458d6a	Move additional of tabs to main nav bar to defaces, rather than overriding view directly	2013-02-14 15:42:47 +11:00
Rob H	9e9199643e	Remove unneeded :partial from override	2013-02-14 15:35:50 +11:00
Rob H	c956706d78	Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test	2013-02-14 15:12:50 +11:00
Rob H	a3746c6c59	Add analytics helper to Enterprises Controller	2013-02-14 12:10:31 +11:00
Rob H	1d4fbe865b	Finished revision of defaces	2013-02-09 00:40:34 +11:00
Rob H	2a07d61e81	Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue	2013-02-07 15:09:25 +11:00
Rob H	99b4530db2	WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name	2013-02-07 13:07:14 +11:00
Rob H	3507c5414d	Changed Sass variable: back to our green colour following upgrade	2013-02-07 09:25:29 +11:00
Rob H	4b254a5529	WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name	2013-02-06 11:25:26 +11:00
Rob H	612017f143	WIP Upgrade to Spree 1.3	2013-02-05 15:01:45 +11:00
Rohan Mitchell	f2f3bbd3ed	Merge branch 'order-cycles-exchange-products' ... Conflicts: Gemfile.lock	2013-01-22 10:40:56 +11:00
Rohan Mitchell	83e3c6815d	Merge branch 'checkout-changes' ... Conflicts: .rvmrc app/helpers/application_helper.rb	2013-01-22 10:30:51 +11:00
Rohan Mitchell	662aaf75bf	When editing an order cycle, distributor collection details are loaded	2013-01-22 09:34:07 +11:00
Rob H	f7890bd94d	Fixes following code review for checkout changes	2013-01-18 19:17:55 +11:00
Rob H	6a45e8be3b	Make tests pass after changes to checkout broke them all	2013-01-18 15:29:36 +11:00
Rohan Mitchell	c75738893e	Display supplier name on products for distribution	2013-01-18 14:35:06 +11:00
Rohan Mitchell	074d5715e7	Only provide distributors as coordinating enterprises. Order by name.	2013-01-18 14:26:56 +11:00
Rohan Mitchell	87d5ffeee2	Add fields for outgoing exchange collection details	2013-01-18 14:24:17 +11:00
Rohan Mitchell	d8a7570a61	Display accurate counts for distributed products	2013-01-18 12:21:35 +11:00
Rohan Mitchell	33b9d45f43	Distributors and products displayed on edit	2013-01-18 11:59:32 +11:00
Rohan Mitchell	0a2ce30bb6	Only show variants for distribution that are supplied to the order cycle	2013-01-18 11:52:01 +11:00
Rohan Mitchell	1a0ef85030	Test distributor exchanges are created with order cycles	2013-01-18 11:40:36 +11:00
Rohan Mitchell	05c9a189c8	Merge branch 'email-changes'	2013-01-17 16:09:25 +11:00
Rohan Mitchell	43a1cf7779	Merge branch 'product-quantity-fix'	2013-01-17 16:07:55 +11:00
Rohan Mitchell	8f17df0e45	Name exchange elements independently	2013-01-17 11:36:56 +11:00