Subversion Repositories SmartDukaan

Rev

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

Rev 12720 Rev 12721
Line 473... Line 473...
473
    .order_by(desc(AmazonPromotion.addedOn)).all()
473
    .order_by(desc(AmazonPromotion.addedOn)).all()
474
    for amPromotion in amPromotions:
474
    for amPromotion in amPromotions:
475
        if amazonShortTermActivePromotions.has_key(amPromotion.sku):
475
        if amazonShortTermActivePromotions.has_key(amPromotion.sku):
476
            continue
476
            continue
477
        amazonShortTermActivePromotions[amPromotion.sku] = __Promotion(amPromotion.salePrice,amPromotion.subsidy,amPromotion.promotionType,amPromotion.endDate)
477
        amazonShortTermActivePromotions[amPromotion.sku] = __Promotion(amPromotion.salePrice,amPromotion.subsidy,amPromotion.promotionType,amPromotion.endDate)
478
    amPromotions = AmazonPromotion.query.filter(AmazonPromotion.endDate>=(time-timedelta(days=1))).filter(AmazonPromotion.endDate<=time).filter(AmazonPromotion.promotionType==AmazonPromotionType.SHORTTERM).filter(AmazonPromotion.promotionActive==True) \
478
    amPromotions = AmazonPromotion.query.filter(AmazonPromotion.endDate>=(time-timedelta(days=1))).filter(AmazonPromotion.endDate<=time).filter(AmazonPromotion.promotionType==AmazonPromotionType.LONGTERM).filter(AmazonPromotion.promotionActive==True) \
479
    .order_by(desc(AmazonPromotion.addedOn)).all()
479
    .order_by(desc(AmazonPromotion.addedOn)).all()
480
    for amPromotion in amPromotions: 
480
    for amPromotion in amPromotions: 
481
        if wpiTodayExpiry.has_key(amPromotion.sku):
481
        if wpiTodayExpiry.has_key(amPromotion.sku):
482
            continue
482
            continue
483
        wpiTodayExpiry[amPromotion.sku] = __Promotion(amPromotion.salePrice,amPromotion.subsidy,amPromotion.promotionType,amPromotion.endDate)
483
        wpiTodayExpiry[amPromotion.sku] = __Promotion(amPromotion.salePrice,amPromotion.subsidy,amPromotion.promotionType,amPromotion.endDate)