3590 Commits

Author	SHA1	Message	Date
Rohan Mitchell	ed4d78bca8	Decorators can't be in same file name as original file, otherwise the original file is ignored	2015-01-30 11:23:49 +11:00
Rohan Mitchell	a25bf32156	Show extended variant name/unit info for admin variant overrides	2015-01-29 15:15:28 +11:00
Rohan Mitchell	7a5c56cbca	Do not show out of stock lines on order confirmation page	2015-01-29 13:19:04 +11:00
Rob Harrington	fd9f65f1b6	Merge branch 'shopfront-filters' into shop-url	2015-01-28 10:57:11 +11:00
Rob Harrington	713999c1d8	Merge branch 'master' into shop-url	2015-01-28 10:53:42 +11:00
Rob Harrington	adbe127e76	Revert "Update bindonce" ... This reverts commit 48dc85cfc2.	2015-01-25 14:08:29 +11:00
Lynne Davis	3c4ad4121f	LD adding whitespace to get my master version back in line with origin	2015-01-22 14:00:48 +00:00
Lynne Davis	8e8f38e484	app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-22 12:01:20 +00:00
Rob Harrington	b429be707c	Split out payment and shipping methods from admin enterprises controller as services	2015-01-22 12:19:41 +11:00
Rob Harrington	d12fdd23fb	Fixing navcheck callback	2015-01-22 10:46:01 +11:00
Rob Harrington	0791cc3c2a	Making sure that we have a .path() in HashNavigation	2015-01-22 10:19:47 +11:00
Rob Harrington	76acbb6159	Empty arrays are no longer considered falsy by angular.js parser (see bdfc9c02d0)	2015-01-22 10:19:47 +11:00
Rob Harrington	d7ea81e821	Prevent default form action from submitting ordercycle forms	2015-01-22 10:19:47 +11:00
Rob Harrington	9245af6a8f	Producer properties routes use enterprise permalink	2015-01-22 10:19:47 +11:00
Rob Harrington	36430d3bad	Enterprise permalink generator handles blank permalink case	2015-01-22 10:19:46 +11:00
Rob Harrington	6991e5e6b1	Finally got all callbacks available to all action that need them	2015-01-22 10:19:46 +11:00
Rob Harrington	4d26b3d648	Make unused cart_controller happy	2015-01-22 10:19:45 +11:00
Rob Harrington	177181cd75	CurrentUser always returns a factory	2015-01-22 10:19:45 +11:00
Rob Harrington	4baa205cf9	before_filters for enterprise controller are run in the correct order, and put inside the shop action	2015-01-22 10:19:45 +11:00
Rob Harrington	60313f7a6a	Replace delete with parameterize	2015-01-22 10:19:45 +11:00
Rob Harrington	3e5ea3fe63	Adding automatic permalink generation on enterprise creation	2015-01-22 10:19:45 +11:00
Rob Harrington	ff624e83eb	Require distributor in enterprise controller, so that everything actually works	2015-01-22 10:19:44 +11:00
Rob Harrington	48dc85cfc2	Update bindonce	2015-01-22 10:19:44 +11:00
Rob Harrington	a0990c107f	Moving navigation check to controller	2015-01-22 10:19:44 +11:00
Rob Harrington	83726eba63	Refactoring permalink checker to handle multiple requests elegantly	2015-01-22 10:19:43 +11:00
Rob Harrington	7ad9fdf0be	Cleaning permalink before checking	2015-01-22 10:19:43 +11:00
Rob Harrington	6b10a4a775	Restoring enterprise permalinks when they cause errors	2015-01-22 10:19:43 +11:00
Rob Harrington	4088bdc236	Clean up permalink checker	2015-01-22 10:19:43 +11:00
Rob Harrington	9b78963d5a	Adding a javascript interface for checking permalinks and user input on enterprise console	2015-01-22 10:19:43 +11:00
Rob Harrington	3ec3441cfa	Replacing all uses of the old enterprise shop url helper	2015-01-22 10:19:43 +11:00
Rob Harrington	39889390ef	Altering shop page routing so that shop url is copy-and-pastable	2015-01-22 10:19:42 +11:00
Rob Harrington	c3659612ed	enterprise routes use permalink	2015-01-22 10:19:42 +11:00
Rob Harrington	9286c82b43	Removing obsolete methods	2015-01-22 10:19:42 +11:00
Rob Harrington	c330e49a7f	Moving permalink check action to enterprise controller	2015-01-22 10:19:42 +11:00
Rob Harrington	e2268e53bb	Adding action to check uniquness of enterprise permalink against existing routes	2015-01-22 10:19:41 +11:00
Rob Harrington	9f0aeb5adf	Adding unique permalink to enterprises	2015-01-22 10:19:41 +11:00
summerscope	1753432f36	Adding new loading animation to replace ugly and large gif	2015-01-16 17:06:40 +11:00
Rob Harrington	1d80bee595	Cart item total reflects total number of items in the cart	2015-01-16 16:06:51 +11:00
summerscope	d04e843315	kill unused line	2015-01-16 16:01:17 +11:00
summerscope	c0eb902eef	Turn off text shadow for buttons on popover for top nav	2015-01-16 16:00:18 +11:00
Rob Harrington	2c307f09c3	Changing edit cart button to link	2015-01-16 15:47:56 +11:00
summerscope	23fc428d95	Move spinner icon to left of text	2015-01-16 14:57:30 +11:00
summerscope	3bd77c74a5	Improve logic on shopping cart button to add meaningful labels for various states	2015-01-16 14:57:09 +11:00
summerscope	8334ff736b	Styling for shopping cart buttons and spinner	2015-01-16 13:27:34 +11:00
summerscope	51687b5c2c	Tweak language and styling for the CTA buttons taking users to shopping cart and checkout pages	2015-01-16 13:27:16 +11:00
summerscope	21108b34b6	Add new animation for spinning	2015-01-16 13:26:40 +11:00
summerscope	2a21889216	Remove border on product thumbnail to clean up UI	2015-01-16 13:06:30 +11:00
summerscope	b451b94fd1	Improving styling on large thumbnail view of product images	2015-01-16 13:06:02 +11:00
summerscope	d2d3a577ea	Merging master into this branch to make it easy to pull for staging push	2015-01-15 17:38:35 +11:00
Rob Harrington	b3e67fa164	Take two on disabled logic	2015-01-15 17:34:04 +11:00