15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andrew Spinks	5e2fbcb874	Add script to sanitize order and user data.	2013-02-10 16:54:39 +11:00
Rob H	1d4fbe865b	Finished revision of defaces	2013-02-09 00:40:34 +11:00
Rob H	c517469662	Added down method to remove_display_on_from_payment_methods migration	2013-02-07 22:54:07 +11:00
Rob H	1ead1dadaf	Upgrade database to Spree 1.3	2013-02-07 15:58:15 +11:00
Rob H	109d5cfe67	Upgrade database to Spree 1.2	2013-02-07 15:34:00 +11:00
Rob H	62d6745f02	Rollback all Spree 1.3 migrations (forgot db/schema.rb)	2013-02-07 15:24:59 +11:00
Rob H	bdea85d1b4	Rollback all Spree 1.3 migrations	2013-02-07 15:24:17 +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
Rob H	e559870189	Merge remote-tracking branch 'origin/master'	2013-02-01 13:15:25 +11:00
Rohan Mitchell	5b22cce950	Remove sleeps from specs	2013-01-22 12:12:29 +11:00
Rohan Mitchell	fec81b7ed4	Fix failing specs after merge	2013-01-22 11:34:43 +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	3f71655bd1	Test updating collection details	2013-01-22 09:44:19 +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	9a03a58d9e	Change exchange pickup time from datetime to string	2013-01-18 14:23:58 +11:00
Rohan Mitchell	ae93d02c9c	OrderCycleFormApplicator applies outgoing exchange collection details	2013-01-18 14:23:42 +11:00
Rohan Mitchell	d8a7570a61	Display accurate counts for distributed products	2013-01-18 12:21:35 +11:00
Rohan Mitchell	a293ea54f9	Update saves distributors and distributed products	2013-01-18 12:13:13 +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	983ba92dea	OrderCycleFormApplicator deals with outgoing exchanges	2013-01-18 11:22:42 +11:00
Rohan Mitchell	487247f6e7	Upgrade selenium-webdriver, fixes testing in new firefox	2013-01-18 09:35:29 +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	12dad2468d	Reorder specs	2013-01-17 15:13:41 +11:00
Rohan Mitchell	8f17df0e45	Name exchange elements independently	2013-01-17 11:36:56 +11:00
Rohan Mitchell	8e9845be12	Functionalise	2013-01-17 11:03:15 +11:00
Rohan Mitchell	3991199c30	Only show products for distribution that have been supplied to the order cycle	2013-01-17 10:49:59 +11:00
Rohan Mitchell	8f05c69696	Display all supplied products for distribution	2013-01-15 12:31:57 +11:00
Rohan Mitchell	f3f0f37716	Return to indexing for exchanges - this way new entries without an id get an index	2013-01-15 12:21:57 +11:00
Rohan Mitchell	850d65958b	Build Enterprise.supplied_products, an array of all products supplied by any enterprise	2013-01-15 12:21:13 +11:00
Rohan Mitchell	488fc2d60e	Upgrade capybara, spec/requests changed to spec/features	2013-01-15 10:10:24 +11:00
Rohan Mitchell	a10eb0d0c7	List and add distributor exchanges	2013-01-11 15:53:51 +11:00
Rohan Mitchell	9e59dead07	Tidy up coffee	2013-01-11 15:52:45 +11:00
Rohan Mitchell	d3fca565a3	Fix file naming and controller definition/testing	2013-01-11 14:09:56 +11:00
Rohan Mitchell	f971958042	Port order cycles js to coffeescript	2013-01-11 13:39:26 +11:00
Rohan Mitchell	3e06220b7f	WIP: Rename order_cycle to coffee	2013-01-11 10:57:02 +11:00
Rohan Mitchell	3694321f66	Use angular's extend instead of jquery's	2013-01-11 10:54:53 +11:00
Rohan Mitchell	24a48a9b33	Move enterpriseTotalVariants to Enterprise service	2013-01-11 10:50:03 +11:00