5166 Commits

Author	SHA1	Message	Date
Rob H	9737f21bb8	WIP: Write body of group buy report	2012-10-10 13:46:51 +11:00
Rohan Mitchell	2535e3965b	When merging orders, set distributor when target order distributor is nil	2012-10-09 08:42:29 +11:00
Rohan Mitchell	568d948cbe	Destroy incomplete orders if they can't be merged, prevents that order unexpectedly appearing in cart after checkout. Also ensure all orders have a shipping method.	2012-10-05 12:09:53 +10:00
Rob H	d7a5a87aef	create group buy report, display header	2012-10-03 11:49:21 +10:00
Rohan Mitchell	6d9257d941	Do not delete shipping method referenced by a line item	2012-10-02 12:15:09 +10:00
Rohan Mitchell	7430fc9bdd	Do not delete shipping method referenced by a product distribution	2012-10-02 11:58:18 +10:00
Rohan Mitchell	473b4e9adc	Add positive case test	2012-10-02 11:54:18 +10:00
Rohan Mitchell	2aa450b072	Do not delete shipping method referenced by an order	2012-10-02 11:51:13 +10:00
Rohan Mitchell	3886ec39f7	Add web helper method to visit paths with delete method	2012-10-02 11:47:55 +10:00
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	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	3794c00856	Upgrade Rails to 3.2.8 and Spree to 1.1.3	2012-09-14 10:20:52 +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	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	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	e6ee6b5164	Itemwise shipping calculator returns 0 instead of nil when there are no items	2012-08-03 08:44:53 +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	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	306cb5b089	Add max quantity to order and distributor report	2012-08-02 15:07:34 +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
Rohan Mitchell	5e04032797	Explicitly specify Spree 1.1.1, fix test regression in OrdersController	2012-07-23 18:48:30 +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
Rohan Mitchell	aa027f6e29	Display subtotal for delivery fees	2012-07-02 16:13:55 +10:00
Rohan Mitchell	6f581fce43	Admin can edit next collection date/time when editing an individual distributor	2012-07-02 14:36:45 +10:00
Rohan Mitchell	8156da509e	Display distributor next collection time in checkout process	2012-07-02 14:32:53 +10:00
Rohan Mitchell	718e54f933	Add distributor next_collection_at field, bulk edit in admin backend	2012-07-02 14:24:52 +10:00
Rohan Mitchell	cb56e9f658	Display delivery fee breakdown along with cart	2012-07-01 19:09:34 +10:00
Rohan Mitchell	86847d99da	Make Leave Distributor link more intuitive	2012-07-01 11:33:40 +10:00
Rohan Mitchell	258559f9d0	Update the price on the product details page in real time when the variant or the quantity are changed	2012-07-01 10:07:08 +10:00
Rohan Mitchell	af05448dd8	For check payment method, display description after purchase for use with EFT	2012-06-29 15:27:30 +10:00
Rohan Mitchell	e74f9054ae	Fix seeds: shipping and payment info created for successful checkout out of the box	2012-06-29 15:03:32 +10:00
Rohan Mitchell	28d2292de0	Add by-weight shipping calculator	2012-06-29 12:46:33 +10:00
Rohan Mitchell	73e601315b	Add acceptance spec for itemwise shipping fees	2012-06-29 11:50:43 +10:00
Rohan Mitchell	a0c1d1d255	Look up a product's shipping method though a particular distributor	2012-06-29 11:02:34 +10:00
Rohan Mitchell	411ba107ce	Perform shipping calculation in line item model	2012-06-29 10:47:11 +10:00
Rohan Mitchell	4f1e4fc223	Compute itemwise shipping cost for a line item	2012-06-29 08:46:31 +10:00
Rohan Mitchell	eae05ea59c	Add itemwise shipping cost calculator	2012-06-29 07:52:29 +10:00