Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion app/api/helpers/payment.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from app.api.helpers.utilities import represents_int
from app.models.stripe_authorization import StripeAuthorization
from app.settings import get_settings, Environment
from app.api.helpers.db import safe_query
from app.api.helpers.db import safe_query, save_to_db
from app.models import db
from app.models.order import Order

Expand Down Expand Up @@ -204,6 +204,47 @@ def create_payment(order, return_url, cancel_url):
else:
return False, payment.error

@staticmethod
def verify_payment(payment_id, order):
"""
Verify Paypal payment one more time for paying with Paypal in mobile client
"""
try:
payment_server = paypalrestsdk.Payment.find(payment_id)
if payment_server.state != 'approved':
return False, 'Payment has not been approved yet. Status is ' + payment_server.state + '.'

# Get the most recent transaction
transaction = payment_server.transactions[0]
amount_server = transaction.amount.total
currency_server = transaction.amount.currency
sale_state = transaction.related_resources[0].sale.state

if amount_server != order.amount:
return False, 'Payment amount does not match order'
elif currency_server != order.event.payment_currency:
return False, 'Payment currency does not match order'
if sale_state != 'completed':
return False, 'Sale not completed'
elif PayPalPaymentsManager.used_payment(payment_id, order):
return False, 'Payment already been verified'
else:
return True, None
except paypalrestsdk.ResourceNotFound:
return False, 'Payment Not Found'

@staticmethod
def used_payment(payment_id, order):
"""
Function to check for recycling of payment IDs
"""
if Order.query.filter(Order.paypal_token == payment_id).first() is None:
order.paypal_token = payment_id
save_to_db(order)
return False
else:
return True

@staticmethod
def execute_payment(paypal_payer_id, paypal_payment_id):
"""
Expand Down
16 changes: 16 additions & 0 deletions app/api/orders.py
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,22 @@ def create_paypal_payment(order_identifier):
return jsonify(status=False, error=response)


@order_misc_routes.route('/orders/<string:order_identifier>/verify-mobile-paypal-payment', methods=['POST'])
@jwt_required
def verify_mobile_paypal_payment(order_identifier):
"""
Verify paypal payment made on mobile client
:return: The status of order verification
"""
try:
payment_id = request.json['data']['attributes']['payment-id']
except TypeError:
return BadRequestError({'source': ''}, 'Bad Request Error').respond()
order = safe_query(db, Order, 'identifier', order_identifier, 'identifier')
status, error = PayPalPaymentsManager.verify_payment(payment_id, order)
return jsonify(status=status, error=error)


@alipay_blueprint.route('/create_source/<string:order_identifier>', methods=['GET', 'POST'])
def create_source(order_identifier):
"""
Expand Down