Subversion Repositories SmartDukaan

Rev

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

Rev 22211 Rev 22239
Line 295... Line 295...
295
    itemIds = []
295
    itemIds = []
296
    for line in cart_lines:
296
    for line in cart_lines:
297
        itemIds.append(line.item_id) 
297
        itemIds.append(line.item_id) 
298
    inventory_client = CatalogClient().get_client()
298
    inventory_client = CatalogClient().get_client()
299
    itemsMap = inventory_client.getItems(itemIds)
299
    itemsMap = inventory_client.getItems(itemIds)
-
 
300
    print "cart_lines -", cart_lines
300
    for line in cart_lines:
301
    for line in cart_lines:
301
        if line.line_status == LineStatus.LINE_ACTIVE:
302
        if line.line_status == LineStatus.LINE_ACTIVE:
302
            quantity_remaining_for_order = line.quantity
303
            quantity_remaining_for_order = line.quantity
303
        
304
        
304
            for discount in line.discounts:
305
            for discount in line.discounts:
Line 307... Line 308...
307
                t_line_item = create_line_item(line, line.actual_price if isGv else (line.actual_price - discount.discount), line.quantity, itemsMap.get(line.item_id))
308
                t_line_item = create_line_item(line, line.actual_price if isGv else (line.actual_price - discount.discount), line.quantity, itemsMap.get(line.item_id))
308
                t_order = create_order(userId, cart.address_id, t_line_item, cart.pickupStoreId, discount.discount if isGv else 0, line.insurer, (line.insuranceAmount/line.quantity), insuranceDetails,line.dataProtectionInsurer,(line.dataProtectionAmount)/line.quantity, orderSource, line.freebieId, totalshippingCost, totalCartVal, selfPickup)
309
                t_order = create_order(userId, cart.address_id, t_line_item, cart.pickupStoreId, discount.discount if isGv else 0, line.insurer, (line.insuranceAmount/line.quantity), insuranceDetails,line.dataProtectionInsurer,(line.dataProtectionAmount)/line.quantity, orderSource, line.freebieId, totalshippingCost, totalCartVal, selfPickup)
309
                orders.append(t_order)
310
                orders.append(t_order)
310
                    #i += 1
311
                    #i += 1
311
                quantity_remaining_for_order -= discount.quantity
312
                quantity_remaining_for_order -= discount.quantity
312
            
313
            print "quantity_remaining_for_order ", quantity_remaining_for_order 
313
            if quantity_remaining_for_order > 0:
314
            if quantity_remaining_for_order > 0:
314
                t_line_item = create_line_item(line, line.actual_price, quantity_remaining_for_order, itemsMap.get(line.item_id))
315
                t_line_item = create_line_item(line, line.actual_price, quantity_remaining_for_order, itemsMap.get(line.item_id))
315
                t_order = create_order(userId, cart.address_id, t_line_item, cart.pickupStoreId, 0, line.insurer, (line.insuranceAmount/line.quantity), insuranceDetails, line.dataProtectionInsurer,(line.dataProtectionAmount)/line.quantity, orderSource, line.freebieId, totalshippingCost, totalCartVal, selfPickup)
316
                t_order = create_order(userId, cart.address_id, t_line_item, cart.pickupStoreId, 0, line.insurer, (line.insuranceAmount/line.quantity), insuranceDetails, line.dataProtectionInsurer,(line.dataProtectionAmount)/line.quantity, orderSource, line.freebieId, totalshippingCost, totalCartVal, selfPickup)
316
                orders.append(t_order)
317
                orders.append(t_order)
317
 
318
 
Line 918... Line 919...
918
        tempBulkItemList = []
919
        tempBulkItemList = []
919
        
920
        
920
        old_estimate = line.estimate
921
        old_estimate = line.estimate
921
        item_id = line.item_id
922
        item_id = line.item_id
922
        item = itemsMap.get(item_id)
923
        item = itemsMap.get(item_id)
-
 
924
        #in case item is missing remove that line
923
        if item.itemStatus==0:
925
        if item is None or item.itemStatus==0:
924
            Discount.query.filter(Discount.line==line).delete()
926
            Discount.query.filter(Discount.line==line).delete()
925
            line.delete()
927
            line.delete()
926
            continue
928
            continue
927
        cartItem['itemId']=line.item_id
929
        cartItem['itemId']=line.item_id
928
        cartItem['quantity']=0
930
        cartItem['quantity']=0