5852 Commits

Author	SHA1	Message	Date
Rohan Mitchell	4bf8716786	Extract complete_checkout to method	2015-01-07 16:29:15 +11:00
Rohan Mitchell	c0030ddb13	use_short_wait can now take a flexible wait time	2015-01-07 16:28:03 +11:00
Rohan Mitchell	370133b875	Fix minor spec issues	2015-01-07 16:06:23 +11:00
Paul Mackay	67b17de695	#275: Add receival time and instructions to order cycle for incoming exchanges. Fix issues from feedback.	2014-12-30 11:33:13 +00:00
Rohan Mitchell	85882a73ff	Merge branch 'lin-d-hop-266reportsbranch'	2014-12-19 16:51:38 +11:00
Rohan Mitchell	2bad590ef4	Order confirmation and order objects use overridden prices	2014-12-19 16:51:11 +11:00
Rohan Mitchell	c3995ee4d5	Checkout shows overridden prices	2014-12-19 16:51:11 +11:00
Rohan Mitchell	94684e9963	Show overridden price in shopping cart	2014-12-19 16:51:11 +11:00
Rohan Mitchell	1e1a070b2b	Scope Variant#price_in	2014-12-19 16:51:10 +11:00
Rob Harrington	170b14d0f5	Tightening up expectations in shop controller spec	2014-12-19 15:39:13 +11:00
Rob Harrington	a810fc88ac	Dedicated new 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	fcb14f32d2	Validating user input for shopfront taxon order	2014-12-19 14:04:02 +11:00
Rob Harrington	2efd905227	Fixing specs to work with text-angular	2014-12-19 14:04:01 +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	435bc177f8	Hiding side menu elements by filtering rather than by making invisible	2014-12-19 14:04:00 +11:00
Rob Harrington	a489aa7ad9	Fixing enterprise feature spec, adding first shop preference	2014-12-19 14:04:00 +11:00
Rob Harrington	76acd706ea	Adding ability to show and hide menu items	2014-12-19 14:03:59 +11:00
Rob Harrington	f86d4a1996	Pulling headings out of enterprise form partials, displaying each conditionally	2014-12-19 14:03:24 +11:00
Rob Harrington	39ca0ce3dc	WIP: Adding a side_menu to the enterprise form	2014-12-19 13:52:01 +11:00
Rohan Mitchell	72118f4e2e	Fix syntax error, spec for removed column	2014-12-19 10:01:46 +11:00
Rohan Mitchell	e9f04c3c15	Clean up whitespace	2014-12-19 10:01:21 +11:00
Rohan Mitchell	6e0576235d	Use create\! instead of build - more concise, raises exception on error	2014-12-19 09:51:32 +11:00
Rohan Mitchell	27d646c0e8	Tweak indentation, remove some blank lines	2014-12-19 09:51:32 +11:00
Rohan Mitchell	3b58d99abc	Fix spec failure	2014-12-19 09:51:02 +11:00
Rohan Mitchell	4a30f27b3d	Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb spec/models/spree/order_spec.rb	2014-12-19 09:38:02 +11:00
Rohan Mitchell	c4b45bdbbf	Fix line items returning prices with fractional cents	2014-12-18 16:24:59 +11:00
Rohan Mitchell	b0f5d0170c	Spec that overridden price with fees appears in quick cart	2014-12-18 13:32:28 +11:00
Rohan Mitchell	5fcb2982fa	Fees are calculated correctly for items with variant overrides	2014-12-18 11:53:17 +11:00
Rohan Mitchell	1d3800696e	Variant overrides can override stock levels	2014-12-18 10:46:47 +11:00
Rohan Mitchell	f5ee9ba2f3	VariantOverride looks up count_on_hand	2014-12-18 10:21:07 +11:00
Rohan Mitchell	e6eecd3ae2	Replace proxies with modules	2014-12-18 10:20:31 +11:00
Rohan Mitchell	0832a8f63d	Viewing products shows overridden prices	2014-12-17 16:00:25 +11:00
Rohan Mitchell	23c7715929	Cosmetic change	2014-12-17 14:03:54 +11:00
Rohan Mitchell	2ea7bdbec6	Move controller spec to serializer spec	2014-12-17 14:01:59 +11:00
Rohan Mitchell	6c300431d2	Move Product#variants_for to Variant.for_distribution scope	2014-12-17 13:42:30 +11:00
Rohan Mitchell	91c500417b	Swap param order	2014-12-17 08:55:27 +11:00
Lynne Davis	7e49bd634e	Updated the specs with Rohans suggestions	2014-12-12 18:23:43 +00:00
Rob Harrington	66669e66ab	Shaving some seconds from BOM spec by using simple order cycles and splitting specs up into more logical contexts	2014-12-12 15:43:05 +11:00
Rohan Mitchell	0b3dfa7278	Merge branch 'product-reports-without-deleted'	2014-12-12 15:29:03 +11:00
Rohan Mitchell	84b607433c	Creating and then updating the new override updates the same override instead of creating a duplicate	2014-12-12 13:33:14 +11:00
Rohan Mitchell	31823f2dbd	Setting both values to blank deletes override	2014-12-12 13:33:14 +11:00
Rohan Mitchell	d83ff4ef33	Remove short wait, show variant overrides tab in admin	2014-12-12 13:33:14 +11:00
Rohan Mitchell	fb980981fb	Display variant override errors	2014-12-12 13:33:14 +11:00
Rohan Mitchell	0393007ba5	Update variant overrides	2014-12-12 13:33:14 +11:00
Rohan Mitchell	c38686c820	Create new variant overrides	2014-12-12 13:33:14 +11:00
Rohan Mitchell	27444c6589	Extract variant overrides to own controller - permissions	2014-12-12 13:33:14 +11:00
Rohan Mitchell	531b35bbc6	WIP: Extract variant overrides to own controller - route, controller, views	2014-12-12 13:33:14 +11:00
Rohan Mitchell	91434fe12a	Rename override_variants to variant_overrides - JS file names	2014-12-12 13:33:13 +11:00
Rohan Mitchell	a6f116aa09	WIP: Rename override_variants to variant_overrides - JS	2014-12-12 13:33:13 +11:00