Merge pull request #412 from codesy/master

[deploy] Request 2016-10-09

.dockerignore

@@ -0,0 +1,18 @@
+*.pyc
+*.swp
+staticfiles
+_build
+.env
+env
+codesy.sqlite
+.coverage
+.coveralls.yml
+htmlcov
+.DS_Store
+MANIFEST
+stunnel.log
+stunnel/stunnel.pem
+docs/html
+.tox
+htmlcov
+.git

Dockerfile

@@ -0,0 +1,10 @@
+FROM quay.io/deis/base:0.3.1
+
+RUN apt-get update && apt-get install -y python python-pip python-dev \
+    build-essential libffi-dev libpq-dev
+WORKDIR /codesy
+ADD requirements.txt /codesy/
+RUN pip install -r requirements.txt
+ADD . /codesy/
+CMD newrelic-admin run-program gunicorn -b 0.0.0.0:8000 codesy.wsgi
+EXPOSE 8000

api/serializers.py

@@ -7,7 +7,8 @@
 class UserSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = User
-        fields = ('id', 'username', 'stripe_account_token', 'stripe_cc_token')
+        fields = ('id', 'username', 'stripe_card',
+                  'stripe_customer', 'stripe_bank_account')
         read_only_fields = ('id', 'username')
 
 

api/tests/serializer_tests.py

@@ -18,7 +18,8 @@ def test_attrs(self):
         self.assertEqual(self.serializer.Meta.model, User)
         self.assertEqual(
             self.serializer.Meta.fields,
-            ('id', 'username', 'stripe_account_token', 'stripe_cc_token')
+            ('id', 'username', 'stripe_card',
+                'stripe_customer', 'stripe_bank_account')
         )
         self.assertEqual(
             self.serializer.Meta.read_only_fields, ('id', 'username'))

auctions/admin.py

@@ -5,7 +5,7 @@
 
 
 class BidAdmin(admin.ModelAdmin):
-    list_display = ('user', 'url', 'ask', 'offer')
+    list_display = ('user', 'url', 'ask', 'offer', 'created', 'modified')
     list_filter = ('ask_match_sent',)
     search_fields = ['user__username', 'user__email', 'title']
 
@@ -17,30 +17,30 @@ class IssueAdmin(admin.ModelAdmin):
 
 
 class ClaimAdmin(admin.ModelAdmin):
-    list_display = ('user', 'status', 'issue')
+    list_display = ('user', 'status', 'issue', 'created', 'modified')
     list_filter = ('status',)
     search_fields = ['user__username', 'user__email', 'issue__url',
                      'issue__title']
 
 
 class OfferAdmin(admin.ModelAdmin):
-    list_display = ('user', 'bid', 'amount', 'charge_amount', 'api_success',
-                    'created')
+    list_display = ('user', 'bid', 'amount', 'charge_amount', 'refund_id',
+                    'created', 'modified')
     list_filter = ('api_success',)
     search_fields = ['bid__user__username', 'bid__user__email',
                      'error_message', 'confirmation', 'transaction_key']
 
 
 class PayoutAdmin(admin.ModelAdmin):
     list_display = ('user', 'claim', 'amount', 'charge_amount', 'api_success',
-                    'created')
+                    'created', 'modified')
     list_filter = ('api_success',)
     search_fields = ['claim__user__username', 'claim__user__email',
                      'confirmation', 'transaction_key']
 
 
 class VoteAdmin(admin.ModelAdmin):
-    list_display = ('claim', 'user', 'approved', 'created')
+    list_display = ('claim', 'user', 'approved', 'created', 'modified')
     list_filter = ('approved',)
 
 

auctions/migrations/0031_auto_20160717_1216.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-07-17 12:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auctions', '0030_auto_20160603_0931'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='claim',
+            name='status',
+            field=models.CharField(choices=[(b'Submitted', b'Submitted'), (b'Pending', b'Pending'), (b'Approved', b'Approved'), (b'Rejected', b'Rejected'), (b'Requested', b'Requested'), (b'Paid', b'Paid')], default=b'Submitted', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='payoutcredit',
+            name='payout',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='payout_credit', to='auctions.Payout'),
+        ),
+    ]

