12629 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	0bae3e58b8	Add product units and amount fields to product and variant models, add validations	2013-12-05 15:16:51 +11:00
Will Marshall	7e9f389900	Getting the order cycles dropdown rendering correctly	2013-12-05 15:15:15 +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	720d66b379	Merge branch 'master' into ui_setup	2013-12-04 14:28:20 +11:00
Will Marshall	578651ddae	forcing SSL in staging	2013-12-04 14:26:22 +11:00
Will Marshall	9876a5f27b	Merge branch 'master' into ui_setup	2013-12-04 14:13:06 +11:00
Will Marshall	0032a806b5	Further work on Darkswarm	2013-12-04 14:12:13 +11:00
Will Marshall	987ba1a81a	Adding a monkeypatch to spree to always allow SSL	2013-12-04 14:08:08 +11:00
Will Marshall	ff003d8931	disabling SSL :/	2013-12-04 13:42:35 +11:00
Will Marshall	f0e847a9f1	Merge branch 'master' into ui_setup	2013-12-04 13:09:48 +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	c2d3e8bcec	Forcing staging to SSL	2013-12-04 13:08:28 +11:00
Will Marshall	3d019bdcd5	Starting to partialise things	2013-11-29 16:52:14 +11:00
Will Marshall	175cd86976	Adding darkswarm basics	2013-11-29 16:38:14 +11:00
Will Marshall	a8a12d6d04	Adding some magical guard unicorn sparkles	2013-11-29 16:11:56 +11:00
Will Marshall	e574185c95	Fixing an ordering issue in the order cycle spec	2013-11-29 14:48:06 +11:00
Will Marshall	0ac9bfd898	Moving our fix for the broken Spree function into our own JS	2013-11-29 14:24:56 +11:00
Will Marshall	0cfc0efe32	Overriding the broken _destroy partial so failure to destroy is shown as intended	2013-11-29 12:32:47 +11:00
Rohan Mitchell	6608b6e1ad	Remove some angular testing crud, integrate with regular rails config and script dirs	2013-11-29 11:13:41 +11:00
Rohan Mitchell	29308dca76	Enable order cycles by default	2013-11-29 10:49:33 +11:00
Will Marshall	33b23dd265	Sorting the bitching product report like a boss	2013-11-28 17:06:06 +11:00
Will Marshall	13e991d02d	Changing favicon	2013-11-28 16:52:54 +11:00
Will Marshall	7784a6ef44	Adding a default value of NOW to available_on on Products	2013-11-28 16:41:46 +11:00
Will Marshall	dec33ebda4	Fixing the HTML in the admin section	2013-11-28 16:13:13 +11:00
Will Marshall	69459847ca	Fixing some responsiveness issues on the home page	2013-11-28 15:42:00 +11:00
Will Marshall	acdbbb153d	Fixing up the landing page spec to cover the new login text	2013-11-28 15:24:38 +11:00
Will Marshall	7742fdc27a	Adding a better homepage login function	2013-11-28 15:01:57 +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	fbe0e2cc29	Basic plumbing for the Customers in place	2013-11-22 16:22:44 +11:00
Will Marshall	51ea6fcd67	Starting on the Customers Report	2013-11-22 14:57:11 +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	4898460132	Fix failing spec with table reorder, lambda-fy scopes that use time	2013-11-22 14:00:04 +11:00
Rohan Mitchell	94c33e5f45	Colour order cycle rows based on their status	2013-11-22 11:31:04 +11:00
Rohan Mitchell	459b2c1050	Add #upcoming? and #open? to OrderCycle	2013-11-22 11:15:12 +11:00
Rohan Mitchell	3a2394675f	Rename OrderCycle#expired? to #closed?	2013-11-22 11:08:42 +11:00
Rohan Mitchell	5ad63d08f3	Add some more open/close time scopes to order cycles	2013-11-22 10:57:33 +11:00
Rohan Mitchell	f75879bec1	Put order cycle variants in a tooltip	2013-11-22 10:03:49 +11:00
Will Marshall	5e170a843e	Forcing a rebuild on Jenkins	2013-11-21 17:22:47 +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
Will Marshall	beb6110bc3	Fixing up a bug in the aggregate filtering	2013-11-21 15:04:33 +11:00
Rohan Mitchell	b101a37dad	Rearrange columns	2013-11-21 14:42:28 +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	f642d6532a	Removing reundant Group Buys spec now we've removed Group Buys	2013-11-21 14:06:46 +11:00
Will Marshall	d703e1836f	Working build of P&I report	2013-11-21 14:06:24 +11:00
Will Marshall	e853c1275e	Working filters for Product&Inventory Report	2013-11-21 11:25:37 +11:00