2821 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Will Marshall	f6690cb8dd	Patching a minor bug in cart emptying	2014-06-12 16:13:52 +10:00
Rohan Mitchell	98611c3672	Fix timing error in enterprise supplied products rabl spec	2014-06-12 15:21:35 +10:00
Rohan Mitchell	9ccdd3b4e0	Add reactive integrity test that soft-deleted variants are removed from order cycles	2014-06-12 14:59:27 +10:00
Rohan Mitchell	8cea6d53ed	Correctly designate primary_taxon_id as NOT NULL	2014-06-12 14:59:27 +10:00
Rohan Mitchell	b23430375c	Add migration to remove deleted variants from order cycles	2014-06-12 14:59:27 +10:00
Rohan Mitchell	0061caa8df	Do not show deleted products in order cycle admin	2014-06-12 14:59:27 +10:00
Rohan Mitchell	836a08606c	Product and variant deletion removes the product or variant from any order cycles	2014-06-12 14:59:27 +10:00
Rohan Mitchell	083220089f	WIP: Delete ExchangeVariants when product is soft-deleted	2014-06-12 14:59:27 +10:00
Rohan Mitchell	c21d5cc3dc	Remove redirect to certified hostname - this is now performed by nginx. Fixes SSL errors.	2014-06-12 14:59:27 +10:00
Rohan Mitchell	88c41df201	BPE uses soft-delete for products	2014-06-12 14:59:27 +10:00
Rohan Mitchell	b970f54f53	Admin UI soft-deletes variants, not hard delete	2014-06-12 14:59:27 +10:00
Rohan Mitchell	9dc02e5eac	Add product soft-delete API action	2014-06-12 14:59:26 +10:00
Rohan Mitchell	e6c7acdff3	Add soft-delete method to variant	2014-06-12 14:59:26 +10:00
Rob H	3b1411283a	Merge branch 'master' into units	2014-06-12 12:13:44 +10:00
Rob H	c09aeeee8f	Recalculate option values on variants when product variant unit is changed	2014-06-12 12:11:20 +10:00
Rohan Mitchell	a6e3dd65fe	WIP (tests reqd): Customers and products+inventory reports handle nil order cycle times	2014-06-11 20:39:34 +10:00
Rob H	4d01b55963	Merge branch 'master' into units	2014-06-11 14:21:23 +10:00
Rob H	d8f1153817	Add js spec for option value namer	2014-06-11 14:21:13 +10:00
Rohan Mitchell	177e03eae2	Fix payments coming up as $0, credit card charges failing for the same reason	2014-06-11 13:19:14 +10:00
Rob H	8e960c817a	Merge branch 'master' into units	2014-06-11 12:43:40 +10:00
Rob H	44f4ee822c	Move dynamic placeholder logic to directive so that it can be used for master variants too	2014-06-11 12:41:51 +10:00
Rohan Mitchell	12809438ac	Orders and fulfilment report handles order cycles with nil opening or closing times	2014-06-11 10:33:59 +10:00
Will Marshall	94b7601d73	Patching authorization tests	2014-06-10 14:01:25 +10:00
Will Marshall	4d7fa8b1bf	Removing payments when emptying order	2014-06-10 11:15:04 +10:00
Will Marshall	dbf4f503a9	Restoring my clever flash refactoring	2014-06-10 11:14:52 +10:00
Will Marshall	c07809d328	Rescoping the accordion as well	2014-06-10 11:14:52 +10:00
Rohan Mitchell	dc60409c85	Move paid column next to order totals	2014-06-10 10:31:53 +10:00
Rohan Mitchell	f068cb3cd7	Show shipping method via angular only (don't show spree's adjustment)	2014-06-06 17:05:50 +10:00
Rohan Mitchell	be644bdcc3	Revert "Reworking flash messages hooray" ... This reverts commit c9d0091cd9.	2014-06-06 16:59:47 +10:00
Will Marshall	c9d0091cd9	Reworking flash messages hooray	2014-06-06 16:41:28 +10:00
Will Marshall	37f197205f	Removing shipping method from order when emptied	2014-06-06 16:39:53 +10:00
Rob H	6e04eeba07	Adding dynamic text to display as placeholder	2014-06-06 15:43:05 +10:00
Will Marshall	0c313c0dcb	Defaulting cart count to zero if undefined	2014-06-06 14:47:12 +10:00
Will Marshall	2545b06b2d	Adding first and last name read-only fields to credit card	2014-06-06 14:28:33 +10:00
Will Marshall	57102f714e	Switching to ng-if so CC fields aren't validated when hidden	2014-06-06 14:04:48 +10:00
Will Marshall	92eca72f4f	Fixing a couple of paths and clearing localStorage when changing distributor	2014-06-06 14:04:48 +10:00
Will Marshall	c32776c6b8	Disabling maps in production	2014-06-06 14:04:47 +10:00
Will Marshall	54cdc545a4	adding distributor id to localStorage	2014-06-06 14:04:47 +10:00
Will Marshall	afabda788e	Adding the close	2014-06-06 14:04:47 +10:00
Will Marshall	74b9810d22	Removing image from about us	2014-06-06 14:04:47 +10:00
Will Marshall	c09ffa832c	Fixing gmaps	2014-06-06 14:04:47 +10:00
Will Marshall	ebe40d3b3d	New icon	2014-06-06 14:04:46 +10:00
Will Marshall	f881197a74	New icons and some more enterprise data	2014-06-06 14:04:46 +10:00
Will Marshall	ddb5150e77	Automatically resizing to fit	2014-06-06 14:04:46 +10:00
Will Marshall	6f2e841100	Adding modals for the map	2014-06-06 14:04:46 +10:00
Will Marshall	c9c1b4709b	Basic but hacky way to get events out of map	2014-06-06 14:04:46 +10:00
Will Marshall	82ab14a33e	Starting on on the map	2014-06-06 14:04:45 +10:00
Rob H	43c5c37326	Add fields for variant display name and display as to bpe	2014-06-06 10:10:41 +10:00
Rohan Mitchell	634af96a66	Update reports controller spec for multi-order-cycle params	2014-06-06 09:47:16 +10:00
Rohan Mitchell	1d44cbf506	Show distribution charge on report	2014-06-06 09:47:16 +10:00