Commit Graph

708 Commits

Author SHA1 Message Date
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
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
af05448dd8 For check payment method, display description after purchase for use with EFT 2012-06-29 15:27:30 +10:00
Rohan Mitchell
c09d4c98c8 Product distributions now editable 2012-06-28 15:38:26 +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
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
f75b9bb176 Swap order of continue shopping and empty cart buttons 2012-06-26 10:58:09 +10:00
Rohan Mitchell
cb6ac2064d Rearrange buttons on cart checkout form 2012-06-26 10:50:50 +10:00
Rohan Mitchell
34b694666c Grey out inactive distributors 2012-06-26 08:24:32 +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
6cd9bff29f Convert most templates from erb to haml 2012-06-25 09:06:56 +10:00
Rohan Mitchell
a7df5a2f1e Include jquery, add basic styling for add to cart form, split supplier and distributors in product details sidebar 2012-06-25 08:57:53 +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
178f581452 When an item has been added to the cart, do not allow the user to select a distributor when adding a subsequent item 2012-06-25 07:25:31 +10:00
Rohan Mitchell
24ad4f53fc Raise error if distributor changed illegally 2012-06-24 19:23:44 +10:00
Rohan Mitchell
a41c5d4735 Move distributor permissions onto order class, do not show links to change distributor if the action is invalid 2012-06-24 15:15:53 +10:00
Rohan Mitchell
b2f5e23fa4 Test selecting distributor when adding item to cart, for no/remote distributor selected 2012-06-24 11:41:10 +10:00
Rohan Mitchell
a91722a593 Display distributor choice on add to cart form 2012-06-24 11:28:06 +10:00
Rohan Mitchell
9be5dc41b9 Split products by local/remote distributor: style 2012-06-24 09:41:33 +10:00
Rohan Mitchell
34f95ffb4a Split products by local/remote distributor: apply to products, search results and taxon pages 2012-06-24 09:21:44 +10:00
Rohan Mitchell
32050bbba4 Split products by local/remote distributor: views and basic style 2012-06-24 07:37:25 +10:00
Rohan Mitchell
5e6c4de34b Leave a distributor 2012-06-23 12:33:38 +10:00
Rohan Mitchell
0c5162f9fb Move distributor lookup code into current_distributor helper 2012-06-22 11:48:39 +10:00
Rohan Mitchell
4911a06c9d Display current distributor in main nav bar 2012-06-22 11:46:40 +10:00
Rohan Mitchell
65d39e5867 Display supplier/distributor search results 2012-06-21 07:31:33 +10:00
Rohan Mitchell
b0a8645738 Display suppliers and distributors in sidebar 2012-06-20 17:44:11 +10:00
Rohan Mitchell
d656898ecb Disable filtering distributors using spree filters 2012-06-20 17:43:14 +10:00
Rohan Mitchell
f9d290f00d Show product supplier and distributors on product details page 2012-06-20 16:28:09 +10:00
Rohan Mitchell
a445216e6c Add test for filtering by distributor 2012-06-20 15:19:26 +10:00
Rohan Mitchell
9adfe58086 Display distributor filter as links instead of checkboxes, style in the same way as taxonomy selectors 2012-06-20 15:05:54 +10:00
Rohan Mitchell
1207062f7c Filter products by distributor 2012-06-20 14:20:07 +10:00
Rohan Mitchell
423ab26a1a Show product filters in sidebar on all pages 2012-06-20 14:15:58 +10:00
Rohan Mitchell
b89562823b Add distributors to admin product forms 2012-06-19 10:39:08 +10:00
Andrew Spinks
5088363c84 add supplier to product on admin views. 2012-04-29 18:35:14 +10:00
Andrew Spinks
c9effe5926 Add seperate address fields - don't become too attached to spree. 2012-04-29 17:31:47 +10:00
Andrew Spinks
e4fd20b807 Add default supplier view and relationship to address. 2012-04-29 16:32:38 +10:00
Andrew Spinks
7ea0f73398 begin adding suppliers 2012-04-22 14:51:24 +10:00
Andrew Spinks
4ad11c1faf delete and edit distributors 2012-04-22 13:01:56 +10:00
Andrew Spinks
48c6f4d7cc default states to current zone. 2012-04-22 12:10:35 +10:00