Subversion Repositories SmartDukaan

Rev

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

Rev 30017 Rev 30426
Line 267... Line 267...
267 
		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.pending);
 267 
		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.pending);
268 
		LOGGER.info("walletRequest" + walletRequest);
 268 
		LOGGER.info("walletRequest" + walletRequest);
269 
		size = addWalletRequestRepository.selectCountByStatus(AddWalletRequestStatus.pending);
 269 
		size = addWalletRequestRepository.selectCountByStatus(AddWalletRequestStatus.pending);
270 
		if (!walletRequest.isEmpty()) {
 270 
		if (!walletRequest.isEmpty()) {
271 
			List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
 271 
			List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
- 
 
 272 
 
272 
			Map<Integer, CustomRetailer> fofoIdsAndRetailerName = retailerService.getFofoRetailers(fofoIds);
 273 
			Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
- 
 
 274 
 
- 
 
 275 
			Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x))
- 
 
 276 
					.filter(x -> x != null).collect(Collectors.toList()).stream()
- 
 
 277 
					.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
273 
 
 278 
 
274 
			model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
 279 
			model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
275 
			model.addAttribute("walletRequest", walletRequest);
 280 
			model.addAttribute("walletRequest", walletRequest);
276 
			model.addAttribute("rStatus", "pending");
 281 
			model.addAttribute("rStatus", "pending");
277 
			model.addAttribute("start", offset + 1);
 282 
			model.addAttribute("start", offset + 1);
Line 301... Line 306...
301 
		List<AddWalletRequest> walletRequest = null;
 306 
		List<AddWalletRequest> walletRequest = null;
302 
		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.pending);
 307 
		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.pending);
303 
		LOGGER.info("walletRequest" + walletRequest);
 308 
		LOGGER.info("walletRequest" + walletRequest);
304 
		if (!walletRequest.isEmpty()) {
 309 
		if (!walletRequest.isEmpty()) {
305 
			List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
 310 
			List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
306 
			Map<Integer, CustomRetailer> fofoIdsAndRetailerName = retailerService.getFofoRetailers(fofoIds);
 311 
			Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
- 
 
 312 
 
- 
 
 313 
			Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x))
- 
 
 314 
					.filter(x -> x != null).collect(Collectors.toList()).stream()
- 
 
 315 
					.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
307 
 
 316 
 
308 
			model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
 317 
			model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
309 
			model.addAttribute("walletRequest", walletRequest);
 318 
			model.addAttribute("walletRequest", walletRequest);
310 
			model.addAttribute("rStatus", "pending");
 319 
			model.addAttribute("rStatus", "pending");
311 
			model.addAttribute("url", "/getPaginatedWalletRequest");
 320 
			model.addAttribute("url", "/getPaginatedWalletRequest");
Line 329... Line 338...
329 
		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.approved);
 338 
		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.approved);
330 
		size = addWalletRequestRepository.selectCountByStatus(AddWalletRequestStatus.approved);
 339 
		size = addWalletRequestRepository.selectCountByStatus(AddWalletRequestStatus.approved);
331 
		LOGGER.info("walletRequest" + walletRequest);
 340 
		LOGGER.info("walletRequest" + walletRequest);
332 
		if (!walletRequest.isEmpty()) {
 341 
		if (!walletRequest.isEmpty()) {
333 
			List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
 342 
			List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
334 
			Map<Integer, CustomRetailer> fofoIdsAndRetailerName = retailerService.getFofoRetailers(fofoIds);
 343 
			Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
- 
 
 344 
 
- 
 
 345 
			Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x))
- 
 
 346 
					.filter(x -> x != null).collect(Collectors.toList()).stream()
- 
 
 347 
					.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
335 
 
 348 
 
336 
			model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
 349 
			model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
337 
			model.addAttribute("walletRequest", walletRequest);
 350 
			model.addAttribute("walletRequest", walletRequest);
338 
			model.addAttribute("start", offset + 1);
 351 
			model.addAttribute("start", offset + 1);
339 
			model.addAttribute("size", size);
 352 
			model.addAttribute("size", size);
Line 362... Line 375...
362 
		List<AddWalletRequest> walletRequest = null;
 375 
		List<AddWalletRequest> walletRequest = null;
363 
		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.approved);
 376 
		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.approved);
364 
		LOGGER.info("walletRequest" + walletRequest);
 377 
		LOGGER.info("walletRequest" + walletRequest);
365 
		if (!walletRequest.isEmpty()) {
 378 
		if (!walletRequest.isEmpty()) {
366 
			List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
 379 
			List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
367 
			Map<Integer, CustomRetailer> fofoIdsAndRetailerName = retailerService.getFofoRetailers(fofoIds);
 380 
			Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
- 
 
 381 
 
- 
 
 382 
			Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x))
- 
 
 383 
					.filter(x -> x != null).collect(Collectors.toList()).stream()
- 
 
 384 
					.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
368 
 
 385 
 
369 
			model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
 386 
			model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
370 
			model.addAttribute("walletRequest", walletRequest);
 387 
			model.addAttribute("walletRequest", walletRequest);
