Subversion Repositories SmartDukaan

Rev

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

Rev 28437 Rev 29642
Line 105... Line 105...
105
import com.spice.profitmandi.service.integrations.zest.MobileInsurancePlan;
105
import com.spice.profitmandi.service.integrations.zest.MobileInsurancePlan;
106
import com.spice.profitmandi.service.order.OrderService;
106
import com.spice.profitmandi.service.order.OrderService;
107
import com.spice.profitmandi.service.pricing.PricingService;
107
import com.spice.profitmandi.service.pricing.PricingService;
108
import com.spice.profitmandi.service.user.RetailerService;
108
import com.spice.profitmandi.service.user.RetailerService;
109
import com.spice.profitmandi.web.model.LoginDetails;
109
import com.spice.profitmandi.web.model.LoginDetails;
110
 
-
 
111
import com.spice.profitmandi.web.util.CookiesProcessor;
110
import com.spice.profitmandi.web.util.CookiesProcessor;
112
import com.spice.profitmandi.web.util.MVCResponseSender;
111
import com.spice.profitmandi.web.util.MVCResponseSender;
113
 
112
 
114
@Controller
113
@Controller
115
@Transactional(rollbackFor = Throwable.class)
114
@Transactional(rollbackFor = Throwable.class)
Line 134... Line 133...
134
	private CustomerReturnItemRepository customerReturnItemRepository;
133
	private CustomerReturnItemRepository customerReturnItemRepository;
135
 
134
 
136
	@Autowired
135
	@Autowired
137
	private FofoOrderItemRepository fofoOrderItemRepository;
136
	private FofoOrderItemRepository fofoOrderItemRepository;
138
 
137
 
-
 
138
	private static final List<String> allowedDoaImeis = Arrays.asList("863903054378477");
-
 
139
 
139
	@Autowired
140
	@Autowired
140
	private PaymentOptionRepository paymentOptionRepository;
141
	private PaymentOptionRepository paymentOptionRepository;
141
 
142
 
142
	@Autowired
143
	@Autowired
143
	private StateRepository stateRepository;
144
	private StateRepository stateRepository;
Line 428... Line 429...
428
	private void markDoa(FofoOrder fofoOrder, FofoOrderItem foi, boolean isAdmin) {
429
	private void markDoa(FofoOrder fofoOrder, FofoOrderItem foi, boolean isAdmin) {
429
		if (isAdmin) {
430
		if (isAdmin) {
430
			foi.setDoa(true);
431
			foi.setDoa(true);
431
			return;
432
			return;
432
		}
433
		}
433
		boolean isImei = foi.getFofoLineItems().stream().anyMatch(x -> x.getSerialNumber().equals("863903054378477"));
434
		boolean isImei = foi.getFofoLineItems().stream().anyMatch(x -> org.apache.commons.lang3.StringUtils.isNotEmpty(x.getSerialNumber()) && allowedDoaImeis.contains(x.getSerialNumber()));
434
		LocalDateTime buyDate = fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS);
435
		LocalDateTime buyDate = fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS);
435
		LocalDateTime curDate = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);
436
		LocalDateTime curDate = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);
436
		if (buyDate.isAfter(curDate.minusDays(45)) || isImei) {
437
		if (buyDate.isAfter(curDate.minusDays(45)) || isImei) {
437
			foi.setDoa(true);
438
			foi.setDoa(true);
438
		} else
439
		} else