Subversion Repositories SmartDukaan

Rev

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

Rev 19292 Rev 19320
Line 788... Line 788...
788
                if (fd_dealObject.get(category_id).get(rankCounter)) is not None:
788
                if (fd_dealObject.get(category_id).get(rankCounter)) is not None:
789
                    if (fd_dealObject.get(category_id).get(rankCounter).get('offer_id') !=0):
789
                    if (fd_dealObject.get(category_id).get(rankCounter).get('offer_id') !=0):
790
                        #Check whether user can see offer
790
                        #Check whether user can see offer
791
                        if specialOffer is None:
791
                        if specialOffer is None:
792
                            continue
792
                            continue
-
 
793
                    if specialOffer.endDate > to_java_date(datetime.now()):
793
                    deal_object_temp = []
794
                        deal_object_temp = []
794
                    deal_object_temp.append(fd_dealObject.get(category_id).get(rankCounter).get('object'))
795
                        deal_object_temp.append(fd_dealObject.get(category_id).get(rankCounter).get('object'))
795
                    dealsListMap.append(deal_object_temp)
796
                        dealsListMap.append(deal_object_temp)
796
                else:
797
                else:
797
                    break
798
                    break
798
            
799
            
799
        temp = []
800
        temp = []
800
        if dealList is None or len(dealList)==0:
801
        if dealList is None or len(dealList)==0:
Line 925... Line 926...
925
                elif item[0]['cash_back_type'] ==2:
926
                elif item[0]['cash_back_type'] ==2:
926
                    item[0]['netPriceAfterCashBack'] = item[0]['available_price'] -  math.floor(item[0]['cash_back'])
927
                    item[0]['netPriceAfterCashBack'] = item[0]['available_price'] -  math.floor(item[0]['cash_back'])
927
                else:
928
                else:
928
                    item[0]['netPriceAfterCashBack'] = item[0]['available_price']
929
                    item[0]['netPriceAfterCashBack'] = item[0]['available_price']
929
            
930
            
930
            if specialOffer is not None and item[0]['source_id']==4:
931
#             if specialOffer is not None and item[0]['source_id']==4:
931
                if item[0]['category_id'] in specialOffer.categories_applicable and item[0]['subCategoryId'] not in specialOffer.sub_categories_not_applicable:
932
#                 if item[0]['category_id'] in specialOffer.categories_applicable and item[0]['subCategoryId'] not in specialOffer.sub_categories_not_applicable:
932
                    item[0]['specialOffer'] = specialOffer.__dict__
933
#                     item[0]['specialOffer'] = specialOffer.__dict__
933
            else:
934
#             else:
934
                item[0]['specialOffer'] = {}
935
#                 item[0]['specialOffer'] = {}
935
            
936
            
936
            temp.append(item[0])
937
            temp.append(item[0])
937
        if len(temp) > 1:
938
        if len(temp) > 1:
938
            temp = sorted(temp, key = lambda x: (x['available_price']),reverse=False)
939
            temp = sorted(temp, key = lambda x: (x['available_price']),reverse=False)
939
        dealsListMap.append(temp)
940
        dealsListMap.append(temp)