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

     RechargeType, RechargeStatistics, DeviceNumberInfo, EmiChargeType, PayMethod, \
     OrderSource, StorePaymentStatus, ProductCondition, TaxType, \
     AmazonFCWarehouseLocation, RechargeMode, CreditTxnType, CreditHistory as TCreditHistory, \
     LoanHistory as TLoanHistory, ShipmentLogisticsCostDetail as TShipmentLogisticsCostDetail, \
     ReturnTransactionStatus, ReturnAction, ReturnTxnResolutionStatus, ReplacementShippingType, \
-    ReturnTxnPickupStatus, ReceivedReturnType, ReturnPickupType
+    ReturnTxnPickupStatus, ReceivedReturnType, ReturnPickupType, RefundType
 from shop2020.thriftpy.model.v1.user.ttypes import VoucherType, CouponCategory, \
     User, Sex
 from shop2020.thriftpy.payments.ttypes import PaymentException
 from shop2020.thriftpy.utils.ttypes import UserSmsInfo, SmsType
 from shop2020.thriftpy.warehouse.ttypes import ScanType, \
         returnOrderInfo.returnStatus = OrderStatus._VALUES_TO_NAMES[OrderStatus.RET_REQUEST_RECEIVED]
     else:
         returnOrderInfo.returnStatus = OrderStatus._VALUES_TO_NAMES[OrderStatus.DOA_REQUEST_RECEIVED]
     returnOrderInfo.masterOrderId = order.logisticsTransactionId
     returnOrderInfo.warehouse_id = order.warehouse_id
-    returnOrderInfo.returnAction = ReturnAction._VALUES_TO_NAMES[returnInfo.returnAction]
+    returnOrderInfo.returnAction = returnInfo.returnAction
     returnOrderInfo.freebieItemId = order.freebieItemId
-    returnOrderInfo.returnAction = returnOrderInfo.returnAction
     returnOrderInfo.returnTxnResolutionStatus = ReturnTxnResolutionStatus._VALUES_TO_NAMES[ReturnTxnResolutionStatus.PENDING]
     session.commit()
     return returnOrderInfo
 def get_return_order_info(returnOrderId):
     returnOrder = ReturnOrderInfo.get_by(id=returnOrderId)
     if not returnOrder:
         return None
-    return order
+    return returnOrder
 def get_return_orders_info_map(order_ids=None, statuses=None):
     returnOrdersInfoQuery = ReturnOrderInfo.query
     if order_ids is not None and len(order_ids)>0:
         returnOrdersInfoQuery = returnOrdersInfoQuery.filter(ReturnOrderInfo.orderId.in_(tuple(order_ids)))
     for tOrder in t_orders:
         returnOrdersMap[tOrder.orderId] = tOrder.returnQuantity
     if validate_return_transaction(returnTransaction.customer_id, returnOrdersMap, itemCondition, overrideWarranty):
         returnTxn = ReturnTransaction()
-        singleOrder = get_order(t_orders[0].orderId)
         returnTxn.customer_id = returnTransaction.customer_id
         returnTxn.status = ReturnTransactionStatus._VALUES_TO_NAMES[ReturnTransactionStatus.INITIATED]
-        returnTxn.customer_email = singleOrder.customer_email
+        returnTxn.customer_email = returnTransaction.customer_email
-        returnTxn.customer_name = singleOrder.customer_name
+        returnTxn.customer_name = returnTransaction.customer_name
         returnTxn.createdAt = datetime.datetime.now()
         returnTxn.address_id = returnTransaction.address_id
         returnTxn.customerAddress = returnTransaction.customerAddress
         returnTxn.customerCity = returnTransaction.customerCity
         returnTxn.customerPhone = returnTransaction.customerPhone
             lineitem = order.lineitems[0]
             lineitem.returnQty = lineitem.returnQty + returnOrder.returnQuantity
             order.status = OrderStatus.PARTIAL_RETURN_IN_PROCESS
             order.statusDescription = "Partial Return In Process"
-        try:
             crmServiceClient = CRMClient().get_client()
             ticket =Ticket()
             activity = Activity()
             description = "Creating Ticket for return requested by customer:- " + str(returnTransaction.customer_name)  + " Return Transaction Id:- "+ str(returnTxn.id)
             activity.customerEmailId = returnTransaction.customer_email
             activity.customerMobileNumber = returnTransaction.customerPhone
             activity.customerName = returnTransaction.customer_name
             returnTxn.ticketId = crmServiceClient.insertTicket(ticket, activity)
-        except:
-            print "Ticket for RTO Refund is not created."
         session.commit()
-        return returnTxn.id
+        return returnTxn
-    return 0
+    return ReturnTransaction()
 def get_return_transactions_for_customer(statusList, customerMobile, customerEmail, returnTransactionId, customer_id):
     query = ReturnTransaction.query
     if statusList is not None and len(statusList) >0:
         statuses = []
                         ret_Order.returnTxnResolutionStatus = ReturnTxnResolutionStatus._VALUES_TO_NAMES[ReturnTxnResolutionStatus.REPLACEMENT_ORDER_CREATED]
                 returnTransaction.processedAt = datetime.datetime.now()
                 returnTransaction.status = ReturnTransactionStatus._VALUES_TO_NAMES[new_status]
             for returnOrderId in returnOrdersIds:
                 __process_return_order(get_return_order_info(returnOrderId), returnOrdersAttrMap.get(returnOrderId))
