Wykres commitów

59 Commity (b926d2756b49c00823596374201d90f5c8075886)

Autor SHA1 Wiadomość Data
JamesRamm b926d2756b Make some settings configurable 2017-02-12 16:05:03 +00:00
JamesRamm 8858545082 Adds shipping countries to model admin & use django-countries 2017-02-11 21:52:13 +00:00
JamesRamm 8b9867b740 Separate shipping models and address and register with modeladmin 2017-02-11 17:06:19 +00:00
James Ramm e2c6a7b8bf Update README.rst
Update installation instructions
2017-02-10 19:27:44 +00:00
James Ramm 6d845a2909 Merge pull request #15 from JamesRamm/order_template
Provides a react-based order view in the admin, with functionality to fulfill orders. Fixes #1
2017-02-10 19:14:39 +00:00
JamesRamm 2949fbde49 Update node version 2017-02-10 19:01:12 +00:00
JamesRamm cea198d6a5 Install npm dependencies 2017-02-10 18:48:07 +00:00
JamesRamm 6ef470b01d Call npm from client dir 2017-02-10 18:43:22 +00:00
JamesRamm 48194bb63b docstreing 2017-02-10 09:19:42 +00:00
JamesRamm 857c47cc9f Add asset building to setup 2017-02-10 09:18:37 +00:00
JamesRamm 5d432b31d3 Order view front end 2017-02-10 09:06:35 +00:00
JamesRamm cfc4e3ca1a Ignore JS bundles 2017-02-10 09:01:44 +00:00
JamesRamm 3580c2d0d9 Allow orders to be marked as fulfilled 2017-02-10 08:59:08 +00:00
JamesRamm fe4ac12cd5 Provides react based front end for order detail, with dummy actions for fulfill/refund 2017-02-10 08:26:21 +00:00
JamesRamm 319016b7b3 React front end for orders 2017-02-09 22:13:28 +00:00
JamesRamm 6d5987c8d4 Working on #1. Adds a read-only order view with all relationship fields 2017-02-08 11:24:49 +00:00
JamesRamm ae92abffcb Fix migration dependencies 2017-02-07 21:01:33 +00:00
JamesRamm 23a50a9c5c Resolve conflict 2017-02-07 21:00:36 +00:00
JamesRamm 081d644d16 Bring settings up to date with master 2017-02-07 20:57:37 +00:00
JamesRamm b79f173c3c Merge branch 'master' into order_template 2017-02-07 20:57:05 +00:00
JamesRamm f375f582d9 Set up webpack for react 2017-02-07 20:55:53 +00:00
James Ramm bcdc6bfbb3 Merge pull request #13 from alexfromvl/master
Add project_template
2017-02-07 17:29:44 +00:00
Alex 63f69c7b08 Update requirements_dev.txt 2017-02-07 20:15:58 +10:00
JamesRamm 7cae5a859d py2 compatibility 2017-02-07 09:23:23 +00:00
JamesRamm aa4fa84a3e just make travis ok 2017-02-07 09:14:25 +00:00
Alex 0ae583f453 Create product.html 2017-02-07 18:26:44 +10:00
Alex caeaf2f6af Update README.rst 2017-02-07 18:10:46 +10:00
Alex 081c566aef Create README.rst 2017-02-07 18:10:12 +10:00
Alex 3c57f35cb1 Add project_template
Demo project_template for product index page.
2017-02-07 18:00:39 +10:00
Alex cfccdd76c4 Merge pull request #2 from JamesRamm/master
update fork
2017-02-07 17:42:48 +10:00
Alex fec344c419 Update requirements.txt 2017-02-07 17:42:34 +10:00
Alex 1538431dc1 Update requirements.txt 2017-02-06 22:18:01 +10:00
JamesRamm ea533a3462 Fix migrations 2017-02-06 09:50:01 +00:00
JamesRamm ac07c0d049 Fix #9 2017-02-06 09:04:25 +00:00
JamesRamm 7863157405 Fix #9 2017-02-06 08:46:38 +00:00
JamesRamm 21375ca06e Modify reqs 2017-02-06 08:37:17 +00:00
JamesRamm 9709300a70 Fix for #9 2017-02-06 08:34:23 +00:00
James Ramm 02e55f31d4 Merge pull request #11 from JamesRamm/settings
Fixes #7
2017-02-06 08:27:01 +00:00
JamesRamm a1b639a0d4 Fixes #7 2017-02-06 08:26:02 +00:00
James Ramm cc49481c88 Merge pull request #8 from JamesRamm/dummy_payment_backend
Fixes #6
2017-02-06 08:06:46 +00:00
JamesRamm edf8260d6b Fixes unknown field in basket api 2017-02-06 08:04:04 +00:00
Alex 607c106385 Update README 2017-02-06 17:14:28 +10:00
Alex e662dd3252 Add Wagtail 2017-02-06 17:10:56 +10:00
Alex 7e5c370e2e Update requirements_dev 2017-02-06 11:58:33 +10:00
JamesRamm 2e34b2110e Fulfill view based on InspectView 2017-02-05 11:31:25 +00:00
JamesRamm 7f1ba2e660 Move common settings to one file 2017-02-04 11:30:01 +00:00
JamesRamm 1cead7642b Make api functions writing to db atomic 2017-02-03 20:34:35 +00:00
JamesRamm 645710c9f0 Fix payment error 2017-02-03 20:27:35 +00:00
JamesRamm 20d36d75cf Move variant fields to base class 2017-02-03 17:28:06 +00:00
JamesRamm 8fab4868d2 Rename serializer field 2017-02-03 17:24:41 +00:00