1584 Commits

Author	SHA1	Message	Date
Rohan Mitchell	a25bf32156	Show extended variant name/unit info for admin variant overrides	2015-01-29 15:15:28 +11:00
Rob Harrington	fd9f65f1b6	Merge branch 'shopfront-filters' into shop-url	2015-01-28 10:57:11 +11:00
Rob Harrington	adbe127e76	Revert "Update bindonce" ... This reverts commit 48dc85cfc2.	2015-01-25 14:08:29 +11: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	d7ea81e821	Prevent default form action from submitting ordercycle forms	2015-01-22 10:19:47 +11:00
Rob Harrington	177181cd75	CurrentUser always returns a factory	2015-01-22 10:19:45 +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	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
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
summerscope	23fc428d95	Move spinner icon to left of text	2015-01-16 14:57:30 +11:00
summerscope	8334ff736b	Styling for shopping cart buttons and spinner	2015-01-16 13:27:34 +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
Rob Harrington	b3e67fa164	Take two on disabled logic	2015-01-15 17:34:04 +11:00
Rob Harrington	ac34da4f24	Altering logic around disabled state for 'Your Shopping Cart' button	2015-01-15 17:19:48 +11:00
summerscope	cdd6c2daf2	Styling product summary row to allow for hiding product thumb at a larger break point	2015-01-15 16:46:55 +11:00
summerscope	4a881a5aa5	Turn off product thumb at a larger break point	2015-01-15 16:46:18 +11:00
summerscope	d5d218c450	Make taxon flag smaller for smallest device breakpoint	2015-01-15 16:45:54 +11:00
summerscope	f8622be21d	Adding in new color variable	2015-01-15 16:45:29 +11:00
summerscope	9db1c4c708	Adding in new color variable	2015-01-15 16:15:23 +11:00
summerscope	47a8731b8e	Styling for price column to distinguish between product added vs null	2015-01-15 16:01:49 +11:00
summerscope	932604bd69	Add in logic to style price column differently if nul vs has value	2015-01-15 16:01:00 +11:00
summerscope	4d7871a0bb	New grey color variable	2015-01-15 16:00:21 +11:00
summerscope	51c8891fac	Add animation to product title hover	2015-01-15 15:24:01 +11:00
summerscope	9b258e075b	Add styling and animation to img thumbnail	2015-01-15 15:23:36 +11:00
summerscope	b5879d51ac	Merging master into shopfront-filters branch	2015-01-15 14:15:25 +11:00
Rohan Mitchell	dcc04ea538	On enterprise edit page, do not show side menu links we don't have permission to	2015-01-15 13:43:39 +11:00
Rohan Mitchell	83754a01ef	Make side menu item visibility declarative	2015-01-15 13:43:39 +11:00
Rohan Mitchell	a93a824b83	Admin can grant permission for an enterprise to edit the profile of another	2015-01-15 13:43:38 +11:00
Rohan Mitchell	2170c7ede1	Fix broken JS spec	2015-01-15 13:43:38 +11:00
Rohan Mitchell	0431e0048c	Merge branch 'master' into variant-overrides-frontend ... Conflicts: app/controllers/shop_controller.rb app/views/shop/products/_form.html.haml spec/controllers/shop_controller_spec.rb	2015-01-12 16:48:51 +11:00
summerscope	6863dd75ef	Restyling button for price breakdown to make it more clear that users press again to close the pop over	2014-12-19 17:05:13 +11:00
Rob Harrington	6f95fa8546	Merge remote-tracking branch 'origin/shopfront-filters'	2014-12-19 15:40:01 +11:00
summerscope	d50f8dcd01	Tweak styling shopfront page to allow for new icons and hover state	2014-12-19 14:53:46 +11:00
Rob Harrington	a810fc88ac	Dedicated new enterprise form	2014-12-19 14:05:24 +11:00
Rob Harrington	24cf3dee74	Hiding Shop Preferences in enterprise form	2014-12-19 14:05:24 +11:00
Rob Harrington	21e4f40616	Implementing primary taxon ordering on the shopfront	2014-12-19 14:05:23 +11:00
Rob Harrington	f145a7ed65	Moving taxons into its own module, adding preferred shopfront taxon order to enterprise	2014-12-19 14:04:02 +11:00
Rob Harrington	a38e27e504	Adapting taxon autocompleter to allow multiple selection of taxons	2014-12-19 14:04:02 +11:00
Rob Harrington	b18163bfaf	Remove separate long description injection, use full enterprise serializer instead	2014-12-19 14:04:01 +11:00
Rob Harrington	5a24f2c0e2	WIP: adding shopfront message to shop	2014-12-19 14:04:00 +11:00