Subversion Repositories SmartDukaan

Rev

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

Rev 34096 Rev 34261
Line 162... Line 162...
162
    PartnerOnBoardingPanelRepository partnerOnBoardingPanelRepository;
162
    PartnerOnBoardingPanelRepository partnerOnBoardingPanelRepository;
163
    @Autowired
163
    @Autowired
164
    StoreTimelineTatService storeTimelineTatService;
164
    StoreTimelineTatService storeTimelineTatService;
165
 
165
 
166
 
166
 
167
 
-
 
168
    @PostMapping(value = "/wallet/upload")
167
    @PostMapping(value = "/wallet/upload")
169
    public String uploadWalletBulk(HttpServletRequest request, @RequestPart("file") MultipartFile file, Model model) throws Exception {
168
    public String uploadWalletBulk(HttpServletRequest request, @RequestPart("file") MultipartFile file, Model model) throws Exception {
170
        List<WalletHistoryModel> walletHistoryModelList = ExcelUtils.parseWalletBulkCredit(file.getInputStream());
169
        List<WalletHistoryModel> walletHistoryModelList = ExcelUtils.parseWalletBulkCredit(file.getInputStream());
171
        for (WalletHistoryModel walletHistoryModel : walletHistoryModelList) {
170
        for (WalletHistoryModel walletHistoryModel : walletHistoryModelList) {
172
            if (walletHistoryModel.getReference() == 0) {
171
            if (walletHistoryModel.getReference() == 0) {
Line 1198... Line 1197...
1198
        model.addAttribute("creditAccount", creditAccount);
1197
        model.addAttribute("creditAccount", creditAccount);
1199
        model.addAttribute("customRetailers", customRetailers);
1198
        model.addAttribute("customRetailers", customRetailers);
1200
        return "partner-credit-detail-row";
1199
        return "partner-credit-detail-row";
1201
    }
1200
    }
1202
 
1201
 
-
 
1202
    @RequestMapping(value = "/downloadAddWalletRequestReport", method = RequestMethod.GET)
-
 
1203
    public ResponseEntity<?> addWalletRequestPendingReport(@RequestParam LocalDate startDate, @RequestParam LocalDate endDate,@RequestParam AddWalletRequestStatus status, Model model) throws Exception {
-
 
1204
        if(endDate==null){
-
 
1205
            endDate=LocalDate.now();
-
 
1206
        }
-
 
1207
        LocalDateTime form = startDate.atStartOfDay();
-
 
1208
        LocalDateTime to = endDate.atStartOfDay().plusDays(1);
-
 
1209
        return walletService.createAddWalletRequestReport(form, to, status);
-
 
1210
    }
-
 
1211
 
-
 
1212
 
1203
}
1213
}