50 Commits

Author	SHA1	Message	Date
Will Marshall	c6f1d43dbd	Reworking the shipping confirmation	2014-03-19 16:09:45 +11:00
Will Marshall	96ce982ea3	Reworking the checkout into Darkswarm, patching up tests	2014-03-18 15:58:22 +11:00
Will Marshall	2ac7fe3652	Tweaking checkout links	2014-03-14 11:56:24 +11:00
Will Marshall	0c18a9c790	Changing links on cart	2014-03-13 11:56:55 +11:00
Rohan Mitchell	93a661ac08	Do not show product unit fields when creating a new product - make this interface less confusing	2014-03-12 12:35:52 +11:00
Will Marshall	e146bb0dd0	Adding Quick Checkout link	2014-03-06 11:01:25 +11:00
Will Marshall	66866f09b5	Adding the require ship address flag to admin UI:	2014-03-05 11:12:23 +11:00
Rohan Mitchell	3196e28d88	Admin can assign units to a product	2014-02-27 11:29:39 +11:00
Rohan Mitchell	3f9f24157c	Do not show unit value or description when product does not have a unit-related option type	2014-02-19 12:07:53 +11:00
Rohan Mitchell	3024bbbeb5	Edit unit value and description of variant	2014-02-19 11:56:37 +11:00
Rohan Mitchell	fb42724430	Remove entire field div instead of just the text field	2014-02-19 11:56:10 +11:00
Rohan Mitchell	7b80518621	On admin variant edit page, do not show option values for unit-related option types	2014-02-19 11:29:26 +11:00
Will Marshall	2bb004ebaa	Adding notes field to products	2014-02-04 14:11:32 +11:00
Will Marshall	a3b5a85a31	Adding list view links	2014-02-04 12:01:10 +11:00
Rohan Mitchell	b101a37dad	Rearrange columns	2013-11-21 14:42:28 +11:00
Rohan Mitchell	27b8c4508f	Split product distribution editing into its own admin page	2013-11-13 15:22:17 +11:00
Will Marshall	b7104add1c	Patching up the footer, partialising it	2013-11-08 16:37:02 +11:00
Will Marshall	b227be4a62	Adding an override to suppress the products display unless we actually have an order_cycle in play	2013-11-08 16:04:31 +11:00
Rohan Mitchell	71d6e51078	Put distributors column second, no need to explicitly set column widths, so remove this	2013-11-07 16:25:43 +11:00
Will Marshall	e33ff15151	Adding a small override to unbreak the New Product link	2013-11-06 16:28:51 +11:00
Will Marshall	0784642517	Removing the copyright from the footer	2013-11-06 13:40:05 +11:00
Rohan Mitchell	358ca25f31	Admin can assign multiple distributors to a shipping method	2013-10-17 11:16:26 +11:00
Rohan Mitchell	de8d7bd66e	Clean up payment methods form	2013-10-17 11:08:25 +11: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	767478a0ee	Add link to change hub	2013-09-23 09:17:17 +10:00
David Cook	2df2096d74	Sort payment and shipping methods by distributor name	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	b544c3a4f9	Add distributor column to admin shipping methods and payment methods pages	2013-09-18 13:48:50 +10:00
David Cook	ee9d9a36d5	Make distributor payment method multi-select	2013-09-13 12:03:37 +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
Rohan Mitchell	d32a8b56d0	When order cycle is selected, only show variants that are in it	2013-09-09 10:40:15 +10:00
alexs333	999bc2697a	Implemented simlified shop flow.	2013-09-04 20:33:18 +10:00
Rohan Mitchell	911d8b8bbc	Shipping method has a distributor, admin can create and edit	2013-08-30 11:43:45 +10:00
Rohan Mitchell	4f8014306e	Admin can't change distributor or order cycle once order has been finalized	2013-08-23 14:00:31 +10:00
Rohan Mitchell	2cab83cb29	Admin create order can set distributor and order cycle	2013-08-23 14:00:31 +10:00
alexs	a623e2dee6	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-21 16:05:29 +10:00
alexs	8b4c0682fb	Replaced eaterprises logo with the distributor name header.	2013-08-21 16:05:06 +10:00
David Cook	b2878ddc40	Payment Method must belong to a Distributor	2013-08-21 15:14:01 +10:00
Rohan Mitchell	fa459c0395	Summarise distribution charges: order confirm page and email	2013-08-20 16:26:46 +10:00
Rohan Mitchell	fb33b853dd	Revert payment method changes that broke the build: 5f7cbe3, 5a3ad8e, 3ffe732, 2d305b5, 08babee, 6f73f41, 77329b5, 4be2fe5	2013-08-20 10:47:56 +10:00
David Cook	08babeed65	Payment Method must have one Distributor	2013-08-19 13:57:40 +10:00
alexs	8ee98e3d96	Added bugherd to admin and sree frontend and re-arranged the bugherd code.	2013-08-16 15:50:45 +10:00
David Cook	98d520f0e3	Filter PaymentMethods by distributor	2013-08-13 10:55:52 +10:00
David Cook	1621e4c4a4	Add distributor to PaymentMethod	2013-08-13 10:55:51 +10:00
Rohan Mitchell	638d7b1c33	Stylistic changes, extract commented code to private method	2013-07-23 17:02:06 +10:00
David Cook	f0755f34aa	tidy up javascript, remove unnecessary disableSaveOnClick	2013-07-19 17:05:09 +10:00
David Cook	15c454a0f1	move style to stylesheet	2013-07-19 17:04:04 +10:00
David Cook	8df0f30b4f	Move override into .deface format, and removed unecessary bits	2013-07-05 16:08:26 +10:00