Model additions for timezone & invoices sent out

invoices timezone change

Updated latest migration

factory addition

Author: mrsaicharan1

app/api/schema/settings.py

@@ -203,7 +203,7 @@ class Meta:
 
     # Event Invoices settings
     invoices_sent_day = fields.Integer(allow_none=False, default=1)
-    timezone = fields.Integer(allow_none=False, default="UTC")
+    invoices_timezone = fields.Str(allow_none=False, default="UTC")
 
     # Admin Invoice Details
     admin_billing_contact_name = fields.Str(allow_none=True)

app/factories/setting.py

@@ -104,6 +104,10 @@ class Meta:
     facebook_url = common.url_
     youtube_url = common.url_
 
+    # Event Invoices settings
+    invoices_sent_day = common.integer_
+    invoices_timezone = common.timezone_
+
     #
     # Generators
     #

app/models/setting.py

@@ -135,7 +135,7 @@ class Setting(db.Model):
     # Event Invoices settings
     #
     invoices_sent_day = db.Column(db.Integer, nullable=False, default=1)
-    timezone = db.Column(db.String, nullable=False, default="UTC")
+    invoices_timezone = db.Column(db.String, nullable=False, default="UTC")
     #
     # Admin Invoice Details
     #
@@ -219,7 +219,7 @@ def __init__(self,
                  alipay_publishable_key=None,
                  alipay_secret_key=None,
                  invoices_sent_day=None,
-                 timezone=None,
+                 invoices_timezone=None,
                  admin_billing_contact_name=None,
                  admin_billing_phone=None,
                  admin_billing_email=None,
@@ -302,7 +302,7 @@ def __init__(self,
         self.alipay_secret_key = alipay_secret_key
 
         # Event Invoice settings
-        self.timezone = timezone
+        self.invoices_timezone = invoices_timezone
         self.invoices_sent_day = invoices_sent_day
 
         # Admin Invoice Details

migrations/versions/3ac0865a789d_.py

@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: 3ac0865a789d
+Revises: 2c7ff9781032
+Create Date: 2019-07-01 16:07:58.026171
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+
+
+# revision identifiers, used by Alembic.
+revision = '3ac0865a789d'
+down_revision = '4279c2ac565b'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('settings', sa.Column('invoices_sent_day', sa.Integer(), server_default='1', nullable=False))
+    op.add_column('settings', sa.Column('invoices_timezone', sa.String(), server_default='UTC', nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('settings', 'invoices_timezone')
+    op.drop_column('settings', 'invoices_sent_day')
+    # ### end Alembic commands ###