1343 Commits

Author	SHA1	Message	Date
Will Marshall	3ec80aaaa3	Styling improvements to the popups for producers	2014-03-12 15:08:59 +11:00
Will Marshall	f73cd3db7d	Adding producer details popups	2014-03-12 15:08:59 +11:00
Rohan Mitchell	f7d8d866eb	Show two linebreaks for end of block level tags, strip whitespace from end of string	2014-03-12 13:52:13 +11:00
Rohan Mitchell	011668c0b6	Display line breaks in order confirmation email distributor info	2014-03-12 13:34:34 +11:00
Rohan Mitchell	a8373b7bef	Fix specs: stale data	2014-03-12 13:34:05 +11:00
Rohan Mitchell	4d8a23346c	Fix bug: Unselecting product variant unit in BPE doesn't save	2014-03-12 12:35:52 +11:00
Rohan Mitchell	356099a49a	When product unit changed, remove option types from master as well as other variants	2014-03-12 12:35:52 +11:00
Rohan Mitchell	93a661ac08	Do not show product unit fields when creating a new product - make this interface less confusing	2014-03-12 12:35:52 +11:00
Rohan Mitchell	0b39db0165	Display Rails env on landing page in dev and staging	2014-03-12 12:35:52 +11:00
Rohan Mitchell	98e9f7d7e1	Add custom noimage image for spree	2014-03-12 12:35:51 +11:00
Rohan Mitchell	68eaa61732	Enterprise user can delete product images	2014-03-12 12:35:51 +11:00
Will Marshall	57eb65f721	Adding an accessor for requires shipping address	2014-03-12 12:07:41 +11:00
Will Marshall	451e76b33f	Tweaking our paypal express plumbing further	2014-03-07 15:27:52 +11:00
Will Marshall	40c986892e	Patching the paypal test	2014-03-07 15:18:26 +11:00
Will Marshall	df435c0a38	Adding Paypal plumbing	2014-03-07 15:10:20 +11:00
Rob H	bed1c171b6	BOM: display product name and unit	2014-03-07 14:46:40 +11:00
Will Marshall	5790392430	Bypassing the stage check on the Paypal callbacks	2014-03-07 14:10:49 +11:00
Rob H	b6bd07abd3	BOM: show name from billing address	2014-03-07 12:56:39 +11:00
Will Marshall	84955d3647	Merging master	2014-03-06 16:53:03 +11:00
Will Marshall	904a25fd18	Improving the test suite, refactoring the form and Checkout controller to use data injection instead of haxxx	2014-03-06 16:48:30 +11:00
Will Marshall	12f39ce511	Patching up some more address bugs	2014-03-06 16:46:56 +11:00
Rob H	641796ed64	BOM: and quick search	2014-03-06 16:32:23 +11:00
Will Marshall	d677116ea3	Overring before_address to conform to our new checkout as necessary	2014-03-06 16:24:08 +11:00
Will Marshall	cc3fb27490	Restoring the old checkout, but NOW our new checkout is broken	2014-03-06 16:16:00 +11:00
Rob H	200e3fef77	Merge branch 'master' into bom	2014-03-06 12:52:36 +11:00
Will Marshall	a40a0499e4	Reducing the number of country and state options	2014-03-06 11:33:38 +11:00
Will Marshall	2301f2372f	Defaulting the quantity fields to nil	2014-03-06 11:04:11 +11:00
Will Marshall	e146bb0dd0	Adding Quick Checkout link	2014-03-06 11:01:25 +11:00
Rob H	0726d591ac	BOM: can filter by order cycle	2014-03-06 10:50:27 +11:00
Will Marshall	56646ca5e3	Getting some form state into the Order	2014-03-06 10:26:51 +11:00
Rohan Mitchell	07caf99488	Enterprise user can delete product properties	2014-03-05 16:52:06 +11:00
Rohan Mitchell	922d817748	Product list view: For product with variants, show product price as min(variant prices)	2014-03-05 16:16:42 +11:00
Will Marshall	7d0fdead7a	Refactoring the way we default shipping_method_id	2014-03-05 15:49:47 +11:00
Will Marshall	3c108d3366	Improving the test suite, refactoring the form and Checkout controller to use data injection instead of haxxx	2014-03-05 15:31:41 +11:00
Rohan Mitchell	b89c84e8bd	BPE: Do not show product price when product has variants	2014-03-05 15:08:54 +11:00
Rohan Mitchell	637ccc113b	Do not show products that have no stock available to the current distribution	2014-03-05 13:54:02 +11:00
Rohan Mitchell	17debd9fad	On product list view, do not show variants that are out of stock	2014-03-05 13:54:02 +11:00
Rohan Mitchell	8234812157	Do not include master when outputting variants for oc/d	2014-03-05 13:54:02 +11:00
Rohan Mitchell	ec6f70c145	On product list view, only show variants that are a member of the current order cycle	2014-03-05 13:54:02 +11:00
Will Marshall	19350eeade	Adding the 'same as billing address' JS	2014-03-05 12:29:49 +11:00
Rob H	1635e7338e	Add ditributors and suppliers to OC show API	2014-03-05 12:17:08 +11:00
Rob H	fc65eefcfd	Add basic order cycle API	2014-03-05 12:00:26 +11:00
Will Marshall	66866f09b5	Adding the require ship address flag to admin UI:	2014-03-05 11:12:23 +11:00
Rob H	9f19e91e90	Merge branch 'master' into bom	2014-03-05 10:15:39 +11:00
Rob H	2a713245a8	BOM: date filter refactor and works with pending changes	2014-03-05 10:14:35 +11:00
Will Marshall	b5019f12b4	Fixing up a couple of bugs introduced to the old step workflow	2014-03-04 15:07:00 +11:00
Will Marshall	1d5addb06e	Patching up our checkout flow so we don't try to create shipments before we have valid shipping addresses	2014-02-28 13:41:02 +11:00
Will Marshall	86a8b926f3	Adding conditions to the autopopulator for shipping address	2014-02-28 11:53:45 +11:00
Will Marshall	3db601f362	Merge branch 'master' into checkout	2014-02-27 16:29:21 +11:00
Will Marshall	d6c71d5416	Fixing a nil bug in the referrer handling on login	2014-02-27 16:24:10 +11:00