| Line 433... |
Line 433... |
| 433 |
|
433 |
|
| 434 |
LOGGER.info("unsettledPaymentList" + up);
|
434 |
LOGGER.info("unsettledPaymentList" + up);
|
| 435 |
return "unsettled-payments";
|
435 |
return "unsettled-payments";
|
| 436 |
}
|
436 |
}
|
| 437 |
|
437 |
|
| 438 |
|
- |
|
| 439 |
@RequestMapping(value = "/getUnsettledPaymentsByAmount", method = RequestMethod.GET)
|
438 |
@RequestMapping(value = "/getUnsettledPaymentsByAmount", method = RequestMethod.GET)
|
| 440 |
public String getUnsettledPaymentByAmount(HttpServletRequest request,
|
439 |
public String getUnsettledPaymentByAmount(HttpServletRequest request,
|
| 441 |
@RequestParam(name = "amount", defaultValue = "0") float amount,
|
440 |
@RequestParam(name = "amount", defaultValue = "0") float amount,
|
| 442 |
@RequestParam(name = "offset", defaultValue = "0") int offset,
|
441 |
@RequestParam(name = "offset", defaultValue = "0") int offset,
|
| 443 |
@RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
|
442 |
@RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
|
| Line 462... |
Line 461... |
| 462 |
} else {
|
461 |
} else {
|
| 463 |
model.addAttribute("unsettledPayment", up);
|
462 |
model.addAttribute("unsettledPayment", up);
|
| 464 |
model.addAttribute("size", size);
|
463 |
model.addAttribute("size", size);
|
| 465 |
}
|
464 |
}
|
| 466 |
|
465 |
|
| 467 |
|
- |
|
| 468 |
return "unsettle-payment-modal";
|
466 |
return "unsettle-payment-modal";
|
| 469 |
}
|
467 |
}
|
| 470 |
|
468 |
|
| 471 |
@RequestMapping(value = "/createUnsettledPaymentsEntries", method = RequestMethod.POST)
|
469 |
@RequestMapping(value = "/createUnsettledPaymentsEntries", method = RequestMethod.POST)
|
| 472 |
public String createUnsettledPaymentsEntries(HttpServletRequest request,
|
470 |
public String createUnsettledPaymentsEntries(HttpServletRequest request,
|
| Line 491... |
Line 489... |
| 491 |
|
489 |
|
| 492 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
490 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
| 493 |
return "response";
|
491 |
return "response";
|
| 494 |
}
|
492 |
}
|
| 495 |
|
493 |
|
| - |
|
494 |
@RequestMapping(value = "/wallet/statement", method = RequestMethod.GET)
|
| - |
|
495 |
public String removeUnsettledPaymentsEntries(HttpServletRequest request, @RequestParam LocalDateTime startDate,
|
| - |
|
496 |
@RequestParam LocalDateTime endDate, Model model) throws Exception {
|
| - |
|
497 |
LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
|
| - |
|
498 |
float openingBalance = walletService.getOpeningTill(fofoDetails.getFofoId(), startDate);
|
| - |
|
499 |
float closingBalance = walletService.getOpeningTill(fofoDetails.getFofoId(), endDate);
|
| - |
|
500 |
List<UserWalletHistory> uwhList = walletService.getPaginatedUserWalletHistoryByRetailerId(
|
| - |
|
501 |
fofoDetails.getFofoId(), startDate, endDate, 0, 0);
|
| - |
|
502 |
/*HttpHeaders headers = new HttpHeaders();
|
| - |
|
503 |
InputStreamResource is = new InputStreamResource();
|
| - |
|
504 |
headers.set("Content-Type", "application/vnd.ms-excel");
|
| - |
|
505 |
headers.set("Content-disposition", "inline; filename=report-" + fileName + ".csv");
|
| - |
|
506 |
headers.setContentLength(response.getEntity().getContentLength());*/
|
| - |
|
507 |
model.addAttribute("opening", openingBalance);
|
| - |
|
508 |
model.addAttribute("closing", closingBalance);
|
| - |
|
509 |
model.addAttribute("history", uwhList);
|
| - |
|
510 |
model.addAttribute("startDate", startDate);
|
| - |
|
511 |
model.addAttribute("endDate", endDate);
|
| - |
|
512 |
return "walletStatement";
|
| - |
|
513 |
}
|
| - |
|
514 |
|
| 496 |
}
|
515 |
}
|