-    elif new_status == ReturnTransactionStatus.CLOSED:
+    elif new_status == ReturnTransactionStatus.CLOSED and mark_return_transaction_complete(returnTransaction.id):
         returnTransaction.closedAt = datetime.datetime.now()
         for ret_Order in returnTransaction.returnOrders:
             ret_Order.returnTxnResolutionStatus = ReturnTxnResolutionStatus._VALUES_TO_NAMES[ReturnTxnResolutionStatus.CLOSED]
         __communicate_customer_for_closed_transaction(returnTransaction)
         returnTransaction.status = ReturnTransactionStatus._VALUES_TO_NAMES[new_status]
 def create_return_pickup_request(returnOrderIds, providerId):
     returnPickupRequest = ReturnPickupRequest()
     returnPickupRequest.logisticsProviderId = providerId
     returnPickupRequest.pickupStatus = ReturnTxnPickupStatus._VALUES_TO_NAMES[ReturnTxnPickupStatus.PICKUP_REQUESTED]
-    session.commit()
+    if len(returnOrderIds) > 0:
-    for returnOrderId in returnOrderIds:
+        for returnOrderId in returnOrderIds:
-        returnOrder = get_return_order_info(returnOrderId)
+            returnOrder = get_return_order_info(returnOrderId)
-        returnOrder.logisticsRequestId = returnPickupRequest.id
+            returnOrder.logisticsRequestId = returnPickupRequest.id
-    session.commit()
+        session.commit()
+        return True
-    return True
+    return False
 def update_return_pickup_request(returnPickupRequest):
     try:
         returnPickupReq = ReturnPickupRequest.get_by(id=returnPickupRequest.id)
         if returnPickupRequest.pickupRequestNo:
     inventoryClient = InventoryClient().get_client()
     warehouse = inventoryClient.getWarehouse(returnOrders[0].warehouse_id)
     warehouseClient = WarehouseClient().get_client()
     for returnOrder in returnOrders:
+        returnOrderDetails = returnOrdersMap.get(returnOrder.id)
         warehouse = None
         serialNumbers = []
         if returnOrderDetails.has_key('SerialNumbers'):
             serialNumbers = returnOrderDetails.get('SerialNumbers').split(',')
     orders = query.order_by(desc(Order.delivery_timestamp)).all()
     return orders
 def get_eligible_return_orders_for_pickup(customerId):
-    return ReturnOrderInfo.query.filter(ReturnOrderInfo.returnTransaction.customer_id==customerId).filter(or_(ReturnOrderInfo.returnStatus==OrderStatus._VALUES_TO_NAMES[OrderStatus.RET_PICKUP_REQUEST_RAISED], ReturnOrderInfo.returnStatus==OrderStatus._VALUES_TO_NAMES[OrderStatus.DOA_PICKUP_REQUEST_RAISED])).all()
+    return session.query(ReturnOrderInfo).join((ReturnTransaction,ReturnOrderInfo.returnTransaction_id==ReturnTransaction.id)).filter(ReturnTransaction.customer_id==customerId).filter(or_(ReturnOrderInfo.returnStatus==OrderStatus._VALUES_TO_NAMES[OrderStatus.RET_PICKUP_REQUEST_RAISED], ReturnOrderInfo.returnStatus==OrderStatus._VALUES_TO_NAMES[OrderStatus.DOA_PICKUP_REQUEST_RAISED])).filter(ReturnOrderInfo.logisticsRequestId==None).all()
 def validate_return_transaction(customerId, returnOrdersMap, itemCondition, overrideWarranty):
     eligibleOrders = get_eligible_orders_for_return(customerId, itemCondition, overrideWarranty)
     ordersMap = {}
     for order in eligibleOrders:
         ordersMap[order.id] = order.lineitems[0].quantity - order.lineitems[0].returnQty
+    print ordersMap
+    print "++++++++++++"
+    print returnOrdersMap
     for orderId, returnOrderQty in returnOrdersMap.items():
         if returnOrderQty > ordersMap.get(orderId):
+            print "ret false*********";
             return False
     return True
+def get_return_pickup_request(returnPickupId):
+    return ReturnPickupRequest.query.filter(ReturnPickupRequest.id==returnPickupId).first()
+def mark_return_not_required_orders_as_processed(returnTransactionId):
+    returnTransaction = ReturnTransaction.get_by(id=returnTransactionId)
+    if returnTransaction is None:
+        raise TransactionServiceException(101, "No Return Transaction Found")
+    eligibleOrders = []
+    for returnOrder in returnTransaction.returnOrders:
+        if returnOrder.returnPickupType == ReturnPickupType.NOT_REQUIRED:
+            if returnOrder.returnAction and returnOrder.refundType == RefundType.INIT:
+                raise TransactionServiceException(101, "Refund Type not Defined for return order:- "+str(returnOrder.id))
+            eligibleOrders.append(returnOrder)
+    returnOrdersAttrMap = {}
+    returnOrderIds = []
+    for returnOrder in eligibleOrders:
+        returnOrderIds.append(returnOrder.id)
+        if returnOrder.returnAction:
+            detailsMap = {}
+            if returnOrder.refundedAt:
+                raise TransactionServiceException(145, "Refund already in Process for this return order")
+            detailsMap['RefundReason'] = "As per Customer Request"
+            detailsMap['RefundType'] = returnOrder.refundType
+            detailsMap['RefundedBy'] = "CRM Executive"
+            detailsMap['RefundAmount'] = returnOrder.refundAmount
+            returnOrdersAttrMap[returnOrder.id] = detailsMap
+    return change_return_transaction_status(returnTransactionId, ReturnTransactionStatus.PROCESSED, returnOrderIds, returnOrdersAttrMap)
 if __name__ == '__main__':
     print get_orders_by_mobile_number("9650889334")

Subversion Repositories SmartDukaan

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