Subversion Repositories SmartDukaan

Rev

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

Rev 17780 Rev 17781
Line 76... Line 76...
76 
            d_item = i[0]
 76 
            d_item = i[0]
77 
            d_privatedeal = i[1]
 77 
            d_privatedeal = i[1]
78 
            tempList = bundleMap.get(d_item.catalog_item_id)
 78 
            tempList = bundleMap.get(d_item.catalog_item_id)
79 
            sellingPrice = d_item.sellingPrice
 79 
            sellingPrice = d_item.sellingPrice
80 
            sellingPriceType = "Normal"
 80 
            sellingPriceType = "Normal"
81 
            if d_privatedeal is not None and d_privatedeal.isActive==1 and d_privatedeal.startDate > datetime.now() and d_privatedeal.endDate < datetime.now() and d_privatedeal.dealPrice >0:
 81 
            if d_privatedeal is not None and d_privatedeal.isActive==1 and d_privatedeal.startDate < datetime.now() and d_privatedeal.endDate > datetime.now() and d_privatedeal.dealPrice >0:
82 
                sellingPrice = d_privatedeal.dealPrice
 82 
                sellingPrice = d_privatedeal.dealPrice
83 
                sellingPriceType = "Private deal price"
 83 
                sellingPriceType = "Private deal price"
84 
            tempList.append({'item_id':d_item.id,'color':d_item.color,'sellingPrice':sellingPrice,'sellingPriceType':sellingPriceType})
 84 
            tempList.append({'item_id':d_item.id,'color':d_item.color,'sellingPrice':sellingPrice,'sellingPriceType':sellingPriceType})
85 
        if toBreak:
 85 
        if toBreak:
86 
            print "Breaking"
 86 
            print "Breaking"