15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Cook	3fbd5dc625	Fix 'No Order Cycle' dropdown in Orders & Fulfillment Reports	2013-09-18 09:27:34 +10:00
David Cook	9782dd8264	Get line item cost from order, not current product price which may have changed. Also removed unnecessary total columns.	2013-09-18 09:27:34 +10:00
David Cook	e57ad81934	Add 'No Order Cycle' option and cycle dates to dropdown in Orders & Fulfillment Reports	2013-09-18 09:27:34 +10:00
David Cook	5ec3c1831d	Only show order cycles that the user has access to in reports drop-down	2013-09-18 09:26:50 +10:00
David Cook	fe513d42c4	Rename 'Order Cycles' report group to 'Orders & Fulfillment'	2013-09-18 09:25:51 +10:00
Rohan Mitchell	5d0dabc1e8	Switch to eaterprises spree_paypal_express with instrumentation to debug state-blank-from-paypal issue	2013-09-18 09:15:30 +10:00
Rohan Mitchell	2f73161421	Move patch to address class - much simpler	2013-09-18 07:14:21 +10:00
Rohan Mitchell	56590e2f4a	Instrument saving spree addresses with invalid values in an attempt to track down the cause of some invalid records finding their way into the database	2013-09-17 18:06:06 +10:00
Rohan Mitchell	42a6ad6e7c	Inline spree_last_address into the codebase to attempt to fix errors with it appearing only in prod	2013-09-17 13:48:53 +10:00
Rohan Mitchell	8a849b8e47	When selecting hub, auto-select order cycle if there is only one option available	2013-09-17 10:20:14 +10:00
Rohan Mitchell	a929312979	Add scope: OrderCycle.with_distributor	2013-09-17 09:54:21 +10:00
Rohan Mitchell	c2f1f0986b	Fix broken specs	2013-09-16 14:30:46 +10:00
Rohan Mitchell	d1979a70a1	Fix migration - dependency on modified model relations	2013-09-16 14:26:43 +10:00
Rohan Mitchell	b032bc0420	Add commented-out code for debugging specs that are otherwise thwarted by poltergeist's timeout	2013-09-16 14:13:07 +10:00
Rohan Mitchell	f0381f7579	Fix problems with spree_last_address - upgrade gem to a newer version, add a spec around it	2013-09-16 14:11:00 +10:00
Rohan Mitchell	c1a28023ce	Move js file to avoid clobbering spree file	2013-09-16 14:11:00 +10:00
Rohan Mitchell	9410123841	Convert to github-specific notation in gemfile	2013-09-16 14:11:00 +10:00
David Cook	4f9c7fb601	Remove distributor_id from payment method and update tests	2013-09-13 16:58:19 +10:00
David Cook	ee9d9a36d5	Make distributor payment method multi-select	2013-09-13 12:03:37 +10:00
David Cook	107c6978c2	Create many-to-many relationship between payment method and distributor	2013-09-13 10:25:25 +10:00
David Cook	7e96ba909e	Show a list of Order Cycles report types in the description column	2013-09-13 09:59:35 +10:00
Rohan Mitchell	29e1f38207	Set up production distributors for current order cycle	2013-09-12 18:21:44 +10:00
David Cook	af71838610	Fix deface comment	2013-09-12 15:33:17 +10:00
David Cook	a99f23eb01	Add distributor name to admin orders table	2013-09-12 15:16:51 +10:00
David Cook	b7541dcd52	Rename 'Home' link to 'OFN'	2013-09-11 15:13:45 +10:00
Rohan Mitchell	8f768d3b84	Update staging distributors	2013-09-10 15:17:18 +10:00
Rohan Mitchell	b8376a040f	Remove superfluous manual change triggers	2013-09-10 12:57:49 +10:00
Rohan Mitchell	a136161dd6	When showing enterprise, do not show enterprise name when we're in this enterprise - fix duplicate name in header	2013-09-10 12:57:35 +10:00
Rohan Mitchell	583164efb5	Fix variant price calculation	2013-09-10 11:52:13 +10:00
Rohan Mitchell	315876ca9d	Don't display bullets next to variant options	2013-09-10 11:52:04 +10:00
Rohan Mitchell	0e8443e118	Rename 'Change Pick-up Date' to 'Change Collection Date'. Fix this to clear the cart. Do not clear distributor when setting Order.order_cycle to nil.	2013-09-10 11:28:49 +10:00
Rohan Mitchell	d43df754d3	Load correct products on enterprise and product listing pages	2013-09-10 10:36:13 +10:00
Rohan Mitchell	91550ac82f	Move distributor config to its own file, re-enable pry for tests	2013-09-10 09:50:16 +10:00
Rohan Mitchell	64a3a309f5	Change 'pick-up date' to 'available on', provide absolute dates in options	2013-09-10 09:16:23 +10:00
Rohan Mitchell	15d3bff92d	Add delete_content_for helper, can be used for removing the sidebar from spree views	2013-09-10 08:45:59 +10:00
Rohan Mitchell	3ac4bd3b5f	Hide adjustments in cart by default, show by click	2013-09-09 14:37:36 +10:00
Rohan Mitchell	644beeb093	Revert "Fix test fail" ... This reverts commit 1de0f85c73.	2013-09-09 10:55:40 +10:00
Rohan Mitchell	1de0f85c73	Fix test fail	2013-09-09 10:41:28 +10:00
Rohan Mitchell	d32a8b56d0	When order cycle is selected, only show variants that are in it	2013-09-09 10:40:15 +10:00
Rohan Mitchell	57906e6f8b	Fix seed failure due to ShippingMethod factory creating an enterprise, preventing enterprises from being seeded	2013-09-06 16:01:00 +10:00
Rohan Mitchell	33d1948bda	Display log in / sign up links on landing page	2013-09-06 13:44:35 +10:00
alexs333	80bb55496b	Temporarily disabling some tests.	2013-09-05 14:18:40 +10:00
alexs333	4f64679de7	Simplified shop flow.	2013-09-04 20:33:18 +10:00
alexs333	999bc2697a	Implemented simlified shop flow.	2013-09-04 20:33:18 +10:00
David Cook	25b25b7681	New scope Order.not_state to filter out cancelled orders from reports	2013-08-30 17:07:17 +10:00
David Cook	bf3c5c6dd6	Merge branch 'master' into reports-completed-only ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb	2013-08-30 16:42:00 +10:00
David Cook	b0abe566eb	Comments	2013-08-30 16:28:02 +10:00
David Cook	6a303d7db9	Merge branch 'enterprise-reports' ... Conflicts: app/models/spree/ability_decorator.rb	2013-08-30 16:27:13 +10:00
David Cook	61e5ec24e7	Generalise ModelClassFromControllerName	2013-08-30 15:21:30 +10:00
David Cook	80bfc5ce53	Ensure Supplier enterprise users can only view their own products in reports	2013-08-30 15:17:27 +10:00