| Line 2893... |
Line 2893... |
| 2893 |
newSod.cardRefundAmount = oldSod.cardRefundAmount
|
2893 |
newSod.cardRefundAmount = oldSod.cardRefundAmount
|
| 2894 |
newSod.edcBank = oldSod.edcBank
|
2894 |
newSod.edcBank = oldSod.edcBank
|
| 2895 |
newSod.payStatus = oldSod.payStatus
|
2895 |
newSod.payStatus = oldSod.payStatus
|
| 2896 |
newSod.cardType = oldSod.cardType
|
2896 |
newSod.cardType = oldSod.cardType
|
| 2897 |
session.commit()
|
2897 |
session.commit()
|
| - |
|
2898 |
if order.source == 3:
|
| - |
|
2899 |
old_amazon_order = AmazonOrder.get_by(orderId=order.id)
|
| - |
|
2900 |
amazon_order = AmazonOrder()
|
| - |
|
2901 |
amazon_order.orderId = new_order.id
|
| - |
|
2902 |
amazon_order.amazonOrderCode = old_amazon_order.amazonOrderCode
|
| - |
|
2903 |
amazon_order.amazonOrderItemCode = old_amazon_order.amazonOrderItemCode
|
| - |
|
2904 |
amazon_order.transactionId = old_amazon_order.transactionId
|
| - |
|
2905 |
amazon_order.item_id= old_amazon_order.item_id
|
| - |
|
2906 |
amazon_order.status= old_amazon_order.status
|
| - |
|
2907 |
amazon_order.purchaseDateOnAmazon= old_amazon_order.purchaseDateOnAmazon
|
| - |
|
2908 |
session.commit()
|
| 2898 |
|
2909 |
|
| 2899 |
return new_order
|
2910 |
return new_order
|
| 2900 |
|
2911 |
|
| 2901 |
def __create_return_order(order):
|
2912 |
def __create_return_order(order):
|
| 2902 |
ret_order = ReturnOrder(order)
|
2913 |
ret_order = ReturnOrder(order)
|
| Line 4471... |
Line 4482... |
| 4471 |
currentOrders[RechargeOrderStatus._VALUES_TO_NAMES.get(RechargeOrderStatus.RECHARGE_FAILED_REFUNDED)] = [order.to_thrift_object() for order in rorders]
|
4482 |
currentOrders[RechargeOrderStatus._VALUES_TO_NAMES.get(RechargeOrderStatus.RECHARGE_FAILED_REFUNDED)] = [order.to_thrift_object() for order in rorders]
|
| 4472 |
|
4483 |
|
| 4473 |
twa = session.query(func.sum(UserWallet.amount)).one()
|
4484 |
twa = session.query(func.sum(UserWallet.amount)).one()
|
| 4474 |
tra = session.query(func.sum(RechargeOrder.totalAmount)).filter(RechargeOrder.status == RechargeOrderStatus.RECHARGE_SUCCESSFUL).one()
|
4485 |
tra = session.query(func.sum(RechargeOrder.totalAmount)).filter(RechargeOrder.status == RechargeOrderStatus.RECHARGE_SUCCESSFUL).one()
|
| 4475 |
gwa = session.query(func.sum(UserWalletHistory.amount)).filter(UserWalletHistory.orderId > 100000).one()
|
4486 |
gwa = session.query(func.sum(UserWalletHistory.amount)).filter(UserWalletHistory.orderId > 100000).one()
|
| 4476 |
#tpa = session.query(func.sum(UserWalletHistory.amount)).filter(UserWalletHistory.orderId < 100000).one()
|
4487 |
dit2 = session.query(func.sum(WalletHistoryForCompany.amount)).filter(WalletHistoryForCompany.walletId == 2).filter(WalletHistoryForCompany.amount >= 100000).one()
|
| 4477 |
tpa = session.query(func.sum(RechargeOrder.totalAmount-RechargeOrder.walletAmount-RechargeOrder.couponAmount)).filter(RechargeOrder.status.in_((RechargeOrderStatus.RECHARGE_SUCCESSFUL, RechargeOrderStatus.RECHARGE_FAILED, RechargeOrderStatus.PAYMENT_SUCCESSFUL, RechargeOrderStatus.RECHARGE_FAILED_REFUNDED))).one()
|
4488 |
tpa = session.query(func.sum(RechargeOrder.totalAmount-RechargeOrder.walletAmount-RechargeOrder.couponAmount)).filter(RechargeOrder.status.in_((RechargeOrderStatus.RECHARGE_SUCCESSFUL, RechargeOrderStatus.RECHARGE_FAILED, RechargeOrderStatus.PAYMENT_SUCCESSFUL, RechargeOrderStatus.RECHARGE_FAILED_REFUNDED))).one()
|
| 4478 |
tda = session.query(func.sum(RechargeOrder.couponAmount)).filter(RechargeOrder.status == RechargeOrderStatus.RECHARGE_SUCCESSFUL).one()
|
4489 |
tda = session.query(func.sum(RechargeOrder.couponAmount)).filter(RechargeOrder.status == RechargeOrderStatus.RECHARGE_SUCCESSFUL).one()
|
| 4479 |
|
4490 |
|
| 4480 |
balance = RechargeService.getBalance()
|
4491 |
balance = RechargeService.getBalance()
|
| 4481 |
amounts['(a) Total Payment Amount'] = tpa[0]
|
4492 |
amounts['(a) Total Payment Amount'] = tpa[0]
|
| 4482 |
amounts['(b) Gift Wallet Amount'] = gwa[0]
|
4493 |
amounts['(b) Gift Wallet Amount'] = gwa[0]
|
| 4483 |
amounts['(c) Total Wallet Amount'] = twa[0]
|
4494 |
amounts['(c) Total Wallet Amount'] = twa[0]
|
| 4484 |
amounts['(d) Total Recharge Amount'] = tra[0]
|
4495 |
amounts['(d) Total Recharge Amount'] = tra[0]
|
| 4485 |
amounts['(e) Account Balance'] = balance
|
- |
|
| 4486 |
amounts['(f) Discount Balance'] = tda[0]
|
4496 |
amounts['(e) Discount Balance'] = tda[0]
|
| 4487 |
#amounts['Total Payment Amount'] = tra[0] + twa[0] - gwa[0]
|
- |
|
| 4488 |
amounts['Saholic Mismatch = (a+b+f-c-d)'] = tpa[0] + gwa[0] + tda[0] - tra[0] - (twa[0] + 63774)
|
4497 |
amounts['Saholic Mismatch = (a+b+f-c-d)'] = tpa[0] + gwa[0] + tda[0] - tra[0] - twa[0] + 57607
|
| 4489 |
amounts['SpiceDeck Mismatch = (d-e)'] = tra[0] + balance - 750000
|
- |
|
| 4490 |
|
4498 |
|
| 4491 |
'''
|
4499 |
'''
|
| 4492 |
if amounts['SpiceDeck Mismatch = (d-e)'] != -739:
|
4500 |
if amounts['SpiceDeck Mismatch = (d-e)'] != -739:
|
| 4493 |
mail(mail_user, mail_password, ['rajneesh.arora@shop2020.in', 'rajveer.singh@shop2020.in', 'anupam.singh@shop2020.in'], "SpiceDeck Account mismatch of amount " + str(amounts['SpiceDeck Mismatch = (d-e)']), "", [], [], [])
|
4501 |
mail(mail_user, mail_password, ['rajneesh.arora@shop2020.in', 'rajveer.singh@shop2020.in', 'anupam.singh@shop2020.in'], "SpiceDeck Account mismatch of amount " + str(amounts['SpiceDeck Mismatch = (d-e)']), "", [], [], [])
|
| 4494 |
if amounts['Saholic Mismatch = (a+b-c-d)'] != -1919:
|
4502 |
if amounts['Saholic Mismatch = (a+b-c-d)'] != -1919:
|