8189 Commits

Author	SHA1	Message	Date
Rohan Mitchell	5417242b85	Remove image decorator - image sizes are already configurable from spree config	2014-07-31 12:00:43 +10:00
Will Marshall	86c1d010e7	Default quantity to null rather than zero	2014-07-31 11:49:34 +10:00
Will Marshall	cf3fc7edbf	Merge branch 'master' into laura_and_will ... Conflicts: app/serializers/api/address_serializer.rb	2014-07-31 11:47:54 +10:00
Rohan Mitchell	29b3a080ac	Only show fees if present	2014-07-31 11:43:02 +10:00
Rohan Mitchell	a1dd5dabac	Replace sleep with wait, add cart_dirty spec helper	2014-07-31 11:36:53 +10:00
Rohan Mitchell	126e0a1f6d	Link variants -> products, fixes group buy	2014-07-31 11:36:53 +10:00
Rohan Mitchell	8c41a6c909	Calculate fee breakdown	2014-07-31 11:36:53 +10:00
Rohan Mitchell	45fd479ade	WIP: Call create_order_adjustments_for on EnterpriseFeeCalculator	2014-07-31 11:36:53 +10:00
Rohan Mitchell	8fe355b6da	WIP: Call create_line_item_adjustments_for on EnterpriseFeeCalculator	2014-07-31 11:36:53 +10:00
Rohan Mitchell	b40b6f9faf	WIP: Call fees_for on EnterpriseFeeCalculator	2014-07-31 11:36:53 +10:00
Rohan Mitchell	66cece5903	WIP: Extract order cycle fee calculations to EnterpriseFeeCalculator	2014-07-31 11:36:53 +10:00
Will Marshall	e8045cac42	Renaming to state_name	2014-07-31 11:36:53 +10:00
summerscope	659462327c	Commenting out taxon icon for now	2014-07-31 11:29:14 +10:00
summerscope	46146c83a8	Make the link for product modal just go around the text and not full block	2014-07-31 11:29:02 +10:00
Will Marshall	44bb53b137	Moving to state_name	2014-07-31 11:11:34 +10:00
Will Marshall	001db8d07e	Renaming to state_name	2014-07-30 17:09:31 +10:00
Rohan Mitchell	753ea16093	Merge branch 'breakdowns' into laura_and_will	2014-07-30 15:12:25 +10:00
Rohan Mitchell	9fa0413e8e	Add full price breakdown	2014-07-30 15:11:59 +10:00
Rohan Mitchell	fc95e088df	Show collapsed price breakdown	2014-07-30 14:59:16 +10:00
Rohan Mitchell	77b279ca97	Stub base_price and fees on variant serializer. Calculate basePricePercentage on variant.	2014-07-30 14:34:05 +10:00
Rohan Mitchell	1ac5b79aeb	Fix failing JS specs	2014-07-30 14:33:36 +10:00
Will Marshall	339e5975fa	Merge branch 'master' into breakdowns	2014-07-30 13:45:46 +10:00
Will Marshall	88c3f7f9b3	Removing a couple of pointless files	2014-07-30 13:45:37 +10:00
summerscope	cf1cf085d9	Popover for shopping cart styling required for medium and small views	2014-07-29 17:08:31 +10:00
summerscope	47a38d1815	Tweak the styling on producer modals so no grey background	2014-07-29 16:50:48 +10:00
summerscope	8ed79c6e55	Make scrolling on outer container only	2014-07-29 16:50:26 +10:00
summerscope	62d5149e7a	Add back styling which sort of works for modals until i can pair with will to fix it	2014-07-29 16:15:35 +10:00
summerscope	682b04287e	Make product thumbnail background white by default	2014-07-29 16:03:13 +10:00
Will Marshall	10fcf80be1	Switching back to proper bounds fitting	2014-07-29 15:34:14 +10:00
Will Marshall	606981dee9	Merge branch 'maps'	2014-07-29 15:32:23 +10:00
Will Marshall	6873b33e1f	Directive restored	2014-07-29 15:32:19 +10:00
Will Marshall	90eea5cb16	Switching to a single directive to render variants on /shop	2014-07-29 15:23:10 +10:00
Will Marshall	2ef0545561	Merge branch 'laura_and_will'	2014-07-29 14:09:29 +10:00
Will Marshall	71b898cdec	Tweaking product image logic	2014-07-29 14:09:28 +10:00
Will Marshall	1e207fefd1	Fixing the product modal so it renders either an actual image or nothing	2014-07-29 14:09:28 +10:00
Will Marshall	8496609cc2	Fixing up a couple of regressions	2014-07-29 13:46:38 +10:00
summerscope	e5b675dcaf	Change thumbnail outline color	2014-07-29 13:35:59 +10:00
summerscope	d8fa5a1af9	Make product thumb resized and recoloured	2014-07-29 13:34:19 +10:00
Will Marshall	21cc5bc05a	Tweaking product image logic	2014-07-29 13:05:45 +10:00
Will Marshall	8e5951f80c	Fixing the product modal so it renders either an actual image or nothing	2014-07-29 13:05:44 +10:00
summerscope	b60c9daf21	Modal tweaks to make interior container scroll when too high	2014-07-29 12:57:22 +10:00
Will Marshall	f1c4ca98a1	Defaulting to OFN logo	2014-07-29 12:55:58 +10:00
Will Marshall	118e0f9fd8	Rescoping a couple of partials	2014-07-29 12:51:51 +10:00
Will Marshall	48b8c7e6c1	reverting our change back to position fixed	2014-07-29 12:51:51 +10:00
summerscope	e308b7a3a8	Comment out Price breakdown graph and popover until we can make this work	2014-07-29 12:26:36 +10:00
Will Marshall	2d40a8f023	Fixing links on modals	2014-07-29 12:20:06 +10:00
Will Marshall	c4f7c1af60	Lots of small bug fixes, changing image sizes	2014-07-29 11:33:25 +10:00
Will Marshall	39a79869c0	Disabling buttons and some work on the price breakdowns, including commenting them out for now	2014-07-29 11:33:25 +10:00
summerscope	4ab781d74a	Update and tweak producers page background image	2014-07-29 10:53:34 +10:00
summerscope	004de7919a	Add sexy search into groups page	2014-07-29 10:42:30 +10:00