| Line 413... |
Line 413... |
| 413 |
model.addAttribute("fofoOrder", fofoOrder);
|
413 |
model.addAttribute("fofoOrder", fofoOrder);
|
| 414 |
model.addAttribute("itemsMap", itemsMap);
|
414 |
model.addAttribute("itemsMap", itemsMap);
|
| 415 |
model.addAttribute("fofoOrderItemIdLineItemsMap", StringUtils.toString(fofoOrderItemIdLineItemMap));
|
415 |
model.addAttribute("fofoOrderItemIdLineItemsMap", StringUtils.toString(fofoOrderItemIdLineItemMap));
|
| 416 |
model.addAttribute("foiIdCustomerReturnInventoryItemsMap",
|
416 |
model.addAttribute("foiIdCustomerReturnInventoryItemsMap",
|
| 417 |
StringUtils.toString(foiIdCustomerReturnInventoryItemsMap));
|
417 |
StringUtils.toString(foiIdCustomerReturnInventoryItemsMap));
|
| - |
|
418 |
model.addAttribute("fofoOrderItemIdLineItemMap", fofoOrderItemIdLineItemMap);
|
| - |
|
419 |
|
| 418 |
model.addAttribute("fofoOrderItems", fofoOrderItems);
|
420 |
model.addAttribute("fofoOrderItems", fofoOrderItems);
|
| 419 |
model.addAttribute("inventoryItemBilledQtyMap", StringUtils.toString(inventoryItemBilledQtyMap));
|
421 |
model.addAttribute("inventoryItemBilledQtyMap", StringUtils.toString(inventoryItemBilledQtyMap));
|
| 420 |
model.addAttribute("customerBillingAddress", orderService.getBillingAddress(customerAddress));
|
422 |
model.addAttribute("customerBillingAddress", orderService.getBillingAddress(customerAddress));
|
| 421 |
model.addAttribute("customerBillingAddressObj", customerAddress);
|
423 |
model.addAttribute("customerBillingAddressObj", customerAddress);
|
| 422 |
model.addAttribute("paymentOptionTransactions", paymentOptionTransactions);
|
424 |
model.addAttribute("paymentOptionTransactions", paymentOptionTransactions);
|
| Line 429... |
Line 431... |
| 429 |
private void markDoa(FofoOrder fofoOrder, FofoOrderItem foi, boolean isAdmin) {
|
431 |
private void markDoa(FofoOrder fofoOrder, FofoOrderItem foi, boolean isAdmin) {
|
| 430 |
if (isAdmin) {
|
432 |
if (isAdmin) {
|
| 431 |
foi.setDoa(true);
|
433 |
foi.setDoa(true);
|
| 432 |
return;
|
434 |
return;
|
| 433 |
}
|
435 |
}
|
| - |
|
436 |
boolean isImei = foi.getFofoLineItems().stream()
|
| 434 |
boolean isImei = foi.getFofoLineItems().stream().anyMatch(x -> org.apache.commons.lang3.StringUtils.isNotEmpty(x.getSerialNumber()) && allowedDoaImeis.contains(x.getSerialNumber()));
|
437 |
.anyMatch(x -> org.apache.commons.lang3.StringUtils.isNotEmpty(x.getSerialNumber())
|
| - |
|
438 |
&& allowedDoaImeis.contains(x.getSerialNumber()));
|
| 435 |
LocalDateTime buyDate = fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS);
|
439 |
LocalDateTime buyDate = fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS);
|
| 436 |
LocalDateTime curDate = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);
|
440 |
LocalDateTime curDate = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);
|
| 437 |
if (buyDate.isAfter(curDate.minusDays(45)) || isImei) {
|
441 |
if (buyDate.isAfter(curDate.minusDays(45)) || isImei) {
|
| 438 |
foi.setDoa(true);
|
442 |
foi.setDoa(true);
|
| 439 |
} else
|
443 |
} else
|