Subversion Repositories SmartDukaan

Rev

Rev 7760 | Rev 7767 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7760 Rev 7762
Line 5833... Line 5833...
5833
        query = query.filter(cast(StoreOrderCollection.pushedAt, DATE) <= enddate)
5833
        query = query.filter(cast(StoreOrderCollection.pushedAt, DATE) <= enddate)
5834
 
5834
 
5835
    return query.filter(StoreOrderCollection.pushedToOcr == 1).all()    
5835
    return query.filter(StoreOrderCollection.pushedToOcr == 1).all()    
5836
 
5836
 
5837
def update_timestamp_for_amazon_order(orderDeliveryMap):
5837
def update_timestamp_for_amazon_order(orderDeliveryMap):
5838
    logistics_client = LogisticsClient().get_client()
-
 
5839
    for orderId,promisedDelivery in orderDeliveryMap.iteritems():
5838
    for orderId,dateMap in orderDeliveryMap.iteritems():
5840
        order = get_order(orderId)
5839
        order = get_order(orderId)
5841
        logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, order.lineitems[0].item_id, order.cod, PickUpType.COURIER)
-
 
5842
        days = logistics_info.deliveryTime - logistics_info.shippingTime
-
 
5843
        order.expected_delivery_time = datetime.datetime.strptime(promisedDelivery+' 15:00:00', '%d-%m-%Y %H:%M:%S') 
5840
        order.expected_delivery_time = datetime.datetime.strptime(dateMap.values()[0]+' 15:00:00', '%d-%m-%Y %H:%M:%S') 
5844
        order.promised_delivery_time = datetime.datetime.strptime(promisedDelivery+' 15:00:00', '%d-%m-%Y %H:%M:%S')
5841
        order.promised_delivery_time = datetime.datetime.strptime(dateMap.values()[0]+' 15:00:00', '%d-%m-%Y %H:%M:%S')
5845
        promisedShipping = adjust_shipping_time(datetime.datetime.strptime(promisedDelivery+' 15:00:00', '%d-%m-%Y %H:%M:%S'), days)
5842
        promisedShipping = datetime.datetime.strptime(dateMap.keys()[0]+' 15:00:00', '%d-%m-%Y %H:%M:%S')
5846
        order.expected_shipping_time = promisedShipping
5843
        order.expected_shipping_time = promisedShipping
5847
        order.promised_shipping_time = promisedShipping
5844
        order.promised_shipping_time = promisedShipping
5848
        session.commit()
5845
        session.commit()
5849
    return True
5846
    return True
5850
 
5847