remove unn changes

Author: mrsaicharan1

app/api/schema/orders.py

@@ -61,7 +61,7 @@ def initial_values(self, data):
     payment_mode = fields.Str(
                             default="free",
                             validate=validate.OneOf(choices=["free", "stripe", "paypal", "bank",
-                                                             "cheque", "onsite", "omise", "alipay"]),
+                                                             "cheque", "onsite", "omise", "alipay", "paytm"]),
                             allow_none=True)
     paid_via = fields.Str(dump_only=True)
     is_billing_enabled = fields.Boolean(default=False)

app/api/schema/settings.py

@@ -183,6 +183,12 @@ class Meta:
     alipay_publishable_key = fields.Str(allow_none=True)
     alipay_secret_key = fields.Str(allow_none=True)
 
+    # payTM credentials
+    paytm_mode = fields.Str(allow_none=True)
+    paytm_live_merchant = fields.Str(allow_none=True)
+    paytm_live_secret = fields.Str(allow_none=True)
+    paypal_sandbox_merchant = fields.Str(allow_none=True)
+    paypal_sandbox_secret = fields.Str(allow_none=True)
     #
     # EMAIL
     #

app/models/setting.py

@@ -102,6 +102,13 @@ class Setting(db.Model):
     omise_test_public = db.Column(db.String)
     omise_test_secret = db.Column(db.String)
 
+    # payTM credentials
+    paytm_mode = db.Column(db.String)
+    paytm_live_merchant = db.Column(db.String)
+    paytm_live_secret = db.Column(db.String)
+    paytm_sandbox_merchant = db.Column(db.String)
+    paytm_sandbox_secret = db.Column(db.String)
+
     #
     # EMAIL
     #
@@ -219,6 +226,11 @@ def __init__(self,
                  omise_live_secret=None,
                  alipay_publishable_key=None,
                  alipay_secret_key=None,
+                 paytm_mode=None,
+                 paytm_live_merchant=None,
+                 paytm_live_secret=None,
+                 paytm_sandbox_merchant=None,
+                 paytm_sandbox_secret=None,
                  invoice_sending_day=None,
                  invoice_sending_timezone=None,
                  admin_billing_contact_name=None,
@@ -303,6 +315,13 @@ def __init__(self,
         self.alipay_publishable_key = alipay_publishable_key
         self.alipay_secret_key = alipay_secret_key
 
+        # Paytm Credentials
+        self.paytm_mode = paytm_mode
+        self.paytm_sandbox_merchant = paytm_sandbox_merchant
+        self.paytm_sandbox_secret = paytm_sandbox_secret
+        self.paytm_live_merchant = paytm_live_merchant
+        self.paytm_live_secret = paytm_live_secret
+
         # Event Invoice settings
         self.invoice_sending_timezone = invoice_sending_timezone
         self.invoice_sending_day = invoice_sending_day
@@ -356,3 +375,12 @@ def is_omise_activated(self):
             return True
         else:
             return False
+
+    @hybrid_property
+    def is_paytm_activated(self):
+        if self.paytm_mode == 'sandbox' and self.paytm_sandbox_merchant and self.paytm_sandbox_secret:
+            return True
+        elif self.paytm_live_secret and self.paytm_live_merchant:
+            return True
+        else:
+            return False

migrations/versions/8eecd0406101_.py

@@ -0,0 +1,36 @@
+"""empty message
+
+Revision ID: 8eecd0406101
+Revises: 96bca587b3ca
+Create Date: 2019-07-29 16:21:30.237899
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+
+
+# revision identifiers, used by Alembic.
+revision = '8eecd0406101'
+down_revision = '96bca587b3ca'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('settings', sa.Column('paytm_live_merchant', sa.String(), nullable=True))
+    op.add_column('settings', sa.Column('paytm_live_secret', sa.String(), nullable=True))
+    op.add_column('settings', sa.Column('paytm_mode', sa.String(), nullable=True))
+    op.add_column('settings', sa.Column('paytm_sandbox_merchant', sa.String(), nullable=True))
+    op.add_column('settings', sa.Column('paytm_sandbox_secret', sa.String(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('settings', 'paytm_sandbox_secret')
+    op.drop_column('settings', 'paytm_sandbox_merchant')
+    op.drop_column('settings', 'paytm_mode')
+    op.drop_column('settings', 'paytm_live_secret')
+    op.drop_column('settings', 'paytm_live_merchant')
+    # ### end Alembic commands ###