Commit Graph

3834 Commits

Author SHA1 Message Date
Will Marshall
ece46811f9 Adding serializers also 2013-12-17 14:04:36 +11:00
Will Marshall
843a1133ef Moving to use custom serializers for ze JSON API 2013-12-17 13:48:08 +11:00
Will Marshall
222ed20361 Defaulting to bulk products 2013-12-13 15:57:32 +11:00
Will Marshall
63349c7c9a Fixing some breaking bugs in the refactored mailer 2013-12-13 15:40:23 +11:00
Will Marshall
92b3d496a4 Fixing the bugherd script to use the production one 2013-12-13 15:40:23 +11:00
Will Marshall
12743850b4 Removing a chili, refactoring order mailer 2013-12-13 15:40:22 +11:00
Will Marshall
e98031e581 Fixing some minor report bugs 2013-12-13 10:12:41 +11:00
Will Marshall
d5081e4cc5 Working on the pretties 2013-12-13 09:19:54 +11:00
Rohan Mitchell
03aa5604e5 Reorder columns on BPE 2013-12-12 10:52:17 +11:00
Will Marshall
36694822db Starting to prettify 2013-12-12 10:28:43 +11:00
Will Marshall
bc4f472523 Fixing up the tests with some refactoring 2013-12-11 15:33:57 +11:00
Will Marshall
3903173848 Working reloading of products, changing order cycles, sticky state 2013-12-11 13:36:12 +11:00
Will Marshall
44fe304efb Building out and testing our Product and OrderCycle Angular stuff 2013-12-11 12:42:33 +11:00
Rohan Mitchell
33f06f5eff Display unit value and description for variants in BPE 2013-12-06 15:57:37 +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
385a80a305 Revert "Can set variant_unit_name when unit type is not items" - this applies to a different field.
This reverts commit 8f6f37355c.
2013-12-06 14:38:46 +11:00
Rohan Mitchell
3013870bd6 Merge branch 'master' into product-amount-units
Conflicts:
	config/ng-test.conf.js
2013-12-06 14:33:59 +11:00
Rohan Mitchell
6956eb3f94 Basic styling for variant unit fields on BPE 2013-12-06 14:30:38 +11:00
Rohan Mitchell
8f6f37355c Can set variant_unit_name when unit type is not items 2013-12-06 14:25:19 +11:00
Rohan Mitchell
4e1a1825e6 Fix incorrect prefix on track-product 2013-12-06 13:14:55 +11:00
Rohan Mitchell
b21263e1c0 Display text field for variant_unit_name 2013-12-06 12:06:16 +11:00
Rohan Mitchell
e70513b06c Remove off-canvas class for landing page, allowing it to scroll 2013-12-06 11:47:07 +11:00
Rohan Mitchell
62ca121db2 Rename directives to avoid using the ng namespace, which is reserved for angular core 2013-12-06 10:49:06 +11:00
Will Marshall
3670d68265 Correctly failing tests forcing us to build out OrderCycle switching in Angular 2013-12-05 16:48:29 +11:00
Will Marshall
3cda12b8dd Refactoring the order cycle partials 2013-12-05 16:31:12 +11:00
Will Marshall
3f4f5143ff Refactoring the order cycle partials 2013-12-05 16:30:39 +11:00
Rohan Mitchell
e3043cc6ae Rename prepareProductsForSubmit to submitProducts 2013-12-05 15:16:52 +11:00
Rohan Mitchell
0a07f38f15 Load and display variant_unit on BPE page 2013-12-05 15:16:52 +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
0032a806b5 Further work on Darkswarm 2013-12-04 14:12:13 +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
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
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
Will Marshall
13e991d02d Changing favicon 2013-11-28 16:52:54 +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
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
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
f75879bec1 Put order cycle variants in a tooltip 2013-11-22 10:03:49 +11:00
Will Marshall
d703e1836f Working build of P&I report 2013-11-21 14:06:24 +11:00
Will Marshall
6a11b2685f Controller plumbing for Product & Inventory report 2013-11-20 13:58:01 +11:00
Will Marshall
5772fa9589 Boilerplate for the new Product and Inventory report, sans any functionality 2013-11-20 10:34:18 +11:00