Subversion Repositories SmartDukaan

Rev

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

Rev 28105 Rev 28134
Line 344... Line 344...
344
			}
344
			}
345
		}
345
		}
346
 
346
 
347
		else if (searchItem > 0) {
347
		else if (searchItem > 0) {
348
			TagListing tagListing = null;
348
			TagListing tagListing = null;
349
				tagListing = tagListingRepository.selectByItemId(searchItem);
349
			tagListing = tagListingRepository.selectByItemId(searchItem);
350
				if (tagListing != null) {
350
			if (tagListing != null) {
351
					model.addAttribute("dp", tagListing.getSellingPrice());
351
				model.addAttribute("dp", tagListing.getSellingPrice());
352
					model.addAttribute("mop", tagListing.getMop());
352
				model.addAttribute("mop", tagListing.getMop());
353
			}
353
			}
354
			schemes = schemeService.selectSchemeByPartnerType(partnerType, date, searchItem, isAdmin, offset, limit);
354
			schemes = schemeService.selectSchemeByPartnerType(partnerType, date, searchItem, isAdmin, offset, limit);
355
			model.addAttribute("schemes", schemes);
355
			model.addAttribute("schemes", schemes);
356
			if (schemes.size() == 0) {
356
			if (schemes.size() == 0) {
357
				return "schemes";
357
				return "schemes";
358
			}
358
			}
359
			//For 7720(HR) remove investment
359
			// For 7720(HR) remove investment
360
			if(fofoStoreRepository.getWarehousePartnerMap().get(7720).stream().filter(x->x.getId()==loginDetails.getFofoId()).count() > 0) {
360
			if (fofoStoreRepository.getWarehousePartnerMap().get(7720).stream()
-
 
361
					.filter(x -> x.getId() == loginDetails.getFofoId()).count() > 0) {
361
				schemes = schemes.stream().filter(x->!x.getType().equals(SchemeType.INVESTMENT)).collect(Collectors.toList());
362
				schemes = schemes.stream().filter(x -> !x.getType().equals(SchemeType.INVESTMENT))
-
 
363
						.collect(Collectors.toList());
362
			}
364
			}
363
			for (Scheme scheme : schemes) {
365
			for (Scheme scheme : schemes) {
364
				if (scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
366
				if (scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
365
					if (tagListing != null) {
367
					if (tagListing != null) {
366
						float taxRate = stateGstRateRepository.getIgstTaxRate(Arrays.asList(searchItem)).get(searchItem);
368
						float taxRate = stateGstRateRepository.getIgstTaxRate(Arrays.asList(searchItem))
-
 
369
								.get(searchItem);
367
						float taxableSellingPrice = tagListing.getSellingPrice() / (1 + taxRate / 100);
370
						float taxableSellingPrice = tagListing.getSellingPrice() / (1 + taxRate / 100);
368
						float amount = taxableSellingPrice * scheme.getAmount() / 100;
371
						float amount = taxableSellingPrice * scheme.getAmount() / 100;
369
						scheme.setAmountModel(
372
						scheme.setAmountModel(
370
								FormattingUtils.formatDecimalTwoDigits(amount) + " (" + scheme.getAmount() + "%)");
373
								FormattingUtils.formatDecimalTwoDigits(amount) + " (" + scheme.getAmount() + "%)");
371
					}
374
					}
Line 395... Line 398...
395
		// model.addAttribute("roleTypes", loginDetails.getRoleTypes());
398
		// model.addAttribute("roleTypes", loginDetails.getRoleTypes());
396
		if (isAdmin)
399
		if (isAdmin)
397
			return "schemes";
400
			return "schemes";
398
		else {
401
		else {
399
			List<CreateOfferRequest> offers = new ArrayList<>();
402
			List<CreateOfferRequest> offers = new ArrayList<>();
400
			if(searchItem > 0) {
403
			if (searchItem > 0) {
401
				offers = offerService.getPublishedOffers(date, loginDetails.getFofoId(), searchItem);
404
				offers = offerService.getPublishedOffers(date, loginDetails.getFofoId(), searchItem);
402
			}
405
			}
403
			model.addAttribute("offers", offers);
406
			model.addAttribute("offers", offers);
-
 
407
			model.addAttribute("partnerId", loginDetails.getFofoId());
404
			return "schemes-partner";
408
			return "schemes-partner";
405
		}
409
		}
406
	}
410
	}
407
 
411
 
408
	@RequestMapping(value = "/getPaginatedSchemes", method = RequestMethod.GET)
412
	@RequestMapping(value = "/getPaginatedSchemes", method = RequestMethod.GET)