Subversion Repositories SmartDukaan

Rev

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

Rev 12133 Rev 12136
Line 422... Line 422...
422
        parent_category = Category.query.filter_by(id=category.parent_category_id).first()
422
        parent_category = Category.query.filter_by(id=category.parent_category_id).first()
423
        srm = SourceReturnPercentage.get_by(source=OrderSource.SNAPDEAL,brand=it.brand,category_id=it.category)
423
        srm = SourceReturnPercentage.get_by(source=OrderSource.SNAPDEAL,brand=it.brand,category_id=it.category)
424
        sip = SourceItemPercentage.query.filter(SourceItemPercentage.item_id==it.id).filter(SourceItemPercentage.source==OrderSource.SNAPDEAL).filter(SourceItemPercentage.startDate<=time).filter(SourceItemPercentage.expiryDate>=time).first()
424
        sip = SourceItemPercentage.query.filter(SourceItemPercentage.item_id==it.id).filter(SourceItemPercentage.source==OrderSource.SNAPDEAL).filter(SourceItemPercentage.startDate<=time).filter(SourceItemPercentage.expiryDate>=time).first()
425
        sourcePercentage = None
425
        sourcePercentage = None
426
        if sip is not None:
426
        if sip is not None:
427
            sip.returnProvision = srm.returnProvision
-
 
428
            sourcePercentage = sip
427
            sourcePercentage = sip
-
 
428
            sourcePercentage.returnProvision = srm.returnProvision
429
        else:
429
        else:
430
            scp = SourceCategoryPercentage.query.filter(SourceCategoryPercentage.category_id==it.category).filter(SourceCategoryPercentage.source==OrderSource.SNAPDEAL).filter(SourceCategoryPercentage.startDate<=time).filter(SourceCategoryPercentage.expiryDate>=time).first()
430
            scp = SourceCategoryPercentage.query.filter(SourceCategoryPercentage.category_id==it.category).filter(SourceCategoryPercentage.source==OrderSource.SNAPDEAL).filter(SourceCategoryPercentage.startDate<=time).filter(SourceCategoryPercentage.expiryDate>=time).first()
431
            if scp is not None:
431
            if scp is not None:
432
                scp.returnProvision = srm.returnProvision
-
 
433
                sourcePercentage = scp
432
                sourcePercentage = scp
-
 
433
                sourcePercentage.returnProvision = srm.returnProvision
434
            else:
434
            else:
435
                spm = SourcePercentageMaster.get_by(source=OrderSource.SNAPDEAL)
435
                spm = SourcePercentageMaster.get_by(source=OrderSource.SNAPDEAL)
436
                spm.returnProvision = srm.returnProvision
-
 
437
                sourcePercentage = spm
436
                sourcePercentage = spm
-
 
437
                sourcePercentage.returnProvision = srm.returnProvision
438
        snapdealItemInfo = __SnapdealItemInfo(snapdeal_item.supc, snapdeal_item.maxNlc,snapdeal_item.courierCostMarketplace, it.id, it.product_group, it.brand, it.model_name, it.model_number, it.color, it.weight, category.parent_category_id, it.risky, snapdeal_item.warehouseId, None, runType, parent_category.display_name,sourcePercentage)
438
        snapdealItemInfo = __SnapdealItemInfo(snapdeal_item.supc, snapdeal_item.maxNlc,snapdeal_item.courierCostMarketplace, it.id, it.product_group, it.brand, it.model_name, it.model_number, it.color, it.weight, category.parent_category_id, it.risky, snapdeal_item.warehouseId, None, runType, parent_category.display_name,sourcePercentage)
439
        itemInfo.append(snapdealItemInfo)
439
        itemInfo.append(snapdealItemInfo)
440
    return itemInfo
440
    return itemInfo
441
 
441
 
442
    
442