change last4 and brand to be more descriptive

codesy · Apr 15, 2017 · 28fa041 · 28fa041
1 parent 69776d1
commit 28fa041
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 8 deletions.
diff --git a/api/serializers.py b/api/serializers.py
@@ -9,7 +9,7 @@ class Meta:
         model = User
         fields = (
             'id', 'username', 'stripe_card', 'stripe_customer',
-            'stripe_bank_account', 'last4', 'brand')
+            'stripe_bank_account', 'card_last4', 'card_brand')
         read_only_fields = ('id', 'username')
 
 

diff --git a/api/tests/serializer_tests.py b/api/tests/serializer_tests.py
@@ -19,7 +19,7 @@ def test_attrs(self):
         self.assertEqual(
             self.serializer.Meta.fields, (
                 'id', 'username', 'stripe_card', 'stripe_customer',
-                'stripe_bank_account', 'last4', 'brand')
+                'stripe_bank_account', 'card_last4', 'card_brand')
         )
         self.assertEqual(
             self.serializer.Meta.read_only_fields, ('id', 'username'))

diff --git a/codesy/base/admin.py b/codesy/base/admin.py
@@ -22,7 +22,7 @@ class CodesyUserAdmin(UserAdmin):
          ),
         ('CC information',
             {'fields':
-                ('brand', 'last4')
+                ('card_brand', 'card_last4')
              }
          ),
 

diff --git a/codesy/base/migrations/0023_auto_20170415_2154.py b/codesy/base/migrations/0023_auto_20170415_2154.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-04-15 21:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0022_auto_20170410_0301'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='user',
+            old_name='brand',
+            new_name='card_brand',
+        ),
+        migrations.RenameField(
+            model_name='user',
+            old_name='last4',
+            new_name='card_last4',
+        ),
+    ]
diff --git a/codesy/base/models.py b/codesy/base/models.py
@@ -17,8 +17,8 @@ class User(AbstractUser):
     stripe_bank_account = models.CharField(max_length=100, blank=True)
     tos_acceptance_date = models.DateTimeField(null=True, blank=True)
     tos_acceptance_ip = models.CharField(max_length=20, blank=True)
-    last4 = models.CharField(max_length=4, blank=True)
-    brand = models.CharField(max_length=100, blank=True)
+    card_last4 = models.CharField(max_length=4, blank=True)
+    card_brand = models.CharField(max_length=100, blank=True)
     USERNAME_FIELD = 'username'
 
     def get_gravatar_url(self):

diff --git a/payments/templates/credit_card_page.html b/payments/templates/credit_card_page.html
@@ -4,7 +4,7 @@
     <div class="row">
         <div class="column medium-4 medium-offset-4 text-left">
             {% if request.user.stripe_customer %}
-                We saved your <b> {{request.user.brand}}</b> card ending in <b> {{ request.user.last4}} </b> with Stripe.
+                We saved your <b> {{request.user.card_brand}}</b> card ending in <b> {{ request.user.card_last4}} </b> with Stripe.
 
                 <div class="reveal" id="credit_card_form" data-reveal>
                     {% include "credit_card_form.html" %}

diff --git a/static/js/stripe-app.js b/static/js/stripe-app.js
@@ -17,8 +17,8 @@ $(window).load(function () {
         function prepare_data ({type, id, card, bank_account }){
             switch (type) {
                 case 'card':
-                    ( {last4, brand} = card)
-                    return {stripe_card: id, last4, brand}
+                    ;( {last4: card_last4, brand: card_brand} = card)
+                    return {stripe_card: id, card_last4, card_brand}
                     break;
                 case 'bank_account':
                     return {stripe_bank_account: id}