| Line 581... |
Line 581... |
| 581 |
continue;
|
581 |
continue;
|
| 582 |
}
|
582 |
}
|
| 583 |
}
|
583 |
}
|
| 584 |
attachments.add(new Attachment("invoice-" + serialNumber + ".pdf", new ByteArrayResource(bytes)));
|
584 |
attachments.add(new Attachment("invoice-" + serialNumber + ".pdf", new ByteArrayResource(bytes)));
|
| 585 |
}
|
585 |
}
|
| 586 |
|
586 |
|
| 587 |
Utils.sendMailWithAttachments(mailSender, new String[] {"kuldeep.kumar@smartdukaan.com"}, null, "Invoices List", "PFA", attachments.toArray(new Attachment[attachments.size()]));
|
587 |
Utils.sendMailWithAttachments(mailSender, new String[] { "kuldeep.kumar@smartdukaan.com" }, null,
|
| - |
|
588 |
"Invoices List", "PFA", attachments.toArray(new Attachment[attachments.size()]));
|
| 588 |
return new ResponseEntity<Boolean>(true, HttpStatus.OK);
|
589 |
return new ResponseEntity<Boolean>(true, HttpStatus.OK);
|
| 589 |
}
|
590 |
}
|
| 590 |
|
591 |
|
| 591 |
@RequestMapping(value = "/getInventoryItemAgingByInterval", method = RequestMethod.POST)
|
592 |
@RequestMapping(value = "/getInventoryItemAgingByInterval", method = RequestMethod.POST)
|
| 592 |
public String getInventoryItemAgingByInterval(HttpServletRequest request, @RequestBody List<Integer> intervals,
|
593 |
public String getInventoryItemAgingByInterval(HttpServletRequest request, @RequestBody List<Integer> intervals,
|
| Line 824... |
Line 825... |
| 824 |
|
825 |
|
| 825 |
Map<Integer, NotifyCancel> notifyCancelOrders = notifyCancelOrderRepository.selectByOrderIds(orderIds)
|
826 |
Map<Integer, NotifyCancel> notifyCancelOrders = notifyCancelOrderRepository.selectByOrderIds(orderIds)
|
| 826 |
.stream().collect(Collectors.toMap(x -> x.getOrderId(), x -> x));
|
827 |
.stream().collect(Collectors.toMap(x -> x.getOrderId(), x -> x));
|
| 827 |
Map<Integer, String> storeIdAndFofoIdMap = fofoStoreRepository.selectByRetailerIds(retailerIds).stream()
|
828 |
Map<Integer, String> storeIdAndFofoIdMap = fofoStoreRepository.selectByRetailerIds(retailerIds).stream()
|
| 828 |
.collect(Collectors.toMap(FofoStore::getId, FofoStore::getCode));
|
829 |
.collect(Collectors.toMap(FofoStore::getId, FofoStore::getCode));
|
| 829 |
List<com.spice.profitmandi.dao.entity.transaction.Order> pendingPaymentorder = orderRepository
|
- |
|
| 830 |
.selectAllOrderDatesBetweenByStatus(LocalDateTime.now().minusDays(30), LocalDateTime.now(),
|
- |
|
| 831 |
OrderStatus.PAYMENT_PENDING);
|
- |
|
| 832 |
List<com.spice.profitmandi.dao.entity.transaction.Order> failedPaymentorder = orderRepository
|
- |
|
| 833 |
.selectAllOrderDatesBetweenByStatus(LocalDateTime.now().minusDays(30), LocalDateTime.now(),
|
- |
|
| 834 |
OrderStatus.PAYMENT_FAILED);
|
- |
|
| 835 |
pendingPaymentorder.addAll(failedPaymentorder);
|
- |
|
| 836 |
|
830 |
|
| 837 |
model.addAttribute("inProcessorder", inProcessorder);
|
831 |
model.addAttribute("inProcessorder", inProcessorder);
|
| 838 |
model.addAttribute("storeIdAndFofoIdMap", storeIdAndFofoIdMap);
|
832 |
model.addAttribute("storeIdAndFofoIdMap", storeIdAndFofoIdMap);
|
| 839 |
model.addAttribute("pendingPaymentorder", pendingPaymentorder);
|
- |
|
| 840 |
model.addAttribute("latestNotifyOrders", notifyOrders);
|
833 |
model.addAttribute("latestNotifyOrders", notifyOrders);
|
| 841 |
model.addAttribute("notifyCancelOrders", notifyCancelOrders);
|
834 |
model.addAttribute("notifyCancelOrders", notifyCancelOrders);
|
| 842 |
} else {
|
835 |
} else {
|
| 843 |
model.addAttribute("inProcessorder", inProcessorder);
|
836 |
model.addAttribute("inProcessorder", inProcessorder);
|
| 844 |
}
|
837 |
}
|
| 845 |
return "review_order";
|
838 |
return "review_order";
|
| 846 |
}
|
839 |
}
|
| 847 |
|
840 |
|
| - |
|
841 |
@RequestMapping(value = "/getPaymentPendingOrder", method = RequestMethod.GET)
|
| - |
|
842 |
public String getPaymentPendingOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
| - |
|
843 |
|
| - |
|
844 |
List<com.spice.profitmandi.dao.entity.transaction.Order> pendingPaymentorder = orderRepository
|
| - |
|
845 |
.selectAllOrderDatesBetweenByStatus(LocalDateTime.now().minusMonths(3), LocalDateTime.now(),
|
| - |
|
846 |
OrderStatus.PAYMENT_PENDING);
|
| - |
|
847 |
List<com.spice.profitmandi.dao.entity.transaction.Order> failedPaymentorder = orderRepository
|
| - |
|
848 |
.selectAllOrderDatesBetweenByStatus(LocalDateTime.now().minusMonths(3), LocalDateTime.now(),
|
| - |
|
849 |
OrderStatus.PAYMENT_FAILED);
|
| - |
|
850 |
pendingPaymentorder.addAll(failedPaymentorder);
|
| - |
|
851 |
model.addAttribute("pendingPaymentorder", pendingPaymentorder);
|
| - |
|
852 |
|
| - |
|
853 |
return "payment-pending-order";
|
| - |
|
854 |
}
|
| - |
|
855 |
|
| 848 |
@RequestMapping(value = "/getKeepInTabOrder", method = RequestMethod.GET)
|
856 |
@RequestMapping(value = "/getKeepInTabOrder", method = RequestMethod.GET)
|
| 849 |
public String getKeepInTabOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
857 |
public String getKeepInTabOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
| 850 |
|
858 |
|
| 851 |
List<com.spice.profitmandi.dao.entity.transaction.Order> keepatab = orderRepository
|
859 |
List<com.spice.profitmandi.dao.entity.transaction.Order> keepatab = orderRepository
|
| 852 |
.selectAllOrder(OrderStatus.KEEP_A_TAB);
|
860 |
.selectAllOrder(OrderStatus.KEEP_A_TAB);
|