Commit Graph

708 Commits

Author SHA1 Message Date
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
Will Marshall
6b75e8c9ef Switching to f_form_for and :bill_address 2014-02-21 15:19:12 +11:00
Will Marshall
b6b5c2889e Reworking checkout to use f_form_for, show validation, better controller layout 2014-02-21 14:31:03 +11:00
Rob H
5ec7a10e16 Add date filter fields to BOM 2014-02-21 14:01:33 +11:00
Rohan Mitchell
b0cb19e370 Do not show master options text (eg. '1kg') when product has variants 2014-02-18 16:45:57 +11:00
Will Marshall
adb58bc059 Moving from @order to current_order to keep DRY 2014-02-18 15:07:00 +11:00
Will Marshall
6a861de1e1 Reworking the checkout form some more 2014-02-18 14:50:50 +11:00
Rohan Mitchell
4ee4ea7c60 Fix mismatch between client and server variants (ordering issue) 2014-02-18 14:02:17 +11:00
Will Marshall
3024007bd3 Reworking our page structure to work better with Angular controllers 2014-02-18 13:51:39 +11:00
Will Marshall
19e31a264d Tidying footer contact details 2014-02-14 15:49:16 +11:00
Will Marshall
134d9831fe Fixing bug #271 2014-02-14 15:34:55 +11:00
Will Marshall
e9178570e9 Committing order summary. NO TESTS YET 2014-02-14 15:18:03 +11:00
Will Marshall
09d8e19c35 DRYING UP MY VIEWS 2014-02-14 14:43:50 +11:00
Will Marshall
a6d58aa498 Partializing and adding yield blocks 2014-02-14 14:40:58 +11:00
Will Marshall
5c498735b0 Moving from new to edit 2014-02-14 14:26:31 +11:00
Will Marshall
3c696b6762 Adding payment method switching 2014-02-14 13:30:28 +11:00
Will Marshall
4704e927e3 Form toggling! Fuck yeah 2014-02-14 11:31:27 +11:00
Will Marshall
25916caeb4 Starting on Angular models for Checkout, pretties 2014-02-13 16:14:11 +11:00
Will Marshall
2425de8c98 Basic form implementation 2014-02-13 11:40:52 +11:00
Rohan Mitchell
4d24fec6fb BPE: Add a variant. Do not show edit on unsaved variants. Delete unsaved variants. 2014-02-13 09:26:07 +11:00
Rohan Mitchell
4aa43cfbe0 Set the master unit value for a product without variants 2014-02-12 13:57:49 +11:00
Will Marshall
b11533a629 Renaming ShopController to Shop::ShopController 2014-02-07 16:52:18 +11:00
Will Marshall
7af1d72ef9 Working login and signup forms for checkout, specs, redirect back to checkout on success 2014-02-07 16:07:18 +11:00
Will Marshall
63f85fef0e Starting to get in the login stuff 2014-02-07 14:34:49 +11:00
Will Marshall
cec0ad8a83 Adding ze boilerplate 2014-02-07 13:55:25 +11:00
Will Marshall
ed8727708d Improving responsiveness, hopefully 2014-02-06 13:03:40 +11:00
Will Marshall
f3edd15fa7 Switching to using new prices on shop page 2014-02-05 14:57:24 +11:00
Will Marshall
a3e6a6253c Reworking table cell widths 2014-02-05 14:31:06 +11:00
Will Marshall
35c74e2bf0 Reworking shop to be more responsive 2014-02-05 14:26:41 +11:00
Will Marshall
7bdcb894cb Adding properties to product data 2014-02-04 15:22:06 +11:00
Will Marshall
5345e7330a Changing groups to Coming Soon 2014-02-04 15:19:36 +11:00
Will Marshall
ee8d7b1adc Adding taxons to the product data, so we search on it 2014-02-04 15:16:16 +11:00
Will Marshall
5eff05d466 Removing the footer cruft 2014-02-04 14:50:18 +11:00
Will Marshall
74f8fe46c6 Switching description to notes on shopping page 2014-02-04 14:14:02 +11:00
Will Marshall
a2e396694b Changing variant to unit 2014-02-04 12:02:38 +11:00
Will Marshall
a3b5a85a31 Adding list view links 2014-02-04 12:01:10 +11:00
Will Marshall
934f1eb196 Re-arranging product page into partials, redoing price display 2014-02-04 11:24:27 +11:00
Rob H
9373dcea3d Merge branch 'master' into bom 2014-01-31 12:32:23 +08:00
Rob H
58d1bf0092 BOM: can update quantities of line_items 2014-01-31 11:57:57 +08:00