34725 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	eafdf85c28	Extract class methods to new class VariantUnitManager	2014-07-18 12:39:11 +10:00
Will Marshall	a2da7f7ede	Merge branch 'caching' into new_cart ... Conflicts: app/serializers/api/variant_serializer.rb	2014-07-18 11:23:25 +10:00
Will Marshall	562f8dbd4e	Starting to restructure data injection	2014-07-18 11:21:51 +10:00
Rohan Mitchell	6c59ffc16f	Switch to class case for OptionValueNamer	2014-07-18 10:06:13 +10:00
summerscope	957c8cf89b	Markup changes to all the partials for new shopfront page design	2014-07-17 17:24:54 +10:00
summerscope	7cb0e079ab	Lots of changes for new shopfront design	2014-07-17 17:24:31 +10:00
summerscope	730373d677	Making all the images optimised - as wee as can be!	2014-07-17 17:24:14 +10:00
summerscope	1c3da6c003	Adding pretty design assets for new shopfront page	2014-07-17 17:23:45 +10:00
Rohan Mitchell	91e4f24fde	Extract JS unit options into option value namer	2014-07-17 16:57:23 +10:00
Rohan Mitchell	989a14fa37	Change KL to kL, update specs for ML to kL change	2014-07-17 16:16:08 +10:00
Will Marshall	33611ddb20	Renaming Product to Products and starting to figure out cart	2014-07-17 15:04:39 +10:00
Will Marshall	67922f38df	Fixing some regressions to data submission	2014-07-17 14:46:46 +10:00
Rohan Mitchell	08409dad0a	Fix down migration - need explicit cast for string -> integer	2014-07-17 14:43:34 +10:00
Rafael Schouten	98d824f09b	use string for postcode	2014-07-17 14:31:51 +10:00
Will Marshall	541fe9ec37	Switching Checkout service to use CurrentOrder	2014-07-17 14:26:54 +10:00
Rohan Mitchell	b326ec8a3c	Remove landing page images	2014-07-17 14:26:46 +10:00
Rohan Mitchell	19118da82e	Remove old landing page cruft	2014-07-17 14:26:07 +10:00
Rohan Mitchell	159d0a9dbe	Remove most references to suburbs - previously used by new_landing_page, no longer used.	2014-07-17 14:26:04 +10:00
Will Marshall	158bdd145f	All the new serializers and some specs	2014-07-17 14:23:09 +10:00
Will Marshall	547d9f9f5c	Moving payment methods and shipping methods into their own services	2014-07-17 14:19:39 +10:00
Rohan Mitchell	736ae3c1e3	mirror_db script also disables S3 in development and pulls down images	2014-07-17 12:56:27 +10:00
Rohan Mitchell	d7a5eb47f3	Store all images in a consistent path, compatible with development, and support S3 all round	2014-07-17 11:07:34 +10:00
Rohan Mitchell	c40c586b6f	Store taxon icons in a path consistent with products	2014-07-17 10:23:07 +10:00
Will Marshall	2b1ab53d8e	Fixing regressions and refactoring our tests	2014-07-16 16:00:44 +10:00
Will Marshall	cd033c300e	Reworking order populator and controller to handle replacement of line items rather than addition	2014-07-16 16:00:28 +10:00
Will Marshall	f4c1cd5253	Merge branch 'master' into caching	2014-07-16 11:47:07 +10:00
Rohan Mitchell	b33a077fd0	Remove bugsnag config - this is added in deployment on a server-by-server basis	2014-07-16 11:45:44 +10:00
Rohan Mitchell	9542b7224c	Ignore rake generated CSV files	2014-07-16 11:26:37 +10:00
Rohan Mitchell	75a59eb5cc	Rename JS file so that it is loaded after the spree code it is overriding. Admin can't add products outside distribution to an order.	2014-07-16 11:26:22 +10:00
Will Marshall	ea357b54ab	Adding some map searching capabilities	2014-07-16 11:19:16 +10:00
Rohan Mitchell	6dfd26ac69	order_with_totals_and_distribut{or,ion}	2014-07-16 10:33:23 +10:00
Rohan Mitchell	42b951c972	Variants controller #search filters by distribution	2014-07-16 10:31:12 +10:00
Rohan Mitchell	f18141c9bb	Use controller login helpers	2014-07-16 10:29:58 +10:00
Rohan Mitchell	d81a78b907	Add spec helper method for logging in as admin in controller specs	2014-07-16 10:15:27 +10:00
Rohan Mitchell	b7a08bcb9b	Add Spree::Variant.in_order_cycle	2014-07-16 09:33:59 +10:00
Rohan Mitchell	0ecfee79d4	Add Spree::Variant.in_distributor	2014-07-16 09:33:59 +10:00
Rohan Mitchell	edeb820c64	Send distributor and order cycle id to order add variant autocomplete search	2014-07-16 09:33:59 +10:00
Rohan Mitchell	ff507b4b25	Put db backups in their own bucket on S3, put db2fog cron commands in schedule.rb	2014-07-16 09:33:59 +10:00
Rohan Mitchell	3758a8ae2b	Add rake task to export enterprises to CSV	2014-07-16 09:33:59 +10:00
Rohan Mitchell	7a3f68ea38	Update Rails to 3.2.19	2014-07-16 09:33:59 +10:00
Rafael Schouten	58e6379e43	Merge branch 'master' into fix_units ... Conflicts: app/assets/javascripts/admin/products/units_controller.js.coffee	2014-07-14 15:10:26 +01:00
Will Marshall	9f5f319edb	Further patching regression	2014-07-11 17:55:06 +10:00
Will Marshall	a73bc2405d	Fixing one regression	2014-07-11 17:08:39 +10:00
Will Marshall	353ee20feb	Animations fix	2014-07-11 17:07:54 +10:00
Will Marshall	744f254353	Patching a minor bug	2014-07-11 17:02:43 +10:00
Will Marshall	a31f17cdbd	Merge branch 'laura_and_will'	2014-07-11 16:51:50 +10:00
Will Marshall	5e68d0bab7	Basic final version	2014-07-11 16:51:46 +10:00
Will Marshall	679547058e	Merge branch 'laura_and_will'	2014-07-11 16:40:47 +10:00
Will Marshall	06047a380e	Provisional animations	2014-07-11 16:40:44 +10:00
Will Marshall	e940777ede	Few more animation fixes	2014-07-11 16:33:23 +10:00