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

             #__create_return_order(order)
             order.statusDescription = "Lost in Transit Refunded"
         elif order.status in [OrderStatus.DOA_CERT_INVALID, OrderStatus.DOA_CERT_VALID, OrderStatus.DOA_RECEIVED_DAMAGED, OrderStatus.DOA_LOST_IN_TRANSIT] :
             if order.status != OrderStatus.DOA_LOST_IN_TRANSIT:
                 __create_return_order(order)
-            __create_refund(order)
+            __create_refund(order, 0, 'Should be unreachable for now')
             order.statusDescription = "DOA Refunded"
         elif order.status in [OrderStatus.RET_PRODUCT_UNUSABLE, OrderStatus.RET_PRODUCT_USABLE, OrderStatus.RET_RECEIVED_DAMAGED, OrderStatus.RET_LOST_IN_TRANSIT] :
             if order.status != OrderStatus.RET_LOST_IN_TRANSIT:
                 __create_return_order(order)
-            __create_refund(order)
+            __create_refund(order, 0, 'Should be unreachable for now')
             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, 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.transaction.payment_option == capitalFloatPayMethod and 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, OrderStatus.CANCEL_REQUEST_CONFIRMED]:
+#        if order.transaction.payment_option == capitalFloatPayMethod and 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, OrderStatus.CANCEL_REQUEST_CONFIRMED]:
-            total_amount = order.total_amount + order.shippingCost - order.gvAmount
+#            total_amount = order.total_amount + order.shippingCost - order.gvAmount
-            shipping_id = str(order.id)
+#            shipping_id = str(order.id)
-            if order.logisticsTransactionId is not None:
+#            if order.logisticsTransactionId is not None:
-                shipping_id = order.logisticsTransactionId
+#                shipping_id = order.logisticsTransactionId
-            creditObj = __creditHistoryObj(order.customer_id, 1, order.transaction.id, total_amount, CreditTxnType.BLOCKED_REVERSED, shipping_id)
+#            creditObj = __creditHistoryObj(order.customer_id, 1, order.transaction.id, total_amount, CreditTxnType.BLOCKED_REVERSED, shipping_id)
-            creditTxns = []
+#            creditTxns = []
-            creditTxns.append(creditObj)
+#            creditTxns.append(creditObj)
-            try:
+#            try:
-                process_credit_transaction(order.transaction.id, order.customer_id, 1, creditTxns)
+#                process_credit_transaction(order.transaction.id, order.customer_id, 1, creditTxns)
-            except:
+#            except:
-                traceback.print_exc()
+#                traceback.print_exc()
-                session.rollback()
+#                session.rollback()
-                return False
+#                return False
     else:
         status_transition = {OrderStatus.LOST_IN_TRANSIT : OrderStatus.LOST_IN_TRANSIT_REFUNDED,
                      OrderStatus.RTO_RECEIVED_PRESTINE : OrderStatus.RTO_REFUNDED,
                      OrderStatus.RTO_RECEIVED_DAMAGED : OrderStatus.RTO_DAMAGED_REFUNDED,
                      OrderStatus.RTO_LOST_IN_TRANSIT : OrderStatus.RTO_LOST_IN_TRANSIT_REFUNDED,
             raise TransactionServiceException(114, "This order can't be refunded")
         if order.status in [OrderStatus.RTO_RECEIVED_PRESTINE, OrderStatus.RTO_RECEIVED_DAMAGED, OrderStatus.RTO_LOST_IN_TRANSIT] :
             if order.status != OrderStatus.RTO_LOST_IN_TRANSIT:
                 __create_return_order(order)
-            __create_refund(order)
+            __create_refund(order, order.wallet_amount, 'Order #{0} is RTO refunded'.format(order.id))
             order.statusDescription = "RTO Refunded"
             #Start:- Added By Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013
             try:
                 crmServiceClient = CRMClient().get_client()
                 ticket =Ticket()
             except:
                 print "Ticket for RTO Refund is not created."
             #End:- Added By Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013
         elif order.status in [OrderStatus.LOST_IN_TRANSIT]:
             #__create_return_order(order)
-            __create_refund(order)
+            __create_refund(order, order.wallet_amount, 'Order #{0} is Lost in Transit'.format(order.id))
             order.statusDescription = "Lost in Transit Refunded"
         elif order.status in [OrderStatus.DOA_CERT_INVALID, OrderStatus.DOA_CERT_VALID, OrderStatus.DOA_RECEIVED_DAMAGED, OrderStatus.DOA_LOST_IN_TRANSIT] :
             if order.status != OrderStatus.DOA_LOST_IN_TRANSIT:
                 __create_return_order(order)
-            __create_refund(order)
+            __create_refund(order, 0, 'This should be unreachable')
             order.statusDescription = "DOA Refunded"
         elif order.status in [OrderStatus.RET_PRODUCT_UNUSABLE, OrderStatus.RET_PRODUCT_USABLE, OrderStatus.RET_RECEIVED_DAMAGED, OrderStatus.RET_LOST_IN_TRANSIT] :
             if order.status != OrderStatus.RET_LOST_IN_TRANSIT:
                 __create_return_order(order)
-            __create_refund(order)
+            __create_refund(order, 0, 'This should be unreachable')
             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, 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)
+                    __create_refund(order, order.wallet_amount, 'Order #{0} is refunded due to low inventory'.format(order.id))
-                __update_inventory_reservation(order, refund=True)
+                __update_inventory_reservation(order, refund=False)
                 order.statusDescription = "Order Cancelled on customer request"
             elif order.previousStatus == OrderStatus.BILLED:
                 __create_return_order(order)
-                __create_refund(order)
+                __create_refund(order, order.wallet_amount,  'Order #{0} Cancelled on customer request'.format(order.id))
                 order.statusDescription = "Order Cancelled on customer request"
                 order.received_return_timestamp = datetime.datetime.now()
         elif order.status == OrderStatus.PAYMENT_FLAGGED:
             __update_inventory_reservation(order, refund=True)
     '''
     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 -" + str(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):
+def __create_refund(order, refundAmount, reason="Order Refunded"):
+    if order.wallet_amount > 0:
+        refund_to_wallet(order.customer_id, refundAmount, order.transaction.id, WalletReferenceType.PURCHASE, reason)
     if order.net_payable_amount > 0:
         payment_client = PaymentClient().get_client()
         payment_client.createRefund(order.id, order.transaction.id, order.net_payable_amount)
     return
             else:
                 returnOrder.refundDescription = "No Pickup Required for this item. Refund in Process. It takes 7-10 working days to be in actual credit."
         else:
             raise TransactionServiceException(114, "This order can't be refunded")
-        __create_refund(order)
+        __create_refund(order, refundAmount, 'Refunded against #{0} {}pc(s)'.format(order.id, returnOrder.receivedQuantity))
         returnOrder.refundedAt = datetime.datetime.now()
         returnOrder.refundedBy = refundedBy
         returnOrder.refundReason = refundReason
         returnOrder.refundAmount = refundAmount

Subversion Repositories SmartDukaan

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