50 Commits

Author	SHA1	Message	Date
Rob H	3d57e0a7a7	Add 'new' buttons to shipping and payment method edit pages	2014-07-24 13:46:35 +10:00
Rohan Mitchell	edeb820c64	Send distributor and order cycle id to order add variant autocomplete search	2014-07-16 09:33:59 +10:00
Rob H	29fde37ba3	Merge branch 'bug-herd' into working	2014-07-03 14:24:39 +10:00
Rob H	934f960336	Add display as to new product page	2014-06-26 15:27:24 +10:00
Rob H	44fb34d7be	Rearrange admin title	2014-06-26 12:20:42 +10:00
Rob H	51d3f65934	Remove spree's product tab for all but admin users	2014-06-23 22:01:19 +10:00
Rob H	753a867142	'Back to Products List' on product edit page returns user to BPE	2014-06-23 15:54:53 +10:00
Rob H	7d1acc23ad	Cancel button on new product form redirects to BPE	2014-06-23 15:54:14 +10:00
Rob H	a21c2c20f7	Change 'Spree' in admin page title to 'OFN'	2014-06-23 11:26:46 +10:00
Rob H	0d7c682b85	Remove shipping category from admin edit shipping methods	2014-06-19 18:31:52 +10:00
Rob H	004548a4fe	Rearrange shipping method edit page	2014-06-18 10:21:21 +10:00
Rob H	8412d740ff	Move distributors into sidebar for new & edit shipping methods screen	2014-06-12 16:10:30 +10:00
Rob H	4e98ee6e56	Remove sidebar from admin edit shipping methods	2014-06-12 14:48:36 +10:00
Rob H	66d6de9dfc	Merge master (with primary taxons restored)	2014-05-30 15:45:48 +10:00
Rob H	69376e7f4b	Merge in master	2014-05-30 15:10:13 +10:00
Will Marshall	b736145552	Adding primary taxon to admin forms ... Conflicts: db/migrate/20140522044009_add_primary_taxon_to_products.rb spec/features/admin/products_spec.rb	2014-05-30 14:31:27 +10:00
Rob H	d9f7865572	Can add an image from redesigned new product page	2014-05-30 11:31:53 +10:00
Rob H	9b10a2cb94	Added 'Add Another' link to new product page. Altered redirects	2014-05-29 12:13:55 +10:00
Rob H	e110677b3b	WIP: Rearrange new product form	2014-05-29 12:11:06 +10:00
Rohan Mitchell	2a630a855a	Move primary taxon field into Rob's new product form	2014-05-29 09:28:08 +10:00
Rob H	4a9a1029a1	Fixed a typo	2014-05-23 22:33:59 +10:00
Rob H	14611896c0	Simplify new product form	2014-05-23 18:08:29 +10: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	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
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
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
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
David Cook	2df2096d74	Sort payment and shipping methods by distributor name	2013-09-19 15:21:14 +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	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
David Cook	b2878ddc40	Payment Method must belong to a Distributor	2013-08-21 15:14:01 +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
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