Subversion Repositories SmartDukaan

Rev

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

Rev 17836 Rev 17865
Line 845... Line 845...
845 
    cartMessageChanged = 0
 845 
    cartMessageChanged = 0
846 
    cartMessageOOS = 0
 846 
    cartMessageOOS = 0
847 
    cartMessageUndeliverable = 0
 847 
    cartMessageUndeliverable = 0
848
848
849 
    for line in cart_lines:
 849 
    for line in cart_lines:
- 
 
 850 
        itemQuantityChanged=False
850 
        cartItem={}
 851 
        cartItem={}
851
852
852 
        old_estimate = line.estimate
 853 
        old_estimate = line.estimate
853 
        item_id = line.item_id
 854 
        item_id = line.item_id
854 
        item = itemsMap.get(item_id)
 855 
        item = itemsMap.get(item_id)
Line 861... Line 862...
861
862
862 
        item_shipping_info = inventory_client.isActive(item_id)
863 
        item_shipping_info = inventory_client.isActive(item_id)
863 
        if item_shipping_info.isActive:
 864 
        if item_shipping_info.isActive:
864 
            if item_shipping_info.isRisky and item_shipping_info.quantity < line.quantity:
 865 
            if item_shipping_info.isRisky and item_shipping_info.quantity < line.quantity:
865 
                line.quantity = item_shipping_info.quantity
 866 
                line.quantity = item_shipping_info.quantity
866 
                cartMessageChanged += 1
 867 
                itemQuantityChanged=True
867 
                cartItemMessages.append({"type":"danger", "messageText":"Only " + str(item_shipping_info.quantity) + " available"})
 - 
 
868
868
869 
            cartItem['maxQuantity'] = min(item_shipping_info.quantity, 20)
 869 
            cartItem['maxQuantity'] = min(item_shipping_info.quantity, 20)
870
870
871 
            if item_id in dealItems:
 871 
            if item_id in dealItems:
872 
                line.actual_price = deals[item_id].dealPrice
 872 
                line.actual_price = deals[item_id].dealPrice
Line 928... Line 928...
928 
            cartItem['estimate'] = item_delivery_estimate
 928 
            cartItem['estimate'] = item_delivery_estimate
929 
            if item_delivery_estimate == -1:
 929 
            if item_delivery_estimate == -1:
930 
                cartItem['quantity'] = 0
 930 
                cartItem['quantity'] = 0
931 
                cartMessageUndeliverable += 1
 931 
                cartMessageUndeliverable += 1
932 
                cartItemMessages.append({"type":"danger", "messageText":"Undeliverable"})
 932 
                cartItemMessages.append({"type":"danger", "messageText":"Undeliverable"})
- 
 
 933 
            elif itemQuantityChanged:
- 
 
 934 
                cartMessageChanged += 1
- 
 
 935 
                cartItemMessages.append({"type":"danger", "messageText":"Only " + str(item_shipping_info.quantity) + " available"})
933 
            if old_estimate != item_delivery_estimate:
 936 
            if old_estimate != item_delivery_estimate:
934 
                line.estimate = item_delivery_estimate
 937 
                line.estimate = item_delivery_estimate
935 
                cart.updated_on = current_time
 938 
                cart.updated_on = current_time
936 
        else:
 939 
        else:
937 
            cartItem['quantity'] = 0
 940 
            cartItem['quantity'] = 0