update user save field

coderj001 · coderj001 · commit e814c1d69ad6 · 2021-08-09T14:03:50.000+05:30
diff --git a/tax/models.py b/tax/models.py
@@ -80,7 +80,7 @@ def tax_calculate(self):
         sgst = 0
         tax_rate = 0
         income = float(self.income)
-        if self.tax_payer.indian_state == '':
+        if self.tax_payer.state == '':
             self.tax_amount = 0
             return None
         if self.tax_payer is not None:
diff --git a/user/migrations/0003_auto_20210809_1355.py b/user/migrations/0003_auto_20210809_1355.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.2.6 on 2021-08-09 08:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0002_auto_20210809_1351'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='user',
+            name='indian_state',
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='state',
+            field=models.CharField(choices=[('Andhra Pradesh', 'Andhra Pradesh'), ('Arunachal Pradesh', 'Arunachal Pradesh'), ('Assam', 'Assam'), ('Bihar', 'Bihar'), ('Chhattisgarh', 'Chhattisgarh'), ('Goa', 'Goa'), ('Gujarat', 'Gujarat'), ('Haryana', 'Haryana'), ('Himachal Pradesh', 'Himachal Pradesh'), ('Jharkhand', 'Jharkhand'), ('Karnataka', 'Karnataka'), ('Kerala', 'Kerala'), ('Madhya Pradesh', 'Madhya Pradesh'), ('Maharashtra', 'Maharashtra'), ('Manipur', 'Manipur'), ('Meghalaya', 'Meghalaya'), ('Mizora', 'Mizora'), ('Nagaland', 'Nagaland'), ('Odisha', 'Odisha'), ('Punjab', 'Punjab'), ('Rajasthan', 'Rajasthan'), ('Sikkim', 'Sikkim'), ('Tamil Nadu', 'Tamil Nadu'), ('Telangana', 'Telangana'), ('Tripura', 'Tripura'), ('Uttar Pradesh', 'Uttar Pradesh'), ('Uttarakhand', 'Uttarakhand'), ('West Bengal', 'West Bengal'), ('Andaman and Nicobar Island', 'Andaman and Nicobar Island'), ('Chandigarh', 'Chandigarh'), ('Dadra and Nagar Haveli and Daman and Diu', 'Dadra and Nagar Haveli and Daman and Diu'), ('Delhi', 'Delhi'), ('Ladakh', 'Ladakh'), ('Lakshadweep', 'Lakshadweep'), ('Jammu and Kashmir', 'Jammu and Kashmir'), ('Puducherry', 'Puducherry')], default='', max_length=100, verbose_name='State'),
+        ),
+    ]
diff --git a/user/migrations/0004_alter_user_state.py b/user/migrations/0004_alter_user_state.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.6 on 2021-08-09 08:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0003_auto_20210809_1355'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='state',
+            field=models.CharField(blank=True, choices=[('Andhra Pradesh', 'Andhra Pradesh'), ('Arunachal Pradesh', 'Arunachal Pradesh'), ('Assam', 'Assam'), ('Bihar', 'Bihar'), ('Chhattisgarh', 'Chhattisgarh'), ('Goa', 'Goa'), ('Gujarat', 'Gujarat'), ('Haryana', 'Haryana'), ('Himachal Pradesh', 'Himachal Pradesh'), ('Jharkhand', 'Jharkhand'), ('Karnataka', 'Karnataka'), ('Kerala', 'Kerala'), ('Madhya Pradesh', 'Madhya Pradesh'), ('Maharashtra', 'Maharashtra'), ('Manipur', 'Manipur'), ('Meghalaya', 'Meghalaya'), ('Mizora', 'Mizora'), ('Nagaland', 'Nagaland'), ('Odisha', 'Odisha'), ('Punjab', 'Punjab'), ('Rajasthan', 'Rajasthan'), ('Sikkim', 'Sikkim'), ('Tamil Nadu', 'Tamil Nadu'), ('Telangana', 'Telangana'), ('Tripura', 'Tripura'), ('Uttar Pradesh', 'Uttar Pradesh'), ('Uttarakhand', 'Uttarakhand'), ('West Bengal', 'West Bengal'), ('Andaman and Nicobar Island', 'Andaman and Nicobar Island'), ('Chandigarh', 'Chandigarh'), ('Dadra and Nagar Haveli and Daman and Diu', 'Dadra and Nagar Haveli and Daman and Diu'), ('Delhi', 'Delhi'), ('Ladakh', 'Ladakh'), ('Lakshadweep', 'Lakshadweep'), ('Jammu and Kashmir', 'Jammu and Kashmir'), ('Puducherry', 'Puducherry')], default='', max_length=100, null=True, verbose_name='State'),
+        ),
+    ]
diff --git a/user/models.py b/user/models.py
@@ -97,11 +97,13 @@ class User(AbstractBaseUser, PermissionsMixin):
         ('Jammu and Kashmir', 'Jammu and Kashmir'),
         ('Puducherry', 'Puducherry')
     )
-    indian_state = models.CharField(
+    state = models.CharField(
         max_length=100,
         choices=state_choice,
         default='',
-        verbose_name='Indian State'
+        verbose_name='State',
+        blank=True,
+        null=True
     )
     union_territories = models.BooleanField(default=False)
 
@@ -127,17 +129,18 @@ def __str__(self):
         return str(self.username)
 
     def save(self, *args, **kwargs):
-        if self.state in [
-            'Andaman and Nicobar Island',
-            'Chandigarh',
-            'Dadra and Nagar Haveli and Daman and Diu',
-            'Delhi',
-            'Ladakh',
-            'Lakshadweep',
-            'Jammu and Kashmir',
-            'Puducherry'
-        ]:
-            self.union_territories = True
-        else:
-            self.union_territories = False
+        if self.state:
+            if self.state in [
+                'Andaman and Nicobar Island',
+                'Chandigarh',
+                'Dadra and Nagar Haveli and Daman and Diu',
+                'Delhi',
+                'Ladakh',
+                'Lakshadweep',
+                'Jammu and Kashmir',
+                'Puducherry'
+            ]:
+                self.union_territories = True
+            else:
+                self.union_territories = False
         super(User, self).save(*args, **kwargs)
