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

         status_transition = refund_status_transition
         if order.status not in status_transition.keys():
             raise TransactionServiceException(114, "This order can't be refunded")
         if order.status in [OrderStatus.COD_VERIFICATION_PENDING, 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.ACCEPTED]:
-            __update_inventory_reservation(order)
+            __update_inventory_reservation(order, refund=True)
             order.statusDescription = "Order Cancelled"
             #Shipment Id and Airway Bill No should be none in case of Cancellation
             order.logisticsTransactionId = None
             order.tracking_id = None
             order.airwaybill_no = None
                 __create_return_order(order)
             __create_refund(order)
             order.statusDescription = "Return Refunded"
         elif order.status == OrderStatus.CANCEL_REQUEST_CONFIRMED:
             if order.previousStatus in [OrderStatus.COD_VERIFICATION_PENDING, 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.ACCEPTED]:
-                __update_inventory_reservation(order)
+                __update_inventory_reservation(order, refund=True)
                 order.statusDescription = "Order Cancelled on customer request"
             elif order.previousStatus == OrderStatus.BILLED:
                 __create_return_order(order)
                 order.statusDescription = "Order Cancelled on customer request"
                 order.received_return_timestamp = datetime.datetime.now()
             if order.status != OrderStatus.RET_LOST_IN_TRANSIT:
                 __create_return_order(order)
             __create_refund(order)
             order.statusDescription = "Return Refunded"
         elif 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.ACCEPTED]:
-            __update_inventory_reservation(order)
+            __update_inventory_reservation(order, refund=True)
             order.statusDescription = "Order Refunded"
         elif order.status == OrderStatus.BILLED:
             if order.source == OrderSource.SNAPDEAL or order.source == OrderSource.EBAY or order.source == OrderSource.FLIPKART or order.source == OrderSource.HOMESHOP18:
                 order.statusDescription = "Order Cancelled"
                 order.received_return_timestamp = datetime.datetime.now()
         elif order.status == OrderStatus.CANCEL_REQUEST_CONFIRMED:
             if order.previousStatus 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.PAYMENT_FLAGGED, OrderStatus.ACCEPTED]:
                 if order.previousStatus == OrderStatus.ACCEPTED:
                     __create_refund(order)
-                __update_inventory_reservation(order)
+                __update_inventory_reservation(order, refund=True)
                 order.statusDescription = "Order Cancelled on customer request"
             elif order.previousStatus == OrderStatus.BILLED:
                 __create_return_order(order)
                 __create_refund(order)
                 order.statusDescription = "Order Cancelled on customer request"
                 order.received_return_timestamp = datetime.datetime.now()
         elif order.status == OrderStatus.PAYMENT_FLAGGED:
-            __update_inventory_reservation(order)
+            __update_inventory_reservation(order, refund=True)
             order.statusDescription = "Order Cancelled due to payment flagged"
         if order.transaction.payment_option == capitalFloatPayMethod and order.status in [OrderStatus.PAYMENT_FLAGGED, 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.ACCEPTED, OrderStatus.CANCEL_REQUEST_CONFIRMED]:
             total_amount = order.total_amount + order.shippingCost - order.gvAmount
             shipping_id = str(order.id)
     order.status = status_transition[order.status]
     order.refund_timestamp = datetime.datetime.now()
     order.refunded_by = refunded_by
     order.refund_reason = reason
     #to re evaluate the shipping charge if any order is being cancelled.
-    _revaluate_shiping(order_id)
+    #_revaluate_shiping(order_id)
     session.commit()
     return True
 def _revaluate_shiping(orderId):
     orders = Order.get_by(id = orderId)
                 if diff>0:
                     shipUpdateOrder.shippingCost = shipUpdateOrder.shippingCost + diff
-def __update_inventory_reservation(order):
+def __update_inventory_reservation(order, refund=False):
     '''
     Reduce the reservation count for all line items of the given order.
     '''
+    if refund:
+        if order.wallet_amount > 0:
+            refund_to_wallet(order.customer_id, order.wallet_amount, order.transaction.id, WalletReferenceType.PURCHASE, "Refunded angainst cancellation of Order Id -" + order.id)
+        if order.cod == False and order.status == OrderStatus.PAYMENT_FLAGGED_DENIED:
+            order.net
     try:
         inventoryClient = InventoryClient().get_client()
         for lineitem in order.lineitems:
             inventoryClient.reduceReservationCount(lineitem.item_id, order.fulfilmentWarehouseId, sourceId, order.id, lineitem.quantity)
     except:
 def __create_return_order(order):
     ret_order = ReturnOrder(order)
     return ret_order
 def __create_refund(order):
+    if order.net_payable_amount > 0:
-    payment_client = PaymentClient().get_client()
+        payment_client = PaymentClient().get_client()
-    payment_client.createRefund(order.id, order.transaction.id, order.total_amount)
+        payment_client.createRefund(order.id, order.transaction.id, order.net_payable_amount)
     return
 def __get_order_address(order):
     address = order.customer_name + "\n" + order.customer_address1 + "\n"
     if order.customer_address2:
     totalSuccessfulRechargeAmount = session.query(func.sum(RechargeOrder.totalAmount)).filter(RechargeOrder.status == 5).filter(RechargeOrder.ipAddress == clientAddress).filter(RechargeOrder.creationTimestamp  > limittime).scalar()
     return totalSuccessfulRechargeAmount
+def refund_to_wallet(userId, amount, reference, reference_type, description='Refunded to wallet', commit_session=False):
+    """
+    Commit to be decided by caller
+    """
+    if amount <= 0 or WalletReferenceType._VALUES_TO_NAMES.get(reference_type) is None:
+        return False
+    all_entries = UserWalletHistory.query.filter_by(reference = reference).filter_by(reference_type = WalletReferenceType._VALUES_TO_NAMES.get(reference_type)).all()
+    creditable_amount_for_reference = 0
+    refundable_amount_for_reference = 0
+    for history in all_entries:
+        creditable_amount_for_reference -= history.amount
+        refundable_amount_for_reference -= history.refundable_amount
+    #Refundable amount for reference should be greater than the refund amount
+    if creditable_amount_for_reference < amount:
+        print 'Cant be credited back to wallet as most of it has been already credited'
+        return False
+    wallet = get_user_wallet(userId)
+    wallet.amount = wallet.amount + amount
+    refundable_amount = 0
+    if creditable_amount_for_reference - refundable_amount_for_reference < amount:
+        refundable_amount = amount - (creditable_amount_for_reference - refundable_amount_for_reference)
+    wallet.refundable_amount = wallet.refundable_amount + refundable_amount
+    history = UserWalletHistory()
+    history.amount = amount
+    history.refundable_amount = refundable_amount
+    history.reference = reference
+    history.reference_type = WalletReferenceType._VALUES_TO_NAMES.get(reference_type)
+    history.wallet = wallet
+    history.timestamp = datetime.datetime.now()
+    history.description = description
+    if commit_session:
+        session.commit()
 def add_amount_in_wallet(userId, amount, reference, reference_type, isPromotional, description=None, commit_session=False):
     """
     Commit to be decided by caller
     """
     if not amount > 0 or WalletReferenceType._VALUES_TO_NAMES.get(reference_type) is None:

Subversion Repositories SmartDukaan

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