98 Commits

Author	SHA1	Message	Date
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
Rohan Mitchell	474c049f0d	Set up basic form for admin editing product distributions (not yet functional)	2012-06-28 15:13:26 +10:00
Rohan Mitchell	1d3b7de5c6	Require ProductDistribution to be unique on [product, distributor]	2012-06-28 15:12:15 +10:00
Rohan Mitchell	3f08c2a9b0	Convert distributors_products join table into ProductDistribution explicit join model	2012-06-27 11:55:10 +10:00
Rohan Mitchell	d859999bdc	Checkout spec passes	2012-06-27 09:11:40 +10:00
Rohan Mitchell	c5270d6fa1	Set shipping address from distributor, fix zone init in checkout spec	2012-06-27 09:06:18 +10:00
Rohan Mitchell	340259eb2a	Fix database cleaner strategy: http://blog.55minutes.com/2012/05/faster-capybara-specs/	2012-06-26 16:19:54 +10:00
Rohan Mitchell	09f5bb8eed	Switch database cleaner strategy back to transaction after js test has run	2012-06-26 16:05:21 +10:00
Rohan Mitchell	e0e566e625	Display distributor information on checkout address page	2012-06-26 16:04:59 +10:00
Rohan Mitchell	4b9c0f01e2	Update admin backend for supplier/distributor address extraction	2012-06-26 14:54:35 +10:00
Rohan Mitchell	ba3c02346d	Extract distributor and supplier address to spree address model	2012-06-26 14:52:55 +10:00
Rohan Mitchell	3ad575cb5f	Display variant price differences as absolute, not relative values	2012-06-26 09:54:00 +10:00
Rohan Mitchell	0662e8f676	Show links to distributor home page, particularly when viewing product not available at current distributor	2012-06-26 08:12:35 +10:00
Rohan Mitchell	9258d47e55	When adding subsequent products, add valid products to cart	2012-06-26 07:52:45 +10:00
Rohan Mitchell	a48a100bcc	Merge branch 'shop-by-distributor'	2012-06-25 09:10:50 +10:00
Rohan Mitchell	32dca81467	Update spec for markup change	2012-06-25 09:10:34 +10:00
Rohan Mitchell	f4108921ed	When adding subsequent product to cart, do not allow the user to add a product from another distributor	2012-06-25 08:45:08 +10:00
Rohan Mitchell	98bcc9ce71	When adding first product to cart, add the product and set the distributor even if the order has a different distributor set	2012-06-25 06:57:24 +10:00
Rohan Mitchell	df831a9128	Do not add the product to cart if the chosen distributor is different from the order's distributor	2012-06-24 20:14:07 +10:00