WebSVN – SmartDukaan – Diff – //trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

     return transaction.status
 def change_transaction_status(transaction_id, new_status, description, pickUp, orderType, source):
     transaction = get_transaction(transaction_id)
-    transaction.status = new_status
-    transaction.status_message = description
-    expectedDelayMap = {}
-    billingWarehouseIdMap = {}
-    billingWarehouseTxnMap = {}
     if new_status in (TransactionStatus.AUTHORIZED, TransactionStatus.FLAGGED, TransactionStatus.COD_IN_PROCESS):
         wallet_amount_used = 0.0
         for order in transaction.orders:
             wallet_amount_used = wallet_amount_used + order.wallet_amount
         if wallet_amount_used > 0:
             user_wallet = get_user_wallet(transaction.orders[0].customer_id)
             if user_wallet and user_wallet.amount < wallet_amount_used:
+                if new_status == TransactionStatus.AUTHORIZED:
+                    try:
+                        captured_amount = __capture_txn(transaction_id)
+                        add_amount_in_wallet(transaction.customer_id, captured_amount, transaction_id, WalletReferenceType.PURCHASE, False, True)
+                    except:
+                        pass
                 return False
             payment_client = PaymentClient().get_client()
             payments = payment_client.getPaymentForTxnId(order.transaction_id)
             wallet_payment_exist = False
             for payment in payments:
                     payment_client.updatePaymentDetails(payment.paymentId, "", "", "SUCCESS", "Payment Received", "", "", "", "", PaymentStatus.SUCCESS, "", None);
             if not wallet_payment_exist:
                 return False
             consume_wallet(transaction.orders[0].customer_id, wallet_amount_used, transaction_id, WalletReferenceType.PURCHASE)
+    transaction.status = new_status
+    transaction.status_message = description
+    expectedDelayMap = {}
+    billingWarehouseIdMap = {}
+    billingWarehouseTxnMap = {}
     ## Assign runner in case of delhi pincodes
     if transaction.orders[0].pickupStoreId:
         logistics_client = LogisticsClient().get_client()
         store = logistics_client.getPickupStore(transaction.orders[0].pickupStoreId)
         if delhi_pincodes.__contains__(store.pin):
                 raise TransactionServiceException(212, "Logistics Partner "+provider.name+ " Max Prepaid Amount Limit Violated Rs." +str(providerPrepaidLimit)+" Suggestion: Split Order!!!")
     if order.status in [OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.INVENTORY_LOW, OrderStatus.LOW_INV_PO_RAISED, OrderStatus.LOW_INV_REVERSAL_IN_PROCESS, OrderStatus.LOW_INV_NOT_AVAILABLE_AT_HOTSPOT, OrderStatus.CAPTURE_IN_PROCESS]:
         if not order.cod:
             if order.transaction.status == TransactionStatus.AUTHORIZED and order.transaction.payment_option!=capitalFloatPayMethod:
-                __capture_txn(order)
+                __capture_txn(order.transaction_id)
+                change_transaction_status(order.transaction_id, TransactionStatus.IN_PROCESS, "Payment received", PickUpType.COURIER, order.orderType, order.source)
         order.status = OrderStatus.ACCEPTED
         order.statusDescription = "Order Accepted"
         order.accepted_timestamp = datetime.datetime.now()
         txnSeqRequired = 0
         txnShipSeq = TransactionShipmentSequence.query.filter(TransactionShipmentSequence.transactionId==order.transaction_id).order_by(desc(TransactionShipmentSequence.id)).first()
         return True
     else:
         logging.warning("Accept called for the unacceptable order: " + str(orderId))
         return False
-def __capture_txn(order):
+def __capture_txn(txnId):
-    txnId = order.transaction_id
     logging.info("Capturing payment for merchant txn:" + str(txnId))
+    captured_amount = 0
     try:
         payment_client = PaymentClient().get_client()
-        payments = payment_client.getPaymentForTxnId(order.transaction_id)
+        payments = payment_client.getPaymentForTxnId(txnId)
         for payment in payments:
             if payment.gatewayId in (gvGatewayId, walletGatewayId):
                 continue
             capture_result = payment_client.capturePayment(txnId, False)
             if capture_result:
+                captured_amount = captured_amount + payment.amount
                 logging.info("Successfully captured payment for merchant txn:" + str(txnId))
-                change_transaction_status(txnId, TransactionStatus.IN_PROCESS, "Payment received", PickUpType.COURIER, order.orderType, order.source)
+                #change_transaction_status(txnId, TransactionStatus.IN_PROCESS, "Payment received", PickUpType.COURIER, order.orderType, order.source)
             else:
                 raise TransactionServiceException(115, "Payment capture failed.")
+        return captured_amount
     except PaymentException as e:
         if e.error_code == 106:
-            order.status = OrderStatus.CAPTURE_IN_PROCESS
+            #order.status = OrderStatus.CAPTURE_IN_PROCESS
-            session.commit()
+            #session.commit()
             raise TransactionServiceException(122, "Unable to capture payment due to connection issue.")
         else:
             raise TransactionServiceException(115, "Payment capture failed.")
 def __amend_fulfilment_warehouse(order):
                 ## User is trying to play smart. Let us first mark his recharge failed and then credit payment amount to his wallet.
                 recharge_order.status = RechargeOrderStatus.RECHARGE_FAILED
                 recharge_order.responseTimestamp = datetime.datetime.now()
                 session.commit()
                 #update_amount_in_wallet(recharge_order.userId, recharge_order.totalAmount - recharge_order.walletAmount - recharge_order.couponAmount, recharge_order.id, 0)
-                consume_wallet(recharge_order.userId, recharge_order.totalAmount - recharge_order.walletAmount - recharge_order.couponAmount, recharge_order.id, WalletReferenceType.RECHARGE)
+                add_amount_in_wallet(recharge_order.userId, recharge_order.totalAmount - recharge_order.walletAmount - recharge_order.couponAmount, recharge_order.id, WalletReferenceType.RECHARGE,False, True)
                 raise TransactionServiceException(103, 'Wallet amount has already been used')
         try:
             if activate_recharge_txn(recharge_order):
                 recharge_order.invoiceNumber = get_next_invoice_number(OrderType.RECHARGE)
     for order in updatedOrders:
         if order.status in [OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.INVENTORY_LOW, OrderStatus.LOW_INV_PO_RAISED, OrderStatus.LOW_INV_REVERSAL_IN_PROCESS, OrderStatus.LOW_INV_NOT_AVAILABLE_AT_HOTSPOT, OrderStatus.CAPTURE_IN_PROCESS]:
             if not order.cod:
                 if order.transaction.status == TransactionStatus.AUTHORIZED and order.transaction.payment_option != capitalFloatPayMethod:
-                    __capture_txn(order)
+                    __capture_txn(order.transaction_id)
+                    change_transaction_status(order.transaction_id, TransactionStatus.IN_PROCESS, "Payment received", PickUpType.COURIER, order.orderType, order.source)
         break
     ''' Change IP using Config Client and Handle Exception '''
     try:
         inventoryDbHost = str(ConfigClient().get_property("inventory_service_db_hostname"))
         conn = getDbConnection(inventoryDbHost,"root", "shop2020", "inventory")

Subversion Repositories SmartDukaan

(root)//trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py – Rev 20933 → 20936