auctions/migrations/0032_auto_20160730_1539.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-07-30 15:39
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auctions', '0031_auto_20160717_1216'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='payout',
+            name='provider',
+            field=models.CharField(choices=[(b'Stripe', b'Stripe'), (b'PayPal', b'PayPal')], default=b'Stripe', max_length=255),
+        ),
+    ]

auctions/migrations/0033_auto_20160806_1958.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-08-06 19:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auctions', '0032_auto_20160730_1539'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='offer',
+            old_name='confirmation',
+            new_name='charge_id',
+        ),
+        migrations.RenameField(
+            model_name='payout',
+            old_name='confirmation',
+            new_name='charge_id',
+        ),
+        migrations.AddField(
+            model_name='offer',
+            name='refund_id',
+            field=models.CharField(blank=True, max_length=255),
+        ),
+        migrations.AddField(
+            model_name='payout',
+            name='refund_id',
+            field=models.CharField(blank=True, max_length=255),
+        ),
+    ]

auctions/migrations/0034_auto_20160826_0131.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-08-26 01:31
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auctions', '0033_auto_20160806_1958'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='payout',
+            name='discount',
+            field=models.DecimalField(blank=True, decimal_places=2, default=1, max_digits=3),
+        ),
+        migrations.AlterField(
+            model_name='offerfee',
+            name='fee_type',
+            field=models.CharField(choices=[(b'PayPal', b'PayPal'), (b'Stripe', b'Stripe'), (b'codesy', b'codesy'), (b'refund', b'refund'), (b'surplus', b'surplus')], default=b'', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='payoutcredit',
+            name='fee_type',
+            field=models.CharField(choices=[(b'PayPal', b'PayPal'), (b'Stripe', b'Stripe'), (b'codesy', b'codesy'), (b'refund', b'refund'), (b'surplus', b'surplus')], default=b'', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='payoutfee',
+            name='fee_type',
+            field=models.CharField(choices=[(b'PayPal', b'PayPal'), (b'Stripe', b'Stripe'), (b'codesy', b'codesy'), (b'refund', b'refund'), (b'surplus', b'surplus')], default=b'', max_length=255),
+        ),
+    ]

auctions/migrations/0034_auto_20160905_1352.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-09-05 13:52
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auctions', '0033_auto_20160806_1958'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bid',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2016, 9, 5, 13, 52, 34, 685137, tzinfo=utc)),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='bid',
+            name='modified',
+            field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 9, 5, 13, 52, 42, 862740, tzinfo=utc)),
+            preserve_default=False,
+        ),
+    ]

auctions/migrations/0035_auto_20160826_1223.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-08-26 12:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auctions', '0034_auto_20160826_0131'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='payout',
+            name='discount',
+            field=models.DecimalField(blank=True, decimal_places=2, default=0, max_digits=6),
+        ),
+    ]

auctions/migrations/0035_auto_20160905_1440.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-09-05 14:40
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auctions', '0034_auto_20160905_1352'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='claim',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2016, 9, 5, 14, 40, 17, 337406, tzinfo=utc)),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='claim',
+            name='modified',
+            field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 9, 5, 14, 40, 22, 234927, tzinfo=utc)),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='vote',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2016, 9, 5, 14, 40, 27, 114691, tzinfo=utc)),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='vote',
+            name='modified',
+            field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 9, 5, 14, 40, 30, 500397, tzinfo=utc)),
+            preserve_default=False,
+        ),
+    ]

auctions/migrations/0036_merge.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-09-07 07:14
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auctions', '0035_auto_20160905_1440'),
+        ('auctions', '0035_auto_20160826_1223'),
+    ]
+
+    operations = [
+    ]

auctions/migrations/0037_auto_20160908_1250.py

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-09-08 12:50
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auctions', '0036_merge'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='offer',
+            name='discount',
+            field=models.DecimalField(blank=True, decimal_places=2, default=0, max_digits=6),
+        ),
+        migrations.AlterField(
+            model_name='offer',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2016, 9, 8, 12, 50, 38, 512292, tzinfo=utc)),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='offer',
+            name='modified',
+            field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 9, 8, 12, 50, 49, 786526, tzinfo=utc)),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='payout',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2016, 9, 8, 12, 50, 53, 579917, tzinfo=utc)),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='payout',
+            name='modified',
+            field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 9, 8, 12, 50, 57, 499702, tzinfo=utc)),
+            preserve_default=False,
+        ),
+    ]