Subversion Repositories SmartDukaan

Rev

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

Rev 33818 Rev 33822
Line 297... Line 297...
297
        // Retrieve customer offer items
297
        // Retrieve customer offer items
298
        List<CustomerOfferItem> customerOfferItems = customerOfferItemRepository.selectByOfferIds(customerOfferIds, catalogItemId, todayDate);
298
        List<CustomerOfferItem> customerOfferItems = customerOfferItemRepository.selectByOfferIds(customerOfferIds, catalogItemId, todayDate);
299
 
299
 
300
        // Filter customer offer items with endDate greater than today
300
        // Filter customer offer items with endDate greater than today
301
        List<CustomerOfferItem> filteredCustomerOfferItems = customerOfferItems.stream()
301
        List<CustomerOfferItem> filteredCustomerOfferItems = customerOfferItems.stream()
302
                .filter(item -> item.getEndDate() != null && item.getEndDate().isAfter(todayDate))
302
                .filter(x -> x.getEndDate() != null && !x.getEndDate().isBefore(todayDate))
303
                .collect(Collectors.toList());
303
                .collect(Collectors.toList());
304
 
304
 
305
        model.addAttribute("webOffers", webOffers);
305
        model.addAttribute("webOffers", webOffers);
306
        model.addAttribute("customerOfferItems", filteredCustomerOfferItems);
306
        model.addAttribute("customerOfferItems", filteredCustomerOfferItems);
307
 
307