1343 Commits

Author	SHA1	Message	Date
Rohan Mitchell	27b7d59f46	BaseController does not attempt to merge incomplete and current orders when they have differing distributors	2012-10-02 09:44:51 +10:00
Rohan Mitchell	bc408d8b6e	Add jquery and jquery_ujs includes to admin/all.js, as these have been removed from spree/admin/spree_core.js	2012-09-22 09:20:27 +10:00
Rohan Mitchell	a8758f1271	Fix OrdersHelper for upgraded spree	2012-09-21 16:36:50 +10:00
Rohan Mitchell	62d6067c1a	Do not truncate cents for product price update on add to cart JS	2012-09-21 12:44:38 +10:00
Rohan Mitchell	a1b5102476	Fix checkout totals, also amend factories for valid test shipping method data	2012-09-21 12:35:01 +10:00
Rohan Mitchell	757456dd57	Set line item shipping method in callback so that Order#update shipping calcs run correctly	2012-09-20 10:45:50 +10:00
Rohan Mitchell	3894ce946d	Fix error on supplier page, add test to cover	2012-09-19 15:46:56 +10:00
Rohan Mitchell	eaca160367	Set line item shipping method when added to cart, update specs for changes to line item shipping method	2012-09-19 15:01:50 +10:00
Rohan Mitchell	85f18cfb12	Rob: Replace LineItem shipping_method method with relation	2012-09-19 14:27:28 +10:00
Rob H	fe3743af16	Replace shipping method lookup with relation	2012-09-19 12:06:43 +10:00
Rohan Mitchell	7492522066	Improve clarity of various totals (items, shipping, grand total) on checkout page	2012-09-14 15:35:22 +10:00
Rohan Mitchell	334f84637d	Fix empty cart button alignment at checkout	2012-09-14 13:32:49 +10:00
Rohan Mitchell	3f15fc0b52	Set default admin orders view to sort with most recent orders first	2012-09-14 13:27:33 +10:00
Rohan Mitchell	a013854d2d	Change logo to Eaterprises, update link colour to match	2012-09-14 11:25:36 +10:00
Rohan Mitchell	b87c59c051	Default to blank distributor on add to cart to require user to select one	2012-09-13 15:29:04 +10:00
Rohan Mitchell	356ae40c7b	Display product descriptions as HTML in checkout	2012-09-13 13:05:12 +10:00
Rohan Mitchell	9dd94eaf57	Weight shipping calculator treats variants without weight defined as zero weight	2012-08-08 15:29:47 +10:00
Rohan Mitchell	9f013f0e37	When loading distributors for sidebar, only show those that have active products on hand	2012-08-04 17:51:08 +10:00
Rohan Mitchell	f0ec3080e4	Remove instrumentation	2012-08-04 17:50:30 +10:00
Rohan Mitchell	245de4fe1a	Add instrumentation to debug products not appearing on distributor view	2012-08-04 16:52:18 +10:00
Rohan Mitchell	9d33ef460c	Max quantity field doesn't affect JS price calcs on products without variants	2012-08-04 16:51:43 +10:00
Rohan Mitchell	28e75d6467	Fix add to cart JS for compatibility with group buy	2012-08-03 18:32:19 +10:00
Rohan Mitchell	f3ffba378a	Add a product with variants to the cart with max quantity for a group buy	2012-08-03 18:05:45 +10:00
Rohan Mitchell	2d89640271	Instrument orders controller to debug populate_variant_attributes	2012-08-03 14:11:59 +10:00
Rohan Mitchell	e6ee6b5164	Itemwise shipping calculator returns 0 instead of nil when there are no items	2012-08-03 08:44:53 +10:00
Rohan Mitchell	768a170bb8	Fix with_products_on_hand query for server db compatibility	2012-08-03 08:21:45 +10:00
Rohan Mitchell	8834268970	Fix error on no shipping method defined	2012-08-02 17:45:22 +10:00
Rohan Mitchell	fe61b4aab1	Display shipping fee at all steps of the checkout process, not just after delivery method is chosen	2012-08-02 16:24:08 +10:00
Rohan Mitchell	9110dc6414	Fix form local var naming for admin shared address form	2012-08-02 15:33:39 +10:00
Rohan Mitchell	77be0dd6eb	Adding a product with a max quantity less than quantity results in max_quantity==quantity	2012-08-02 15:26:13 +10:00
Rohan Mitchell	40544eb27b	Adding a product to cart that is not a group buy does not show max quantity field	2012-08-02 15:16:44 +10:00
Rohan Mitchell	c46613877c	Add max quantity field to add to cart form, add end-to-end test for max_quantity	2012-08-02 14:45:55 +10:00
Rohan Mitchell	2db2fbcade	Change set_variant_attribute to set_variant_attributes, implement it on Order	2012-08-02 14:45:27 +10:00
Rohan Mitchell	ea05f05576	When adding a group buy product to the cart, set the max quantity on the order	2012-08-02 14:29:05 +10:00
Rohan Mitchell	361a87f580	Add group buy option to new/edit product in admin	2012-08-02 13:42:47 +10:00
Rohan Mitchell	63bf25293d	Only show distributors in sidebar that have products in stock	2012-08-02 11:49:10 +10:00
Rohan Mitchell	93867682bb	Only show distributors in sidebar that have products	2012-08-02 11:33:36 +10:00
Rohan Mitchell	06c6422591	Fix by-weight calculator to take line item quantity into account	2012-07-23 18:49:03 +10:00
Andrew Spinks	2826f62497	Add extra details to the order report.	2012-07-20 20:25:53 +10:00
Andrew Spinks	7172fe0c87	added extra fields to order report.	2012-07-20 00:07:41 +10:00
Andrew Spinks	7e9a84087e	cleaning up order report	2012-07-19 22:48:42 +10:00
Andrew Spinks	58e9cd3eeb	fix distributor name in report	2012-07-15 21:00:10 +10:00
Andrew Spinks	54559c4a5f	first cut at orders report.	2012-07-15 20:48:10 +10:00
Andrew Spinks	759ceae23f	add distributor name to confirmation email	2012-07-11 23:20:59 +10:00
Andrew Spinks	32b37a1390	add padding to the second address line.	2012-07-11 22:45:57 +10:00
Andrew Spinks	0e43fcfaa1	adjust address formatting in confirmation email.	2012-07-11 22:25:42 +10:00
Andrew Spinks	6a27f8da32	update formatting of confirmation email.	2012-07-11 22:15:46 +10:00
Andrew Spinks	c24543c237	Add delivery details to confirmation email.	2012-07-11 22:07:18 +10:00
Andrew Spinks	44314ccb99	copied original spree confirmation mail	2012-07-11 21:35:07 +10:00
Rohan Mitchell	1e471e5e22	Name all form-containing partials with _form, tweak admin new product form	2012-07-02 16:28:31 +10:00