Subversion Repositories SmartDukaan

Rev

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

Rev 16458 Rev 16483
Line 477... Line 477...
477
                item[0]['dp'] = d['dp']
477
                item[0]['dp'] = d['dp']
478
                item[0]['showDp'] = d['showDp']
478
                item[0]['showDp'] = d['showDp']
479
            except:
479
            except:
480
                item[0]['dp'] = 0.0
480
                item[0]['dp'] = 0.0
481
                item[0]['showDp'] = 0
481
                item[0]['showDp'] = 0
-
 
482
            try:
-
 
483
                item[0]['thumbnail'] = item[0]['thumbnail'].strip()
-
 
484
            except:
-
 
485
                pass 
482
            temp.append(item[0])
486
            temp.append(item[0])
483
        if len(temp) > 1:
487
        if len(temp) > 1:
484
            temp = sorted(temp, key = lambda x: (x['available_price']),reverse=False)
488
            temp = sorted(temp, key = lambda x: (x['available_price']),reverse=False)
485
        dealsListMap.append(temp)
489
        dealsListMap.append(temp)
486
    return dealsListMap
490
    return dealsListMap
Line 586... Line 590...
586
            skuData['cash_back'] = 0
590
            skuData['cash_back'] = 0
587
        skuData['in_stock'] = int(skuData['in_stock'])
591
        skuData['in_stock'] = int(skuData['in_stock'])
588
        skuData['is_shortage'] = int(skuData['is_shortage'])
592
        skuData['is_shortage'] = int(skuData['is_shortage'])
589
        skuData['category_id'] = int(skuData['category_id'])
593
        skuData['category_id'] = int(skuData['category_id'])
590
        skuData['status'] = int(skuData['status'])
594
        skuData['status'] = int(skuData['status'])
-
 
595
        try:
-
 
596
            skuData['thumbnail'] = skuData['thumbnail'].strip()
-
 
597
        except:
-
 
598
            pass 
591
        if showDp is not None:
599
        if showDp is not None:
592
            dealerPrice = get_mongo_connection().Catalog.SkuDealerPrices.find_one({'skuBundleId':skuData['skuBundleId']})
600
            dealerPrice = get_mongo_connection().Catalog.SkuDealerPrices.find_one({'skuBundleId':skuData['skuBundleId']})
593
            skuData['dp'] = 0.0
601
            skuData['dp'] = 0.0
594
            skuData['showDp'] = 0
602
            skuData['showDp'] = 0
595
            if dealerPrice is not None:
603
            if dealerPrice is not None:
Line 699... Line 707...
699
    elif source_id == 3:
707
    elif source_id == 3:
700
        skuData = get_mongo_connection().Catalog.MasterData.find_one({'secondaryIdentifier':identifier.strip(), 'source_id':source_id})
708
        skuData = get_mongo_connection().Catalog.MasterData.find_one({'secondaryIdentifier':identifier.strip(), 'source_id':source_id})
701
    if skuData is None:
709
    if skuData is None:
702
        return {}
710
        return {}
703
    else:
711
    else:
-
 
712
        try:
-
 
713
            return {'thumbnail':skuData.get('thumbnail').strip()}
-
 
714
        except:
704
        return {'thumbnail':skuData.get('thumbnail')}
715
            return {'thumbnail':skuData.get('thumbnail')}
705
    
716
    
706
def next_weekday(d, weekday):
717
def next_weekday(d, weekday):
707
    days_ahead = weekday - d.weekday()
718
    days_ahead = weekday - d.weekday()
708
    if days_ahead <= 0: # Target day already happened this week
719
    if days_ahead <= 0: # Target day already happened this week
709
        days_ahead += 7
720
        days_ahead += 7