371 
			model.addAttribute("url", "/getPaginatedWalletApproved");
 388 
			model.addAttribute("url", "/getPaginatedWalletApproved");
372 
		} else {
 389 
		} else {
Line 387... Line 404...
387 
		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.rejected);
 404 
		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.rejected);
388 
		size = addWalletRequestRepository.selectCountByStatus(AddWalletRequestStatus.rejected);
 405 
		size = addWalletRequestRepository.selectCountByStatus(AddWalletRequestStatus.rejected);
389 
		LOGGER.info("walletRequest" + walletRequest);
 406 
		LOGGER.info("walletRequest" + walletRequest);
390 
		if (!walletRequest.isEmpty()) {
 407 
		if (!walletRequest.isEmpty()) {
391 
			List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
 408 
			List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
392 
			Map<Integer, CustomRetailer> fofoIdsAndRetailerName = retailerService.getFofoRetailers(fofoIds);
 409 
			Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
- 
 
 410 
 
- 
 
 411 
			Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x))
- 
 
 412 
					.filter(x -> x != null).collect(Collectors.toList()).stream()
- 
 
 413 
					.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
393 
 
 414 
 
394 
			model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
 415 
			model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
395 
			model.addAttribute("walletRequest", walletRequest);
 416 
			model.addAttribute("walletRequest", walletRequest);
396 
			model.addAttribute("start", offset + 1);
 417 
			model.addAttribute("start", offset + 1);
397 
			model.addAttribute("size", size);
 418 
			model.addAttribute("size", size);
Line 419... Line 440...
419 
		List<AddWalletRequest> walletRequest = null;
 440 
		List<AddWalletRequest> walletRequest = null;
420 
		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.rejected);
 441 
		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.rejected);
421 
		LOGGER.info("walletRequest" + walletRequest);
 442 
		LOGGER.info("walletRequest" + walletRequest);
422 
		if (!walletRequest.isEmpty()) {
 443 
		if (!walletRequest.isEmpty()) {
423 
			List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
 444 
			List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
424 
			Map<Integer, CustomRetailer> fofoIdsAndRetailerName = retailerService.getFofoRetailers(fofoIds);
 445 
			Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
425 
 
 446 
 
- 
 
 447 
			Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x))
- 
 
 448 
					.filter(x -> x != null).collect(Collectors.toList()).stream()
- 
 
 449 
					.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
426 
			model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
 450 
			model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
427 
			model.addAttribute("walletRequest", walletRequest);
 451 
			model.addAttribute("walletRequest", walletRequest);
428 
			model.addAttribute("url", "/getPaginatedWalletRequestRejected");
 452 
			model.addAttribute("url", "/getPaginatedWalletRequestRejected");
429 
		} else {
 453 
		} else {
430 
			model.addAttribute("walletRequest", walletRequest);
 454 
			model.addAttribute("walletRequest", walletRequest);
Line 863... Line 887...
863 
	@RequestMapping(value = "/manualPayment", method = RequestMethod.GET)
 887 
	@RequestMapping(value = "/manualPayment", method = RequestMethod.GET)
864 
	public String ManualPayment(HttpServletRequest request, Model model) throws Exception {
 888 
	public String ManualPayment(HttpServletRequest request, Model model) throws Exception {
865 
 
 889 
 
866 
		List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId())
 890 
		List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId())
867 
				.collect(Collectors.toList());
 891 
				.collect(Collectors.toList());
868 
		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
 892 
		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
- 
 
 893 
 
- 
 
 894 
		Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
- 
 
 895 
				.filter(x -> x != null).collect(Collectors.toList()).stream()
- 
 
 896 
				.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
869 
		String customRetailers = JSONObject.valueToString(customRetailersMap.values());
 897 
		String customRetailers = JSONObject.valueToString(customRetailersMap.values());
870 
		model.addAttribute("customRetailers", customRetailers);
 898 
		model.addAttribute("customRetailers", customRetailers);
871 
 
 899 
 
872 
		model.addAttribute("referenceTypes", WalletReferenceType.referenceType);
 900 
		model.addAttribute("referenceTypes", WalletReferenceType.referenceType);
873 
		model.addAttribute("transactionTypes", TransactionType.values());
 901 
		model.addAttribute("transactionTypes", TransactionType.values());
Line 922... Line 950...
922 
 
 950 
 
923 
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
 951 
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
924 
		return "wallet-history";
 952 
		return "wallet-history";
925 
 
 953 
 
926 
	}
 954 
	}
- 
 
 955 
 
927 
	@RequestMapping(value = "/getPartnerName", method = RequestMethod.GET)
 956 
	@RequestMapping(value = "/getPartnerName", method = RequestMethod.GET)
928 
	public String getPartnerName(HttpServletRequest request,
 957 
	public String getPartnerName(HttpServletRequest request,
929 
			@RequestParam(name = "reference", defaultValue = "0") int reference,
 958 
			@RequestParam(name = "reference", defaultValue = "0") int reference,
930 
			@RequestParam WalletReferenceType referenceType, Model model) throws Exception {
 959 
			@RequestParam WalletReferenceType referenceType, Model model) throws Exception {
931 
 
 960