508 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	3dd4e074fc	Split spree variable changes into per-feature files, add an eaterprises feature for default layout	2013-04-22 16:12:50 +10:00
Rohan Mitchell	a90f060b28	Add local organics logo	2013-04-22 10:49:37 +10:00
Rohan Mitchell	3bd766eab9	Update local organics feature readme	2013-04-22 10:32:23 +10:00
Rohan Mitchell	3d8d8ecd49	Move assets deface to correct directory	2013-04-22 10:32:09 +10:00
Rohan Mitchell	a4bdea4d5c	Add chili feature for local organics	2013-04-22 10:29:05 +10:00
Rohan Mitchell	cbef31f619	Install chili for feature toggles	2013-04-22 10:24:17 +10:00
Rohan Mitchell	dc54be992b	Require spree support file that provides a default shipping method for ProductDistributions when building from factory - fixes product seeds	2013-04-21 08:54:32 +10:00
Rohan Mitchell	8f682a6d07	Unicorn handle forked db connections - fixes PG::Error SSL SYSCALL error: EOF detected	2013-04-19 09:52:16 +10:00
Rohan Mitchell	c5e8ac6fd1	Newrelic unicorn compatibility	2013-04-19 09:39:54 +10:00
Rohan Mitchell	3e2d31d432	spree-last-address repo deleted - use mirror ... Conflicts: Gemfile Gemfile.lock	2013-04-19 09:27:40 +10:00
Rohan Mitchell	4ce7525748	Configure newrelic for performance monitoring	2013-04-19 09:20:59 +10:00
Rohan Mitchell	7cc1c97c53	Upgrade spree to 1.1.6beta	2013-02-12 09:18:50 +11:00
Rohan Mitchell	ccfe6bc0b3	Update bugsnag	2013-02-12 09:11:38 +11:00
Andrew Spinks	5e2fbcb874	Add script to sanitize order and user data.	2013-02-10 16:54:39 +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