1970 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	c46b858563	Don't render teh bits we dont wants	2012-11-23 17:20:52 +11:00
Rohan Mitchell	5e0a5654ff	Correctly index calculator fields. Adds ng-bind-html-unsafe-compiled.	2012-11-23 17:02:58 +11:00
Rob H	58a79e9b0c	Minor changes to order confirm email	2012-11-23 16:06:25 +11:00
Rob H	ee482d520c	Replace order information display for Confirm and Complete stages of checkout	2012-11-23 10:51:14 +11:00
Rob H	3d025bb709	WIP Replace order information display for Confirm and Complete stages of checkout	2012-11-23 09:26:27 +11:00
Rohan Mitchell	52ebe2c495	Provide proper names for angular select fields, add angular hidden field	2012-11-22 16:38:25 +11:00
Rohan Mitchell	fd0cc93e68	Add delete link	2012-11-22 16:19:10 +11:00
Rohan Mitchell	2a645d04ae	Move presentation to presenter, display calculator fields	2012-11-22 14:37:38 +11:00
Rohan Mitchell	b7bd21e498	Full-text search of form	2012-11-22 12:15:39 +11:00
Rohan Mitchell	873937db47	angular_collection_select	2012-11-22 11:45:55 +11:00
Rohan Mitchell	e64a86f5be	angular_select	2012-11-22 11:27:51 +11:00
Rohan Mitchell	ad76e66944	angular_options_for_select	2012-11-22 11:24:05 +11:00
Rohan Mitchell	216125c7a1	Start building some selects	2012-11-22 11:03:28 +11:00
Rohan Mitchell	d6802d9ae5	Generate text field with custom form builder - AngularFormBuilder	2012-11-22 09:53:26 +11:00
Rohan Mitchell	58917fe378	Convert enterprise select and name entry into form fields	2012-11-22 08:58:08 +11:00
Rob H	2786791c39	Change location of checkout delivery page cms from /delivery to /distribution	2012-11-21 16:14:56 +11:00
Rohan Mitchell	e2b0770c35	Fix name of button in spec	2012-11-21 16:02:12 +11:00
Rob H	b34d9da8e5	Add cms field to cart page to explain cart, located at cms path: /cart	2012-11-21 16:00:51 +11:00
Rohan Mitchell	e388e82d50	Merge branch 'checkout-changes'	2012-11-21 15:15:10 +11:00
Rohan Mitchell	dd155532f8	Add angular include, basic controller for listing enterprise fees, display fee ids using angular	2012-11-21 14:59:02 +11:00
Rohan Mitchell	63ba5d13a3	Add representative, output enterprise fees as JSON	2012-11-21 14:58:29 +11:00
Rohan Mitchell	fa2addd025	Delete enterprise fee	2012-11-21 12:17:19 +11:00
Rohan Mitchell	77b78f5bbb	Edit enterprise fee	2012-11-21 11:50:37 +11:00
Rohan Mitchell	bcc2ef99fd	Ensure that AUTH_TOKEN var is set in tests, since spree's admin JS errors without it	2012-11-21 11:49:59 +11:00
Rohan Mitchell	a4d10ab4e0	Create new enterprise fee, display errors when present	2012-11-21 09:47:51 +11:00
Rohan Mitchell	ff0d2bc983	Create EnterpriseSet as subclass of ModelSet	2012-11-21 09:08:41 +11:00
Rob H	cbfb896ca4	Change 'Delivery Fees' to 'Distribution Costs' in cart	2012-11-17 11:46:43 +11:00
Rob H	59ca8f4513	Add cms field to cart page to explain delivery fees, located at cms path: /cart-delivery-fees	2012-11-16 18:32:02 +11:00
Rob H	0d99d9d18f	Don't display unit size in reports for products that are not group buy items	2012-11-16 17:00:57 +11:00
Rob H	573ba9c8d4	Merge remote-tracking branch 'origin/master' into checkout-changes	2012-11-16 16:10:51 +11:00
Rohan Mitchell	98143ffe5b	Add calculator to EnterpriseFee, test passes for listing enterprise fees	2012-11-16 16:07:40 +11:00
Rob H	32acba05a3	Fixed total row labels in bulk co-op allocation report.	2012-11-16 15:28:06 +11:00
Rohan Mitchell	6247bd2541	Display admin table of enterprise fees with enterprise, fee type and name columns	2012-11-15 15:03:12 +11:00
Rohan Mitchell	03764881c8	Generalise EnterpriseSet to ModelSet	2012-11-15 14:29:38 +11:00
Rohan Mitchell	ec74396659	Add enterprise fees to admin configurations menu	2012-11-15 13:58:51 +11:00
Rohan Mitchell	192d4993a1	Add EnterpriseFee model	2012-11-15 13:42:55 +11:00
Rob H	9cb5ac95ff	More brackets make everything even better 0.3.1	2012-11-11 15:30:01 +11:00
Rohan Mitchell	076c64f7b0	Brackets make everything better	2012-11-10 12:53:03 +11:00
Rohan Mitchell	580486a347	Do not show duplicate products with in_supplier_or_distributor scope 0.3.0	2012-11-10 12:26:41 +11:00
Rohan Mitchell	9a9bef5304	Report filtering on completion date, not creation date	2012-11-09 20:31:08 +11:00
Rohan Mitchell	b4120b1028	Merge branch 'fixes-for-reports'	2012-11-07 19:00:07 +11:00
Rob H	a15f96aa68	Fix for case where no group_buy_size_has been set. ie. = nil	2012-11-07 18:34:54 +11:00
Rohan Mitchell	0f68ddcf01	Merge branch 'fixes-for-reports'	2012-11-07 14:30:45 +11:00
Rob H	5f07df9316	Add calculation fields to bulk co-op and order cycle reports	2012-11-03 11:36:17 +11:00
Rob H	9e4edd5da0	Change the basis of line_item grouping for Bulk Co-op and Order Cycle reports from User to Order	2012-11-02 16:41:32 +11:00
Rohan Mitchell	80159e1ea7	Do not munge foreign keys when migrating to enterprises	2012-11-02 15:34:02 +11:00
Rob H	3d2572c628	Merge branch 'master', remote-tracking branch 'origin'	2012-11-02 14:43:47 +11:00
Rohan Mitchell	3a116dc13d	Fix product filtering on supplier and distributor pages	2012-11-01 16:37:12 +11:00
Rohan Mitchell	c2133d70ac	Rename Enterprise is_supplier scope to is_primary_producer	2012-11-01 15:02:57 +11:00
Rohan Mitchell	a7a8b8490b	Add test for viewing a CMS page	2012-11-01 11:31:08 +11:00