Commit Graph

646 Commits

Author SHA1 Message Date
Will Marshall
3370865a01 Adding group siblings to the shop page 2014-03-13 14:50:06 +11:00
Will Marshall
1ba720481f Finally fixing the same as billing address checkbox? 2014-03-13 11:41:46 +11:00
Will Marshall
e7bed58616 Removing text as per #327 2014-03-13 11:25:06 +11:00
Will Marshall
8a7dad020b Modifying the back to cart button 2014-03-13 11:24:33 +11:00
Will Marshall
7c50e1a41d Fixing up the specs 2014-03-12 17:17:07 +11:00
Will Marshall
35bd1257d9 Opening variants by default 2014-03-12 15:23:35 +11:00
Will Marshall
c08f739d4a Minor HTML changes 2014-03-12 15:13:25 +11:00
Will Marshall
9848a724b7 Adding Back to Cart link 2014-03-12 15:09:00 +11:00
Will Marshall
f96e420f01 Re-arranging our radio boxes 2014-03-12 15:09:00 +11:00
Will Marshall
2f7688f864 Switching some form order 2014-03-12 15:08:59 +11:00
Will Marshall
a1ed951931 Default shipping address same as billing address, rendering data panel for pickup info 2014-03-12 15:08:59 +11:00
Will Marshall
3ec80aaaa3 Styling improvements to the popups for producers 2014-03-12 15:08:59 +11:00
Will Marshall
f73cd3db7d Adding producer details popups 2014-03-12 15:08:59 +11:00
Rohan Mitchell
0b39db0165 Display Rails env on landing page in dev and staging 2014-03-12 12:35:52 +11:00
Will Marshall
84955d3647 Merging master 2014-03-06 16:53:03 +11:00
Will Marshall
904a25fd18 Improving the test suite, refactoring the form and Checkout controller to use data injection instead of haxxx 2014-03-06 16:48:30 +11:00
Will Marshall
12f39ce511 Patching up some more address bugs 2014-03-06 16:46:56 +11:00
Rob H
641796ed64 BOM: and quick search 2014-03-06 16:32:23 +11:00
Rob H
200e3fef77 Merge branch 'master' into bom 2014-03-06 12:52:36 +11:00
Will Marshall
a40a0499e4 Reducing the number of country and state options 2014-03-06 11:33:38 +11:00
Will Marshall
2301f2372f Defaulting the quantity fields to nil 2014-03-06 11:04:11 +11:00
Rob H
0726d591ac BOM: can filter by order cycle 2014-03-06 10:50:27 +11:00
Will Marshall
56646ca5e3 Getting some form state into the Order 2014-03-06 10:26:51 +11:00
Rohan Mitchell
922d817748 Product list view: For product with variants, show product price as min(variant prices) 2014-03-05 16:16:42 +11:00
Will Marshall
7d0fdead7a Refactoring the way we default shipping_method_id 2014-03-05 15:49:47 +11:00
Will Marshall
3c108d3366 Improving the test suite, refactoring the form and Checkout controller to use data injection instead of haxxx 2014-03-05 15:31:41 +11:00
Rohan Mitchell
b89c84e8bd BPE: Do not show product price when product has variants 2014-03-05 15:08:54 +11:00
Rohan Mitchell
17debd9fad On product list view, do not show variants that are out of stock 2014-03-05 13:54:02 +11:00
Rohan Mitchell
ec6f70c145 On product list view, only show variants that are a member of the current order cycle 2014-03-05 13:54:02 +11:00
Will Marshall
19350eeade Adding the 'same as billing address' JS 2014-03-05 12:29:49 +11:00
Rob H
1635e7338e Add ditributors and suppliers to OC show API 2014-03-05 12:17:08 +11:00
Rob H
fc65eefcfd Add basic order cycle API 2014-03-05 12:00:26 +11:00
Rob H
9f19e91e90 Merge branch 'master' into bom 2014-03-05 10:15:39 +11:00
Rob H
2a713245a8 BOM: date filter refactor and works with pending changes 2014-03-05 10:14:35 +11:00
Will Marshall
86a8b926f3 Adding conditions to the autopopulator for shipping address 2014-02-28 11:53:45 +11:00
Will Marshall
3db601f362 Merge branch 'master' into checkout 2014-02-27 16:29:21 +11:00
Will Marshall
c1cdf3e331 Removing some dud debugging stuff, fiddling with the checkout spec 2014-02-27 16:11:17 +11:00
Will Marshall
91a8e1c071 Fixing a Javascript bug 2014-02-27 14:47:33 +11:00
Will Marshall
18f92fbff5 Fixing a nil.id bug 2014-02-27 14:04:04 +11:00
Rohan Mitchell
8bb742b3f2 Alphabetise suppliers when adding new product 2014-02-27 11:33:02 +11:00
Rohan Mitchell
3196e28d88 Admin can assign units to a product 2014-02-27 11:29:39 +11:00
Will Marshall
85606b2a0d Merge branch 'master' into checkout 2014-02-27 10:41:39 +11:00
Will Marshall
0bfa36056e removing some dud Angular crud 2014-02-26 16:15:53 +11:00
Will Marshall
a0abd9c95a Merge branch 'master' into checkout 2014-02-26 15:52:37 +11:00
Will Marshall
7708bc9f99 Patching up our shipping selection so there's always a default 2014-02-26 15:48:23 +11:00
Rohan Mitchell
adf4c0e387 Sort enterprises by name on enterprise fees admin page 2014-02-26 15:38:41 +11:00
Will Marshall
f5a3167fac Patching up the form and update to get form submission working 2014-02-26 15:12:35 +11:00
Rob H
41c61b3b12 BOM date filters work 2014-02-22 15:51:14 +11:00
Rob H
1f569e4be1 Add loading splash to BOM 2014-02-22 14:49:19 +11:00
Rob H
83e228dc63 Display message when no matching orders found for BOM 2014-02-22 11:48:24 +11:00