new payment gateway

SAY-DAO · Nov 29, 2023 · 25e7563 · 25e7563
1 parent 90f19ed
commit 25e7563
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 24 deletions.
diff --git a/alembic/versions/4fbd5bfb97bd_.py b/alembic/versions/4fbd5bfb97bd_.py
@@ -1,11 +1,8 @@
 """empty message
 
 Revision ID: 4fbd5bfb97bd
-<<<<<<< HEAD
 Revises: 389f9919c78d
-=======
 Revises: 23554e6d0034
->>>>>>> release
 Create Date: 2023-03-16 18:18:05.708589
 
 """
@@ -22,15 +19,12 @@
 
 
 def upgrade():
-<<<<<<< HEAD
     # ### commands auto generated by Alembic - please adjust! ###
     import say
 
-=======
     import say
 
     # ### commands auto generated by Alembic - please adjust! ###
->>>>>>> release
     op.add_column(
         'child', sa.Column('adult_avatar_url', say.orm.types.ResourceURL(), nullable=True)
     )

diff --git a/say/api/need_api.py b/say/api/need_api.py
@@ -605,18 +605,14 @@ def post(self):
 
         image_url = image_path
 
-<<<<<<< HEAD
         category = request.form.get('category')
         if not category:
             return {'message': 'error: category is required!'}, 400
 
-=======
-
         category = request.form.get('category')
         if not category:
             return {'message': 'error: category is required!'}, 400
 
->>>>>>> release
         try:
             category = int(request.form['category'])
         except ValueError:

diff --git a/say/content/fa.py b/say/content/fa.py
@@ -1,10 +1,7 @@
 class ContentFA:
-<<<<<<< HEAD
     CONFIRM_PHONE = '%s کد تایید شش رقمی شما در SAY است.لغو11 '
     RESET_PASSWORD = 'برای تغییر گذرواژ روی لینک زیر کلیک کنید.\n%s لغو11 \n%s'
     INSTALLION = 'برای استفاده آسان از SAY آن را نصب کنید.\n%s'
-=======
     CONFIRM_PHONE = "%s کد تایید شش رقمی شما در SAY است.لغو11 "
     RESET_PASSWORD = "برای تغییر گذرواژ روی لینک زیر کلیک کنید. \n%s لغو11"
     INSTALLION = "برای استفاده آسان از SAY آن را نصب کنید.\n%s"
->>>>>>> release
diff --git a/say/models/child_model.py b/say/models/child_model.py
@@ -103,7 +103,6 @@ class Child(base, Timestamp):
     adultAvatarUrl = synonym('adult_avatar_url')
     availableNeedsCount = synonym('available_needs_count')
     totalNeedsCount = synonym('total_needs_count')
-<<<<<<< HEAD
 
     city = relationship('City', foreign_keys=city_id, lazy='selectin')
     birth_place = relationship('City', foreign_keys=birth_place_id)
@@ -126,8 +125,6 @@ class Child(base, Timestamp):
         'ChildMigration',
         back_populates='child',
     )
-=======
->>>>>>> release
 
     @hybrid_property
     def avatarUrl(self):
@@ -232,8 +229,6 @@ def is_gone(cls):
         .correlate_except(Need),
     )
 
-<<<<<<< HEAD
-=======
     needs = relationship(
         'Need',
         back_populates='child',

diff --git a/say/schema/payment.py b/say/schema/payment.py
@@ -10,10 +10,7 @@ class NewPaymentSchema(CamelModel):
     amount: conint(gt=0)
     donate: conint(ge=0) = 0
     use_credit: bool = True
-<<<<<<< HEAD
-=======
     gateWay: int = 1
->>>>>>> release
 
 
 class PaymentSchema(CamelModel):

diff --git a/tests/panel/need/test_add_need.py b/tests/panel/need/test_add_need.py
@@ -2,10 +2,7 @@
 
 import ujson
 
-<<<<<<< HEAD
 from say.models import Need
-=======
->>>>>>> release
 from tests.helper import BaseTestClass