Subversion Repositories SmartDukaan

Rev

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

Rev 6726 Rev 6728
Line 3416... Line 3416...
3416
    logistics_info = lclient.getLogisticsEstimation(order.lineitems[0].item_id, order.customer_pincode, DeliveryType.PREPAID)
3416
    logistics_info = lclient.getLogisticsEstimation(order.lineitems[0].item_id, order.customer_pincode, DeliveryType.PREPAID)
3417
    dt = datetime.datetime.strptime(str(order.shipping_timestamp), "%Y-%m-%d %H:%M:%S")
3417
    dt = datetime.datetime.strptime(str(order.shipping_timestamp), "%Y-%m-%d %H:%M:%S")
3418
    shipping_date = dt.strftime("%A, %d %B %Y %I:%M%p")
3418
    shipping_date = dt.strftime("%A, %d %B %Y %I:%M%p")
3419
    product = str(order.lineitems[0])
3419
    product = str(order.lineitems[0])
3420
    new_expected_delivery_timestamp = datetime.datetime.now() + timedelta(adjust_delivery_time(datetime.datetime.now(), (logistics_info.deliveryTime - logistics_info.shippingTime)))
3420
    new_expected_delivery_timestamp = datetime.datetime.now() + timedelta(adjust_delivery_time(datetime.datetime.now(), (logistics_info.deliveryTime - logistics_info.shippingTime)))
-
 
3421
    new_courier_delivery_time = datetime.datetime.now() + timedelta(adjust_delivery_time(datetime.datetime.now(), (logistics_info.deliveryTime - logistics_info.shippingTime - logistics_info.deliveryDelay)))
3421
    #update new expected timestamp
3422
    #update new expected timestamp
3422
    if order.cod:
3423
    if order.cod:
3423
        new_expected_delivery_timestamp = new_expected_delivery_timestamp.replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0, microsecond=0)
3424
        new_expected_delivery_timestamp = new_expected_delivery_timestamp.replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0, microsecond=0)
-
 
3425
        order.courier_delivery_time = new_courier_delivery_time.replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0, microsecond=0)
3424
    else:
3426
    else:
3425
        new_expected_delivery_timestamp = new_expected_delivery_timestamp.replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0, microsecond=0)
3427
        new_expected_delivery_timestamp = new_expected_delivery_timestamp.replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0, microsecond=0)
-
 
3428
        order.courier_delivery_time = new_courier_delivery_time.replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0, microsecond=0)
3426
    order.expected_delivery_time = new_expected_delivery_timestamp
3429
    order.expected_delivery_time = new_expected_delivery_timestamp
3427
    session.commit()
3430
    session.commit()
3428
    
3431
    
3429
    new_expected_delivery_date = new_expected_delivery_timestamp.strftime("%A, %d %B %Y")
3432
    new_expected_delivery_date = new_expected_delivery_timestamp.strftime("%A, %d %B %Y")
3430
    otg_text = ""
3433
    otg_text = ""