Subversion Repositories SmartDukaan

Rev

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

Rev 6591 Rev 6629
Line 2423... Line 2423...
2423
    new_order.logistics_provider_id = logistics_info.providerId
2423
    new_order.logistics_provider_id = logistics_info.providerId
2424
    new_order.airwaybill_no = logistics_info.airway_billno
2424
    new_order.airwaybill_no = logistics_info.airway_billno
2425
    new_order.tracking_id = new_order.airwaybill_no
2425
    new_order.tracking_id = new_order.airwaybill_no
2426
    new_order.expected_delivery_time = current_time + datetime.timedelta(days=logistics_info.deliveryTime)
2426
    new_order.expected_delivery_time = current_time + datetime.timedelta(days=logistics_info.deliveryTime)
2427
    new_order.promised_delivery_time = new_order.expected_delivery_time
2427
    new_order.promised_delivery_time = new_order.expected_delivery_time
-
 
2428
    new_order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
-
 
2429
    new_order.promised_shipping_time = new_order.expected_shipping_time
2428
    
2430
        
2429
    if should_copy_billing_info:
2431
    if should_copy_billing_info:
2430
        new_order.vendorId = order.vendorId
2432
        new_order.vendorId = order.vendorId
2431
        new_order.invoice_number = order.invoice_number
2433
        new_order.invoice_number = order.invoice_number
2432
        new_order.billed_by = order.billed_by
2434
        new_order.billed_by = order.billed_by
2433
        new_order.warehouse_id = order.warehouse_id
2435
        new_order.warehouse_id = order.warehouse_id