WebSVN – SmartDukaan – Diff – //trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

 from shop2020.clients.CRMClient import CRMClient
 from shop2020.clients.LogisticsClient import LogisticsClient
 from shop2020.clients.TransactionClient import TransactionClient
 from shop2020.clients.UserClient import UserClient
 from shop2020.config.client.ConfigClient import ConfigClient
-from shop2020.model.v1.order.script.LogisticUtils import enqueueMailForFDA
+from shop2020.model.v1.order.script.LogisticUtils import enqueueMailForFDA, \
+    create_crm_tickets_for_delivey_attempted_orders
 from shop2020.thriftpy.config.ttypes import ConfigException
 from shop2020.thriftpy.crm.ttypes import *
 from shop2020.thriftpy.model.v1.order.ttypes import TransactionServiceException, \
     OrderStatus
 from shop2020.utils.EmailAttachmentSender import get_attachment_part, mail
 except ConfigException as cex:
     print cex.message
     traceback.print_exc()
 defaultUndeliveredAsssigneeId = 47
+dtrUndeliveredAsssigneeId = 33
 from_user = 'cnc.center@shop2020.in'
 from_pwd = '5h0p2o2o'
 to = ['cnc.center@shop2020.in', "amit.sirohi@shop2020.in", "sandeep.sachdeva@shop2020.in", "manoj.kumar@shop2020.in"]
 def process_dao_pickup_orders(provider):
         statusDescription = ''
         if order.statusDescription is not None:
             statusDescription = order.statusDescription.replace(","," ")
         writer.writerow([order.id, order.airwaybill_no, order.status, statusDescription, to_py_date(order.shipping_timestamp), to_py_date(order.pickup_timestamp), to_py_date(order.promised_delivery_time), to_py_date(order.expected_delivery_time)])
-def create_crm_tickets_for_delivey_attempted_orders(provider):
-    try:
-        tickets_tobe_created = fetch_data(provider.id, [OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE])
-        userClient = UserClient().get_client()
-        crmServiceClient = CRMClient().get_client()
-        for order in tickets_tobe_created:
-            ticket_created = False
-            searchFilter = SearchFilter()
-            user = userClient.getUserByEmail(order.customer_email)
-            if user is None or user.userId == -1:
-                searchFilter.customerEmailId = order.customer_email
-                searchFilter.customerMobileNumber = order.customer_mobilenumber
-            else:
-                searchFilter.customerId = user.userId
-            searchFilter.ticketCategory = TicketCategory.UNDELIVERED
-            tickets = crmServiceClient.getTickets(searchFilter)
-            print tickets
-            for old_ticket in tickets:
-                if old_ticket.orderId == order.id:
-                    ticket_created = True
-                    break
-            if not ticket_created:
-                print "creating ticket for orderId:"+str(order.id)
-                ticket = Ticket()
-                activity = Activity()
-                description = order.statusDescription + "\n\nOrder not delivered by courier due to problems at customer end."
-                ticket.creatorId = 1
-                ticket.assigneeId = defaultUndeliveredAsssigneeId
-                ticket.category = TicketCategory.UNDELIVERED
-                ticket.priority = TicketPriority.HIGH
-                ticket.status = TicketStatus.OPEN
-                ticket.description = description
-                ticket.orderId = order.id
-                ticket.airwayBillNo = order.airwaybill_no
-                activity.creatorId = 1
-                activity.ticketAssigneeId = ticket.assigneeId
-                activity.type = ActivityType.OTHER
-                activity.description = description
-                activity.ticketCategory = ticket.category
-                activity.ticketDescription = ticket.description
-                activity.ticketPriority = ticket.priority
-                activity.ticketStatus = ticket.status
-                if user is None or user.userId == -1:
-                    ticket.customerEmailId = order.customer_email
-                    ticket.customerMobileNumber = order.customer_mobilenumber
-                    ticket.customerName = order.customer_name
-                    activity.customerEmailId = order.customer_email
-                    activity.customerMobileNumber = order.customer_mobilenumber
-                    activity.customerName = order.customer_name
-                else:
-                    ticket.customerId = user.userId
-                    activity.customerId = user.userId
-                crmServiceClient.insertTicket(ticket, activity)
-                '''
-                Inform user about first delivery attempt
-                '''
-                enqueueMailForFDA(order)
-    except:
-        print "Some issue while creating crm tickets for orders in FIRST_DELIVERY_ATTEMPT_MADE status"
-        traceback.print_exc()
 def auto_close_crm_tickets_created():
     try:
         ticket_created_orders = []
         tickets_map = {}
         crmServiceClient = CRMClient().get_client()
             tickets_map[old_ticket.orderId] = old_ticket
         print ticket_created_orders
         txnClient = TransactionClient().get_client()
         orders = txnClient.getOrderList(ticket_created_orders)
         for order in orders:
-            if order.status not in [OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE]:
+            if order.status not in [OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE, OrderStatus.RTO_IN_TRANSIT]:
                 old_ticket = tickets_map.get(order.id)
                 old_ticket.status = TicketStatus.CLOSED
                 activity = Activity()
                 activity.creatorId = 1
                 activity.ticketAssigneeId = old_ticket.assigneeId

Subversion Repositories SmartDukaan

(root)//trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py – Rev 8292 → 13085