5462 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	ee8db23fd9	Pull shipping method service computations out of the serialization loop	2015-05-27 15:44:01 +10:00
Rohan Mitchell	f0e909c92b	Look up the shipping services (pickup, delivery) that different hubs provide	2015-05-27 15:44:01 +10:00
Rohan Mitchell	f940984ca3	Pull earliest closing time computations out of the serialization loop	2015-05-27 15:44:01 +10:00
Rohan Mitchell	769edbe9d5	Find the earliest closing times for each distributor in an active order cycle	2015-05-27 15:44:01 +10:00
Rohan Mitchell	c5f00d87bd	When loading products for shopfront, load all master variants in one go	2015-05-27 15:44:01 +10:00
Rohan Mitchell	99cb09c6f7	When loading products for shopfront, load all variants in one go	2015-05-27 15:44:01 +10:00
Rob Harrington	cd44d43b3e	Adding price to line_item serializer (oops, forgot to include when merging in master)	2015-05-21 17:48:35 +10:00
Rob Harrington	903ed7e507	Merge branch 'master' into variable_weights ... Conflicts: app/assets/javascripts/admin/bulk_order_management.js.coffee app/views/spree/admin/orders/bulk_management.html.haml app/views/spree/api/line_items/bulk_show.v1.rabl spec/features/admin/bulk_order_management_spec.rb	2015-05-21 17:31:33 +10:00
Rob Harrington	79a59e2e81	Add order_with_distributor factory	2015-05-21 13:34:32 +10:00
Rob Harrington	0b28771364	Removing unrequired specs for variant/product 'units_show'	2015-05-20 21:06:20 +10:00
Rob Harrington	1aca4657d9	Oops, switch managed_products to editable_products for Api::ProductsController	2015-05-20 20:59:06 +10:00
Rob Harrington	3431c687b8	Making sure every created by factories has a distributor	2015-05-20 20:54:27 +10:00
Rob Harrington	65a6329132	Products and inventory reports scopes products to visible in permissions	2015-05-20 16:19:08 +10:00
Rob Harrington	8132f07d88	Adding visible products method to permissions	2015-05-20 15:53:10 +10:00
Rob Harrington	01d4cf6ecf	Renaming managed_products permissions method to editable_products	2015-05-20 15:02:36 +10:00
Rob Harrington	05131de1ad	Use full_name on BOM instead of options_text	2015-05-20 14:11:31 +10:00
Rob Harrington	8d73b2f532	involving... order cycle scopes return distinct OCs	2015-05-20 13:47:01 +10:00
Rob Harrington	c56efabfbe	Removing obsolete rabl templates	2015-05-20 11:52:49 +10:00
Rob Harrington	0ad2978926	Removing old managed route from api orders controller and switching BOM over to use new controller action	2015-05-20 11:48:48 +10:00
Rob Harrington	fc55a000b8	Adding managed controller action which uses new order serializer to render json	2015-05-20 11:48:13 +10:00
Rob Harrington	823adf3272	Translating existing order-related rabl templates accross to AMS	2015-05-20 11:45:48 +10:00
Rob Harrington	7f80c02c0e	Adding route for managed route for admin orders	2015-05-20 11:45:05 +10:00
Rob Harrington	312a6299a8	Making where clause unambiguous v0.9	2015-05-15 21:19:16 +10:00
Rohan Mitchell	ef064819f9	Add spec for order_cycle_management report access	2015-05-15 10:41:29 +10:00
Rohan Mitchell	924492ec5b	Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2	2015-05-15 10:37:34 +10:00
Continuous Integration	e3723da65a	Auto-merge from CI [skip ci]	2015-05-14 14:32:07 +10:00
Rohan Mitchell	b4755c37dc	Merge branch 'analytics' into combined/fix-delayed-job-loop-and-analytics	2015-05-14 11:03:27 +10:00
Rob Harrington	a473d0ed11	Checking in db version change	2015-05-13 15:58:03 +10:00
Rohan Mitchell	b86872095a	Add google analytics	2015-05-13 14:52:17 +10:00
Rohan Mitchell	3520127c41	Fix infinite job loop	2015-05-13 11:06:42 +10:00
Lynne	90dd1ea4a2	Merge pull request #1 from openfoodfoundation/variable_weights ... Merging	2015-05-09 19:25:30 +01:00
Lynne Davis	26ee5c49b2	Fixing merge conflicts	2015-05-09 19:14:50 +01:00
Lynne Davis	3179887842	Do not allow line_item.unit_value to be updated if the variant.unit_value is zero	2015-05-09 19:12:24 +01:00
Lynne Davis	4d025ee7a9	Updating the spec based on @Robs suggestions, hoping for his insights. Still doesn't work.	2015-05-09 19:10:55 +01:00
Lynne Davis	521834bd76	Populate the line item unit value, when line_item created and update old data in migration	2015-05-09 19:10:55 +01:00
Lynne Davis	662c7fe368	Removing notes to myself from this file	2015-05-09 19:10:55 +01:00
Lynne Davis	54da7ae241	Adding additional logic for if the line_item unit_value is nil	2015-05-09 19:10:55 +01:00
Lynne Davis	2a991ad130	Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.	2015-05-09 19:10:55 +01:00
Lynne Davis	2f463474fb	Adding specs for variable weight adjustment via builk order management	2015-05-09 19:10:55 +01:00
Lynne Davis	f7ade48e86	Update DB schema to store updatable weight on items sold	2015-05-09 19:10:55 +01:00
Continuous Integration	3d0880857a	Auto-merge from CI [skip ci]	2015-05-08 16:24:39 +10:00
Rohan Mitchell	e8c8d8885c	Merge branch 'master' into single-order-patches	2015-05-08 12:42:56 +10:00
Rohan Mitchell	6fb3fa55a1	Allow extended time for all parts of this spec to fix intermittent fails	2015-05-07 14:23:58 +10:00
Rob Harrington	f3f0766279	Adding a distributor to order cycle to fix broken feature spec	2015-05-07 12:50:57 +10:00
Rob Harrington	0d5ce5ff57	Fixing issues with reports controller spec	2015-05-07 12:50:57 +10:00
Rob Harrington	68b4cb59be	Fixing bulk management specs broken by making order_cycles filter update dates	2015-05-07 12:50:57 +10:00
Rob Harrington	f88fdac710	Adding module - doh!	2015-05-07 12:50:56 +10:00
Rob Harrington	a7019e7e78	Adding permissions method for order report enterprises	2015-05-07 12:50:56 +10:00
Rob Harrington	bd66091d75	Push logic for checking of user super admin status down into private method	2015-05-07 12:50:56 +10:00
Rob Harrington	d8f5669fbb	Renaming granted > related_enterprises_granted	2015-05-07 12:50:56 +10:00