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

             __update_inventory_reservation(order)
             order.statusDescription = "Order Cancelled"
         elif order.status == OrderStatus.BILLED:
             __create_return_order(order)
             order.statusDescription = "Order Cancelled"
+        elif order.status == OrderStatus.SALES_RET_RECEIVED:
+            __create_return_order(order)
+            order.statusDescription = "Order Returned to origin"
-        elif order.status in [OrderStatus.SALES_RET_RECEIVED, OrderStatus.DOA_CERT_INVALID, OrderStatus.DOA_CERT_VALID] :
+        elif order.status in [OrderStatus.DOA_CERT_INVALID, OrderStatus.DOA_CERT_VALID] :
             __create_return_order(order)
             __create_refund(order)
             order.statusDescription = "Order Refunded"
     else:
         status_transition = {OrderStatus.SALES_RET_RECEIVED : OrderStatus.SALES_RET_REFUNDED,
 def __create_return_order(order):
     ret_order = ReturnOrder(order)
     return ret_order
 def __create_refund(order):
-    if not order.cod:
-        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.total_amount)
     return
 def __create_cancellation(order):
     return

Subversion Repositories SmartDukaan