Subversion Repositories SmartDukaan

Rev

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

Rev 17901 Rev 17903
Line 858... Line 858...
858 
        cartItem['cartItemMessages']=[]
 858 
        cartItem['cartItemMessages']=[]
859 
        cartItemMessages = cartItem['cartItemMessages']
 859 
        cartItemMessages = cartItem['cartItemMessages']
860 
        cartItem['color'] = item.color
 860 
        cartItem['color'] = item.color
861 
        cartItem['catalogItemId'] = item.catalogItemId
 861 
        cartItem['catalogItemId'] = item.catalogItemId
862
862
- 
 
 863 
        if item_id in dealItems:
- 
 
 864 
            line.actual_price = deals[item_id].dealPrice
- 
 
 865 
            if deals[item_id].dealTextOption==0:
- 
 
 866 
                line.dealText = ''
- 
 
 867 
            if deals[item_id].dealTextOption==2:
- 
 
 868 
                line.dealText = deals[item_id].dealText
- 
 
 869
- 
 
 870 
            if deals[item_id].dealFreebieOption==0:
- 
 
 871 
                line.freebieId = 0
- 
 
 872 
            if deals[item_id].dealFreebieOption==2:
- 
 
 873 
                line.freebieId =  deals[item_id].dealFreebieItemId
- 
 
 874 
            cartItem['dealText'] = line.dealText
- 
 
 875 
        else:
- 
 
 876 
            line.actual_price = item.sellingPrice
- 
 
 877 
            if item.bestDealText:
- 
 
 878 
                cartItem['dealText'] = item.bestDealText
- 
 
 879 
            line.dealText = None
- 
 
 880 
            line.freebieId = None
- 
 
 881 
        cartItem['sellingPrice'] = line.actual_price
- 
 
 882
863 
        item_shipping_info = inventory_client.isActive(item_id)
883 
        item_shipping_info = inventory_client.isActive(item_id)
864 
        if item_shipping_info.isActive:
 884 
        if item_shipping_info.isActive:
865 
            if item_shipping_info.isRisky and item_shipping_info.quantity < line.quantity:
 885 
            if item_shipping_info.isRisky and item_shipping_info.quantity < line.quantity:
866 
                line.quantity = item_shipping_info.quantity
 886 
                line.quantity = item_shipping_info.quantity
867 
                itemQuantityChanged=True
 887 
                itemQuantityChanged=True
868
- 
 
869 
            cartItem['maxQuantity'] = min(item_shipping_info.quantity, 20)
 - 
 
870
- 
 
871 
            if item_id in dealItems:
 - 
 
872 
                line.actual_price = deals[item_id].dealPrice
 - 
 
873 
                if deals[item_id].dealTextOption==0:
 - 
 
874 
                    line.dealText = ''
 - 
 
875 
                if deals[item_id].dealTextOption==2:
 - 
 
876 
                    line.dealText = deals[item_id].dealText
 - 
 
877
- 
 
878 
                if deals[item_id].dealFreebieOption==0:
 - 
 
879 
                    line.freebieId = 0
 - 
 
880 
                if deals[item_id].dealFreebieOption==2:
 - 
 
881 
                    line.freebieId =  deals[item_id].dealFreebieItemId
 - 
 
882 
                cartItem['dealText'] = line.dealText
 - 
 
883 
            else:
 - 
 
884 
                line.actual_price = item.sellingPrice
 - 
 
885 
                if item.bestDealText:
 - 
 
886 
                    cartItem['dealText'] = item.bestDealText
 - 
 
887 
                line.dealText = None
 - 
 
888 
                line.freebieId = None
 - 
 
889 
            cartItem['sellingPrice'] = line.actual_price
 - 
 
890 
            cartItem['quantity'] = line.quantity
 888 
            cartItem['quantity'] = line.quantity
- 
 
 889 
            cartItem['maxQuantity'] = min(item_shipping_info.quantity, 20)
891 
            cart.total_price = cart.total_price + (line.actual_price * line.quantity)
 890 
            cart.total_price = cart.total_price + (line.actual_price * line.quantity)
892 
            try:
 891 
            try:
893 
                item_delivery_estimate = logistics_client.getLogisticsEstimation(item_id, customer_pincode, DeliveryType.PREPAID).deliveryTime
 892 
                item_delivery_estimate = logistics_client.getLogisticsEstimation(item_id, customer_pincode, DeliveryType.PREPAID).deliveryTime
894 
            except LogisticsServiceException:
 893 
            except LogisticsServiceException:
895 
                item_delivery_estimate = -1
 894 
                item_delivery_estimate = -1
Line 934... Line 933...
934 
                cartMessageChanged += 1
 933 
                cartMessageChanged += 1
935 
                cartItemMessages.append({"type":"danger", "messageText":"Only " + str(item_shipping_info.quantity) + " available"})
 934 
                cartItemMessages.append({"type":"danger", "messageText":"Only " + str(item_shipping_info.quantity) + " available"})
936 
            if old_estimate != item_delivery_estimate:
 935 
            if old_estimate != item_delivery_estimate:
937 
                line.estimate = item_delivery_estimate
 936 
                line.estimate = item_delivery_estimate
938 
                cart.updated_on = current_time
 937 
                cart.updated_on = current_time
- 
 
 938 
            totalAmount += line.actual_price * cartItem['quantity']
939 
        else:
 939 
        else:
940 
            cartItem['quantity'] = 0
 940 
            cartItem['quantity'] = 0
941 
            cartMessageOOS += 1
 941 
            cartMessageOOS += 1
942 
            cartItemMessages.append({"type":"danger", "messageText":"Out of Stock"})
 942 
            cartItemMessages.append({"type":"danger", "messageText":"Out of Stock"})
943 
            Discount.query.filter(Discount.line==line).delete()
 943 
            Discount.query.filter(Discount.line==line).delete()
944 
            line.actual_price=0
 - 
 
945 
            line.delete()
 944 
            line.delete()
946 
        totalQty += cartItem['quantity']
 945 
        totalQty += cartItem['quantity']
947 
        totalAmount += line.actual_price * cartItem['quantity']
 - 
 
948 
        if cartItemMessages:
 946 
        if cartItemMessages:
949 
            cartItems.insert(0, cartItem)
 947 
            cartItems.insert(0, cartItem)
950 
        else:
 948 
        else:
951 
            cartItems.append(cartItem)
 949 
            cartItems.append(cartItem)
952 
    if cart.checked_out_on is not None:
 950 
    if cart.checked_out_on is not None: