Subversion Repositories SmartDukaan

Rev

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

Rev 4306 Rev 4307
Line 221... Line 221...
221
            order.promised_delivery_time = order.expected_delivery_time 
221
            order.promised_delivery_time = order.expected_delivery_time 
222
            
222
            
223
            catalog_client = CatalogClient().get_client()
223
            catalog_client = CatalogClient().get_client()
224
            catalog_client.reserveItemInWarehouse(item_id, logistics_info.warehouseId, order.lineitems[0].quantity)
224
            catalog_client.reserveItemInWarehouse(item_id, logistics_info.warehouseId, order.lineitems[0].quantity)
225
 
225
 
226
            '''item_pricing = catalog_client.getItemPricing(item_id, order.warehouse_id)
226
            item_pricing = catalog_client.getItemPricing(item_id, -1)
227
            order.lineitems[0].transfer_price = item_pricing.transferPrice'''
227
            order.lineitems[0].transfer_price = item_pricing.transferPrice
228
    elif new_status == TransactionStatus.COD_IN_PROCESS:
228
    elif new_status == TransactionStatus.COD_IN_PROCESS:
229
        for order in transaction.orders:
229
        for order in transaction.orders:
230
            order.status = OrderStatus.INIT
230
            order.status = OrderStatus.INIT
231
            order.statusDescription = "Verification Pending"
231
            order.statusDescription = "Verification Pending"
232
            order.cod = True
232
            order.cod = True
Line 250... Line 250...
250
            order.promised_delivery_time = order.expected_delivery_time
250
            order.promised_delivery_time = order.expected_delivery_time
251
            
251
            
252
            catalog_client = CatalogClient().get_client()
252
            catalog_client = CatalogClient().get_client()
253
            catalog_client.reserveItemInWarehouse(item_id, logistics_info.warehouseId, order.lineitems[0].quantity)
253
            catalog_client.reserveItemInWarehouse(item_id, logistics_info.warehouseId, order.lineitems[0].quantity)
254
 
254
 
255
            '''item_pricing = catalog_client.getItemPricing(item_id, order.warehouse_id)
255
            item_pricing = catalog_client.getItemPricing(item_id, -1)
256
            order.lineitems[0].transfer_price = item_pricing.transferPrice'''        
256
            order.lineitems[0].transfer_price = item_pricing.transferPrice        
257
 
257
 
258
    session.commit()
258
    session.commit()
259
 
259
 
260
    try:
260
    try:
261
        if new_status == TransactionStatus.COD_IN_PROCESS:
261
        if new_status == TransactionStatus.COD_IN_PROCESS:
Line 1214... Line 1214...
1214
        new_order.statusDescription = 'Order Billed'
1214
        new_order.statusDescription = 'Order Billed'
1215
    else:       
1215
    else:       
1216
        catalog_client = CatalogClient().get_client()
1216
        catalog_client = CatalogClient().get_client()
1217
        catalog_client.reserveItemInWarehouse(item_id, logistics_info.warehouseId, new_order.lineitems[0].quantity)
1217
        catalog_client.reserveItemInWarehouse(item_id, logistics_info.warehouseId, new_order.lineitems[0].quantity)
1218
 
1218
 
1219
        #We should get the item at same price as previous
-
 
1220
        #item_pricing = catalog_client.getItemPricing(item_id, order.warehouse_id)
-
 
1221
        #new_order.lineitems[0].transfer_price = item_pricing.transferPrice
-
 
1222
    
-
 
1223
    return new_order
1219
    return new_order
1224
 
1220
 
1225
def __create_return_order(order):
1221
def __create_return_order(order):
1226
    ret_order = ReturnOrder(order)
1222
    ret_order = ReturnOrder(order)
1227
    return ret_order
1223
    return ret_order