343 Commits

Author	SHA1	Message	Date
Will Marshall	85606b2a0d	Merge branch 'master' into checkout	2014-02-27 10:41:39 +11:00
Will Marshall	a0abd9c95a	Merge branch 'master' into checkout	2014-02-26 15:52:37 +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
Will Marshall	b6b5c2889e	Reworking checkout to use f_form_for, show validation, better controller layout	2014-02-21 14:31:03 +11:00
Rohan Mitchell	7b80518621	On admin variant edit page, do not show option values for unit-related option types	2014-02-19 11:29:26 +11:00
Will Marshall	adb58bc059	Moving from @order to current_order to keep DRY	2014-02-18 15:07:00 +11:00
Will Marshall	5c498735b0	Moving from new to edit	2014-02-14 14:26:31 +11:00
Will Marshall	2425de8c98	Basic form implementation	2014-02-13 11:40:52 +11:00
Will Marshall	871637c4af	NO CAN HAZ EMPTY CART PAGE	2014-02-12 12:31:37 +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	cec0ad8a83	Adding ze boilerplate	2014-02-07 13:55:25 +11:00
Will Marshall	26e4adf7a6	Adding the routes, controller, new action and some tests	2014-02-07 13:53:36 +11:00
Will Marshall	e5c90e80f5	Adding sorting	2014-02-04 14:44:32 +11:00
Rob H	9373dcea3d	Merge branch 'master' into bom	2014-01-31 12:32:23 +08:00
Rob H	00dfa62f43	Basic listing of orders on BOM page	2014-01-17 14:56:26 +08:00
Will Marshall	9624a3919a	Patching a bug in shop controller	2014-01-17 15:13:48 +11:00
Will Marshall	b6590000a4	Improving Product's has_stock, filtering Shop#products to in_stock products	2014-01-17 14:41:15 +11:00
Rohan Mitchell	cbe46bffed	Merge branch 'bpe_paginate' ... Conflicts: config/ng-test.conf.js	2014-01-09 12:07:42 +11:00
Rohan Mitchell	ef56574d82	Pass quantity to OrderPopulator	2014-01-08 11:37:38 +11:00
Will Marshall	4d03f65766	Reworking everything to use RABL	2014-01-07 15:06:47 +11:00
Rob H	177782fac5	Status message works when updating products with filters applied	2014-01-06 18:20:00 +08:00
Will Marshall	dd1b3311d7	Removing all the old order populator stuff	2014-01-06 15:23:21 +11:00
Will Marshall	751e98443f	Removing LOADS of code	2013-12-19 16:47:27 +11:00
Will Marshall	985cebb44a	Massaging the form to push orders to the cart: some refactoring still required	2013-12-19 15:51:51 +11:00
Will Marshall	6d124b3275	Failing tests, forcing the orders close text to change	2013-12-18 16:12:06 +11:00
Will Marshall	c4c5f3a8c7	Merging from master	2013-12-17 14:18:21 +11:00
Will Marshall	843a1133ef	Moving to use custom serializers for ze JSON API	2013-12-17 13:48:08 +11:00
Rohan Mitchell	124b6df75d	Show undated order cycles on index page	2013-12-13 14:51:43 +11:00
Will Marshall	e98031e581	Fixing some minor report bugs	2013-12-13 10:12:41 +11:00
Will Marshall	71a5d84a1d	Filtering the products to the current order cycle	2013-12-11 15:06:07 +11:00
Will Marshall	04d8949177	Tweaks to the JS, redirection on the controller	2013-12-11 12:53:50 +11:00
Will Marshall	4db8f755bf	Getting an order cycle update function in place like a boss	2013-12-11 12:42:02 +11:00
Will Marshall	63dfa0b696	Getting the test framework set up for Angular, setting up a products fetch stub	2013-12-06 15:24:42 +11:00
Rohan Mitchell	4c72170742	Remove unnecessary require	2013-12-05 15:16:51 +11:00
Will Marshall	ec72e9137a	We can now hit the index page	2013-12-05 15:07:46 +11:00
Will Marshall	4543e08872	Renaming everything to Shop	2013-12-05 13:40:05 +11:00
Will Marshall	f525b7aea1	Adding the distributors controller	2013-12-04 15:58:25 +11:00
Will Marshall	9efd7c2d69	Getting the darkswarm build flow up and running. Like a boss	2013-12-04 13:09:30 +11:00
Will Marshall	7bc754a598	Adding filtering to the products page	2013-11-28 13:44:21 +11:00
Will Marshall	d39cb74d06	Merge branch 'customers'	2013-11-22 16:55:11 +11:00
Will Marshall	27f99d1383	Working version of Customers reports without filters	2013-11-22 16:53:57 +11:00
Will Marshall	b3bf3a8378	Adding the plumbing for Customers reports, and one tiny refactor to products	2013-11-22 14:56:57 +11:00
Rohan Mitchell	94c33e5f45	Colour order cycle rows based on their status	2013-11-22 11:31:04 +11:00
Rohan Mitchell	3a2394675f	Rename OrderCycle#expired? to #closed?	2013-11-22 11:08:42 +11:00
Will Marshall	c695bafe69	Reworking the way the Reports works so we have more granular control over what shows	2013-11-21 16:45:59 +11:00
Rohan Mitchell	dfcf567f26	Sort payment methods by name	2013-11-21 14:42:28 +11:00
Will Marshall	612a80ec15	A little refactoring, some comment removal	2013-11-21 14:28:23 +11:00
Will Marshall	d703e1836f	Working build of P&I report	2013-11-21 14:06:24 +11:00