164 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	4aae6be9b7	Remove unused overrides for primary taxons and product/new	2014-05-30 15: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	a979334f2a	Adding primary taxon	2014-05-30 14:31:36 +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
Maikel Linke	7d30d8e28f	old deface files deleted. spec for enterprise form updated	2014-03-19 20:42:21 +11:00
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
Rob H	4e9ae7549e	Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page	2014-01-16 13:20:07 +08:00
Rob H	031414a41f	Make BPE menu tab selected	2014-01-16 13:18:28 +08:00
Rohan Mitchell	e443495a7e	Remove reference to deleted stylesheet	2013-12-17 12:48:44 +11:00
Will Marshall	222ed20361	Defaulting to bulk products	2013-12-13 15:57:32 +11:00
Will Marshall	12743850b4	Removing a chili, refactoring order mailer	2013-12-13 15:40:22 +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