144 Commits

Author	SHA1	Message	Date
Rob H	e8f24dc2dd	BPUR: Add edit link for products and variants	2013-07-23 10:37:50 +10:00
Rob H	dcf6446450	BPUR: can delete variants	2013-07-23 10:37:50 +10:00
Rob H	5db0d839fa	BPUR: can delete products	2013-07-23 10:37:50 +10:00
Rob H	5258cba2a2	BPUR: change to live tracking of dirty properties (variant price update still failing)	2013-07-23 10:37:50 +10:00
Rob H	c80cba7fa5	BPUR: Don't use master variant to update attributes. Changes to product filtering.	2013-07-23 10:37:50 +10:00
Rob H	0ca0abd0b2	Can alter on_hand and price of individual variants	2013-07-23 10:37:50 +10:00
Rob H	f3d778af1a	BPUR: can update master on_hand	2013-07-23 10:37:50 +10:00
Rob H	fbb3657bdc	BPUR: can update master price. Test refactor and added angular ng-decimal directive	2013-07-23 10:37:50 +10:00
Rob H	44ad7584f0	BPUR: can update available_on	2013-07-23 10:37:50 +10:00
Rob H	344a084494	BPUR: can update supplier	2013-07-23 10:37:50 +10:00
Rob H	3c57680303	WIP: bulk product update: basic integration test failing because rails infrastructure does not exist yet	2013-07-23 10:37:50 +10:00
Rob H	731127d55c	WIP: Bulk Product Update Rewrite: initial acceptance testing	2013-07-23 10:37:50 +10:00
Rob H	2cdf458d6a	Move additional of tabs to main nav bar to defaces, rather than overriding view directly	2013-02-14 15:42:47 +11:00
Rob H	2a07d61e81	Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue	2013-02-07 15:09:25 +11:00
Rob H	99b4530db2	WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name	2013-02-07 13:07:14 +11:00
Rob H	612017f143	WIP Upgrade to Spree 1.3	2013-02-05 15:01:45 +11:00
Rohan Mitchell	f2f3bbd3ed	Merge branch 'order-cycles-exchange-products' ... Conflicts: Gemfile.lock	2013-01-22 10:40:56 +11:00
Rohan Mitchell	83e3c6815d	Merge branch 'checkout-changes' ... Conflicts: .rvmrc app/helpers/application_helper.rb	2013-01-22 10:30:51 +11:00
Rob H	f7890bd94d	Fixes following code review for checkout changes	2013-01-18 19:17:55 +11:00
Rob H	6a45e8be3b	Make tests pass after changes to checkout broke them all	2013-01-18 15:29:36 +11:00
Rohan Mitchell	1d357af708	Disable Jirafe and UserVoice outside of production -> test speedup	2013-01-09 09:14:43 +11:00
Rob H	63cf128f86	Remove product descriptions from line item listings in cart and order	2012-12-14 15:08:35 +11:00
Rob H	1f8b4d185b	Rearrange 'Add To Cart' section of product page	2012-12-14 14:01:13 +11:00
Rob H	c7ac0f7d91	Allow distributor to be changed from product page	2012-12-14 11:57:34 +11:00
Rob H	8a37b4e918	Push validation logic for changing distributor down into lib class	2012-12-14 11:02:01 +11:00
Rob H	3a3f427a8d	Reference name of payment method rather than payment method itself	2012-12-07 14:30:05 +11:00
Rob H	b5a95e73dc	Only show alternative distributors on 'address' page of checkout process	2012-12-07 12:29:44 +11:00
Rob H	9cf6124df3	Change checkout explanations from CMS pages to CMS snippets	2012-12-07 12:24:28 +11:00
Rob H	46abc2fc42	Add ability to change distributor based on whether products in the cart are available	2012-12-07 11:56:40 +11:00
Rob H	ef22168349	Move select_distributor and deselect_distributor actions from enterprises controller to orders controller	2012-11-28 10:54:11 +11:00
Rob H	58a79e9b0c	Minor changes to order confirm email	2012-11-23 16:06:25 +11:00
Rob H	ee482d520c	Replace order information display for Confirm and Complete stages of checkout	2012-11-23 10:51:14 +11:00
Rob H	3d025bb709	WIP Replace order information display for Confirm and Complete stages of checkout	2012-11-23 09:26:27 +11:00
Rob H	cbfb896ca4	Change 'Delivery Fees' to 'Distribution Costs' in cart	2012-11-17 11:46:43 +11:00
Rob H	59ca8f4513	Add cms field to cart page to explain delivery fees, located at cms path: /cart-delivery-fees	2012-11-16 18:32:02 +11:00
Rob H	573ba9c8d4	Merge remote-tracking branch 'origin/master' into checkout-changes	2012-11-16 16:10:51 +11:00
Rohan Mitchell	9a9bef5304	Report filtering on completion date, not creation date	2012-11-09 20:31:08 +11:00
Rohan Mitchell	c2133d70ac	Rename Enterprise is_supplier scope to is_primary_producer	2012-11-01 15:02:57 +11:00
Rohan Mitchell	6d84cf7613	Merge branch 'master' into enterprises ... Conflicts: app/controllers/enterprises_controller.rb app/views/spree/checkout/_distributor.html.haml db/schema.rb spec/lib/open_food_web/group_buy_report_spec.rb	2012-11-01 11:02:02 +11:00
Rohan Mitchell	682c09f516	Remove use of old Distributor model, fix before all not cleaning db	2012-11-01 10:05:39 +11:00
Rohan Mitchell	d927906934	Update admin views, tests pass	2012-11-01 08:36:40 +11:00
Rohan Mitchell	7dd42b7feb	Fix use of pickup_address and url fields with enterprises, checkout spec passes	2012-10-31 17:10:21 +11:00
Rohan Mitchell	9d5c127f0d	Add enterprises controller that supercedes suppliers and distributors controllers. Add to cart consumer spec passes.	2012-10-31 16:47:01 +11:00
Rohan Mitchell	5ac904005b	Merge branch 'order-cycle-reports' ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb config/routes.rb	2012-10-31 10:18:11 +11:00
Rohan Mitchell	c5941d6cb5	Update distributor details when distributor is changed	2012-10-27 18:50:09 +11:00
Rohan Mitchell	773adca838	Display distributor details on product page when distributor is selected	2012-10-27 12:49:57 +11:00
Rohan Mitchell	a3042118c7	Merge branch 'group-reports' ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb config/routes.rb	2012-10-26 17:14:49 +11:00
Rob H	01569c2550	Change button text on Payments page to 'Process My Order'	2012-10-26 16:47:42 +11:00
Rob H	d74591afe6	Fixes to reports controller and addition of order cycles reports	2012-10-26 13:44:13 +11:00
Rohan Mitchell	784969097d	Move admin non-Spree controllers out of Spree namespace	2012-10-25 10:45:39 +11:00