15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	0b0c8253c1	Provide a hardcoded country code for CI (Jenkins), where countries are not pre-loaded	2013-10-11 14:13:24 +11:00
Rohan Mitchell	ba31e5d9fb	Remove hardcoded ID for Australia	2013-10-11 12:52:49 +11:00
Rohan Mitchell	c5228c9ad2	Fix home controller for oc hit by global before_filter	2013-09-30 17:22:55 +10:00
Rohan Mitchell	30bc45370b	When order cycle expires mid-order, clear the order cycle and display a message	2013-09-30 16:56:11 +10:00
Rohan Mitchell	8353413c4a	Fix spec fail	2013-09-30 15:13:02 +10:00
Rohan Mitchell	935229fa09	On order show / confirmation page, show correct pickup time for order cycle pickup	2013-09-30 14:53:28 +10:00
Rohan Mitchell	57aa10a6f6	Fix specs for time zone change	2013-09-30 11:40:05 +10:00
Rohan Mitchell	54d95d304f	Convert to Melbourne time zone	2013-09-30 11:25:26 +10:00
Rohan Mitchell	f5b56617a0	As an enterprise user, when I create an enterprise, I should have management permission for it	2013-09-30 11:10:20 +10:00
Rohan Mitchell	1d4198d402	Removing a supplier exchange removes variants from distribution	2013-09-30 09:46:39 +10:00
Rohan Mitchell	32204076bd	Update js specs for pagination fix	2013-09-30 09:18:49 +10:00
Rohan Mitchell	208ffb3317	Fix commented-out order cycle specs	2013-09-27 16:02:06 +10:00
Rohan Mitchell	01036ec730	Add LineItem#supplied_by scope, fixes orders and fulfillment report supplier filtering	2013-09-27 14:11:12 +10:00
Rohan Mitchell	dac49d1044	Order cycle-aware pickup time	2013-09-27 11:17:24 +10:00
Rohan Mitchell	68fe20c37a	Add scope: Exchange.with_product	2013-09-23 17:39:16 +10:00
Rohan Mitchell	99e12afd04	Explicitly compile store/shop_front.js, which is used on the temp landing page in isolation from all.js	2013-09-23 16:47:03 +10:00
Rohan Mitchell	44aac294e0	Merge branch 'issue14'	2013-09-23 15:39:13 +10:00
Rohan Mitchell	19349c805f	Destroy supplied products when a supplier is destroyed	2013-09-23 14:58:26 +10:00
Rohan Mitchell	450a1e49c2	Do not 500 when add to cart fails	2013-09-23 14:15:53 +10:00
Rohan Mitchell	741a81a427	Fix spec fails - do not redirect on Products#show when distributor not set	2013-09-23 14:00:33 +10:00
Rohan Mitchell	072ce67b78	Redirect if distributor not chosen	2013-09-23 13:39:13 +10:00
Rohan Mitchell	000b13782e	Remove taxon crumbs, since taxon view is not yet supported and produces errors	2013-09-23 11:06:02 +10:00
Rohan Mitchell	803594b4d7	Confirm change hub when it would empty cart	2013-09-23 10:07:25 +10:00
Rohan Mitchell	767478a0ee	Add link to change hub	2013-09-23 09:17:17 +10:00
Rob H	8831dfc660	Fix #42	2013-09-20 14:28:46 +05:45
Rob H	08eb865469	Increase pagination size for products in BPE, resolves #14	2013-09-20 13:25:07 +05:45
Rohan Mitchell	9811851e29	Comment out order cycles debug styling that breaks tests	2013-09-20 13:08:54 +10:00
Rohan Mitchell	d100d12ebe	When a variant is removed from supply to an order cycle, remove it from distribution also	2013-09-20 11:11:59 +10:00
Rohan Mitchell	00fe10e847	Reposition order cycle admin debug info	2013-09-20 09:29:26 +10:00
Rohan Mitchell	ab052b771b	Ignore newrelic config	2013-09-20 09:26:14 +10:00
Rohan Mitchell	4956a4e384	Only geocode addresses associated with enterprises. Makes Checkout#update much faster.	2013-09-19 16:56:48 +10:00
David Cook	0183b0f2c1	Fix bulk update of order cycles for enterprise users	2013-09-19 15:48:39 +10:00
David Cook	2df2096d74	Sort payment and shipping methods by distributor name	2013-09-19 15:21:14 +10:00
David Cook	2e13abf933	Show only orders I am distributing	2013-09-19 15:21:14 +10:00
Rohan Mitchell	c9e543b25a	Update delivery page of checkout, change shipping to delivery	2013-09-19 13:40:49 +10:00
David Cook	e4127358c3	Rearrange admin payment methods table (BH#73)	2013-09-19 12:12:50 +10:00
David Cook	402ed01207	Refactor/cleanup	2013-09-19 12:12:50 +10:00
Rohan Mitchell	da9e756d9f	Fix migration for envs without distributors	2013-09-19 11:32:00 +10:00
Rohan Mitchell	08941ae22b	Data integrity	2013-09-19 11:22:55 +10:00
Rohan Mitchell	f06f4702ed	Update newrelic agent	2013-09-19 09:35:13 +10:00
Rohan Mitchell	136ec7d9d3	Remove heroku newrelic config	2013-09-19 09:34:57 +10:00
Rohan Mitchell	dc9206ccf6	Re-arrange top nav area	2013-09-18 16:27:18 +10:00
David Cook	b544c3a4f9	Add distributor column to admin shipping methods and payment methods pages	2013-09-18 13:48:50 +10:00
Rohan Mitchell	c30b8554da	Pin deface to working version, update spree_paypal_express with state capitalisation fix	2013-09-18 12:39:20 +10:00
Rohan Mitchell	633399bbfb	Rename 'Inner Melbourne' region to 'Eaterprises'	2013-09-18 12:39:20 +10:00
David Cook	42a31ccd74	Show all relevant suppliers and distributors in report drop-down	2013-09-18 12:34:44 +10:00
David Cook	ad4301df90	Add supplier selection to Orders & Fulfillment Report	2013-09-18 12:34:43 +10:00
Rohan Mitchell	fb9adf051e	Update bugsnag. I can haz custom exception metadata?	2013-09-18 11:42:31 +10:00
David Cook	4c2d6b38ea	Ensure 'No Order Cycle' remains selected after clicking 'Search'	2013-09-18 09:57:03 +10:00
David Cook	b34d940457	Renamed report column to 'Curr. Cost per Unit' for clarity	2013-09-18 09:27:34 +10:00