Subversion Repositories SmartDukaan

Rev

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

Rev 8125 Rev 8128
Line 1268... Line 1268...
1268
        __update_transfer_price(order, order.fulfilmentWarehouseId)
1268
        __update_transfer_price(order, order.fulfilmentWarehouseId)
1269
        session.commit()
1269
        session.commit()
1270
        
1270
        
1271
        if order.logistics_provider_id != 7 and order.airwaybill_no is None:
1271
        if order.logistics_provider_id != 7 and order.airwaybill_no is None:
1272
            logistics_client = LogisticsClient().get_client()
1272
            logistics_client = LogisticsClient().get_client()
1273
            if order.cod:
1273
            if order.cod and order.total_amount > 1:
1274
                airwaybillNo= logistics_client.getEmptyAWB(order.logistics_provider_id, DeliveryType.COD)
1274
                airwaybillNo= logistics_client.getEmptyAWB(order.logistics_provider_id, DeliveryType.COD)
1275
            else:
1275
            else:
1276
                airwaybillNo= logistics_client.getEmptyAWB(order.logistics_provider_id, DeliveryType.PREPAID)
1276
                airwaybillNo= logistics_client.getEmptyAWB(order.logistics_provider_id, DeliveryType.PREPAID)
1277
            
1277
            
1278
            order.airwaybill_no = airwaybillNo
1278
            order.airwaybill_no = airwaybillNo
Line 2889... Line 2889...
2889
        new_order.lineitems[0].item_number   = order.lineitems[0].item_number
2889
        new_order.lineitems[0].item_number   = order.lineitems[0].item_number
2890
        new_order.accepted_timestamp = current_time
2890
        new_order.accepted_timestamp = current_time
2891
        new_order.billing_timestamp = current_time    
2891
        new_order.billing_timestamp = current_time    
2892
        new_order.status = OrderStatus.BILLED
2892
        new_order.status = OrderStatus.BILLED
2893
        new_order.statusDescription = 'Order Billed'
2893
        new_order.statusDescription = 'Order Billed'
-
 
2894
        
-
 
2895
        if is_cod and order.total_amount > 1:
2894
        new_order.airwaybill_no = logistics_client.getEmptyAWB(new_order.logistics_provider_id, is_cod)
2896
            new_order.airwaybill_no= logistics_client.getEmptyAWB(new_order.logistics_provider_id, DeliveryType.COD)
-
 
2897
        else:
-
 
2898
            new_order.airwaybill_no= logistics_client.getEmptyAWB(new_order.logistics_provider_id, DeliveryType.PREPAID)
-
 
2899
            
2895
        session.commit()
2900
        session.commit()
2896
    else:
2901
    else:
2897
        session.commit()       
2902
        session.commit()       
2898
        inventoryClient = InventoryClient().get_client()
2903
        inventoryClient = InventoryClient().get_client()
2899
        inventoryClient.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, new_order.id, to_java_date(new_order.created_timestamp), to_java_date(new_order.promised_shipping_time), new_order.lineitems[0].quantity)
2904
        inventoryClient.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, new_order.id, to_java_date(new_order.created_timestamp), to_java_date(new_order.promised_shipping_time), new_order.lineitems[0].quantity)