Subversion Repositories SmartDukaan

Rev

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

Rev 24087 Rev 24094
Line 137... Line 137...
137
	private PaymentOptionTransactionRepository fofoOrderPaymentOptionRepository;
137
	private PaymentOptionTransactionRepository fofoOrderPaymentOptionRepository;
138
 
138
 
139
	@Autowired
139
	@Autowired
140
	private FofoPartnerPaymentOptionRepository fofoPartnerPaymentOptionRepository;
140
	private FofoPartnerPaymentOptionRepository fofoPartnerPaymentOptionRepository;
141
 
141
 
142
 
-
 
143
	@Autowired
142
	@Autowired
144
	private ResponseSender<?> responseSender;
143
	private ResponseSender<?> responseSender;
145
 
144
 
146
	@RequestMapping(value = "/order")
145
	@RequestMapping(value = "/order")
147
	public String orderIndex(HttpServletRequest request, @RequestParam(name = "cartData") String cartData, Model model)
146
	public String orderIndex(HttpServletRequest request, @RequestParam(name = "cartData") String cartData, Model model)
Line 284... Line 283...
284
			for (FofoLineItem fli : foi.getFofoLineItems()) {
283
			for (FofoLineItem fli : foi.getFofoLineItems()) {
285
				inventoryItemBilledQtyMap.put(fli.getInventoryItemId(), fli.getQuantity());
284
				inventoryItemBilledQtyMap.put(fli.getInventoryItemId(), fli.getQuantity());
286
			}
285
			}
287
			List<CustomerReturnItem> customerReturnItems = customerReturnItemRepository
286
			List<CustomerReturnItem> customerReturnItems = customerReturnItemRepository
288
					.selectAllByOrderItemId(foi.getId());
287
					.selectAllByOrderItemId(foi.getId());
-
 
288
			this.markDoa(fofoOrder, foi);
289
			for (CustomerReturnItem customerReturnItem : customerReturnItems) {
289
			for (CustomerReturnItem customerReturnItem : customerReturnItems) {
290
				inventoryItemBilledQtyMap.put(customerReturnItem.getInventoryItemId(),
290
				inventoryItemBilledQtyMap.put(customerReturnItem.getInventoryItemId(),
291
						inventoryItemBilledQtyMap.get(customerReturnItem.getInventoryItemId()) - 1);
291
						inventoryItemBilledQtyMap.get(customerReturnItem.getInventoryItemId()) - 1);
292
			}
292
			}
293
		}
293
		}
Line 303... Line 303...
303
		model.addAttribute("customerBillingAddress", orderService.getBillingAddress(customerAddress));
303
		model.addAttribute("customerBillingAddress", orderService.getBillingAddress(customerAddress));
304
		model.addAttribute("customerBillingAddressObj", customerAddress);
304
		model.addAttribute("customerBillingAddressObj", customerAddress);
305
		model.addAttribute("paymentOptionTransactions", paymentOptionTransactions);
305
		model.addAttribute("paymentOptionTransactions", paymentOptionTransactions);
306
		model.addAttribute("paymentOptionIdPaymentOptionMap", paymentOptionIdPaymentOptionMap);
306
		model.addAttribute("paymentOptionIdPaymentOptionMap", paymentOptionIdPaymentOptionMap);
307
		model.addAttribute("insurancePolicies", insurancePolicies);
307
		model.addAttribute("insurancePolicies", insurancePolicies);
308
		model.addAttribute("markDoa", this.markDoa(fofoOrder));
-
 
309
		model.addAttribute("markDefective", this.markDefective(fofoOrder));
308
		model.addAttribute("markDefective", this.markDefective(fofoOrder));
310
		return "sale-details";
309
		return "sale-details";
311
	}
310
	}
312
 
311
 
313
	private boolean markDoa(FofoOrder fofoOrder) {
312
	private void markDoa(FofoOrder fofoOrder, FofoOrderItem foi) {
-
 
313
		if (foi.getBrand().equals("Nokia") && foi.getCost() < 4990) {
-
 
314
			foi.setDoa(true);
-
 
315
		}
314
		return fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS).plusDays(90)
316
		LocalDateTime buyDate = fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS);
315
				.isAfter(LocalDateTime.now().truncatedTo(ChronoUnit.DAYS));
317
		LocalDateTime curDate = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);
-
 
318
		if (buyDate.isAfter(curDate.minusDays(45))) {
-
 
319
			foi.setDoa(true);
-
 
320
		} else
-
 
321
			foi.setDoa(
-
 
322
					foi.getBrand().equals("Nokia") && foi.getCost() < 4990 && buyDate.isAfter(curDate.minusYears(1)));
316
	}
323
	}
317
 
324
 
318
	private boolean markDefective(FofoOrder fofoOrder) {
325
	private boolean markDefective(FofoOrder fofoOrder) {
319
		return fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS).plusDays(180)
326
		return fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS).plusDays(180)
320
				.isAfter(LocalDateTime.now().truncatedTo(ChronoUnit.DAYS));
327
				.isAfter(LocalDateTime.now().truncatedTo(ChronoUnit.DAYS));