Subversion Repositories SmartDukaan

Rev

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

Rev 4296 Rev 4298
Line 1195... Line 1195...
1195
    new_order.logistics_provider_id = logistics_info.providerId
1195
    new_order.logistics_provider_id = logistics_info.providerId
1196
    new_order.airwaybill_no = logistics_info.airway_billno
1196
    new_order.airwaybill_no = logistics_info.airway_billno
1197
    new_order.tracking_id = new_order.airwaybill_no
1197
    new_order.tracking_id = new_order.airwaybill_no
1198
    new_order.expected_delivery_time = current_time + datetime.timedelta(days=logistics_info.deliveryTime)
1198
    new_order.expected_delivery_time = current_time + datetime.timedelta(days=logistics_info.deliveryTime)
1199
    new_order.promised_delivery_time = new_order.expected_delivery_time
1199
    new_order.promised_delivery_time = new_order.expected_delivery_time
1200
    
1200
    new_order.
1201
    if should_copy_billing_info:
1201
    if should_copy_billing_info:
1202
        new_order.invoice_number = order.invoice_number
1202
        new_order.invoice_number = order.invoice_number
1203
        new_order.billed_by = order.billed_by
1203
        new_order.billed_by = order.billed_by
1204
        new_order.warehouse_id = order.warehouse_id
1204
        new_order.warehouse_id = order.warehouse_id
1205
        new_order.accepted_timestamp = current_time
1205
        new_order.accepted_timestamp = current_time
Line 1208... Line 1208...
1208
        new_order.statusDescription = 'Order Billed'
1208
        new_order.statusDescription = 'Order Billed'
1209
    else:       
1209
    else:       
1210
        catalog_client = CatalogClient().get_client()
1210
        catalog_client = CatalogClient().get_client()
1211
        catalog_client.reserveItemInWarehouse(item_id, logistics_info.warehouseId, new_order.lineitems[0].quantity)
1211
        catalog_client.reserveItemInWarehouse(item_id, logistics_info.warehouseId, new_order.lineitems[0].quantity)
1212
 
1212
 
-
 
1213
        #We should get the item at same price as previous
1213
        item_pricing = catalog_client.getItemPricing(item_id, order.warehouse_id)
1214
        #item_pricing = catalog_client.getItemPricing(item_id, order.warehouse_id)
1214
        new_order.lineitems[0].transfer_price = item_pricing.transferPrice
1215
        #new_order.lineitems[0].transfer_price = item_pricing.transferPrice
1215
    
1216
    
1216
    return new_order
1217
    return new_order
1217
 
1218
 
1218
def __create_return_order(order):
1219
def __create_return_order(order):
1219
    ret_order = ReturnOrder(order)
1220
    ret_order = ReturnOrder(order)