Subversion Repositories SmartDukaan

Rev

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

Rev 28492 Rev 28544
Line 360... Line 360...
360
			}
360
			}
361
			//For 7720(HR) remove investment
361
			//For 7720(HR) remove investment
362
			if(item.getBrand().equals("Vivo") && fofoStoreRepository.getWarehousePartnerMap().get(7720).stream().filter(x->x.getId()==loginDetails.getFofoId()).count() > 0) {
362
			if(item.getBrand().equals("Vivo") && fofoStoreRepository.getWarehousePartnerMap().get(7720).stream().filter(x->x.getId()==loginDetails.getFofoId()).count() > 0) {
363
				schemes = schemes.stream().filter(x->!x.getType().equals(SchemeType.INVESTMENT)).collect(Collectors.toList());
363
				schemes = schemes.stream().filter(x->!x.getType().equals(SchemeType.INVESTMENT)).collect(Collectors.toList());
364
			}
364
			}
-
 
365
			float nlc = tagListing.getSellingPrice();
365
			for (Scheme scheme : schemes) {
366
			for (Scheme scheme : schemes) {
366
				if (scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
367
				if (scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
367
					if (tagListing != null) {
368
					if (tagListing != null) {
368
						float taxRate = stateGstRateRepository.getIgstTaxRate(Arrays.asList(searchItem))
369
						float taxRate = stateGstRateRepository.getIgstTaxRate(Arrays.asList(searchItem))
369
								.get(searchItem);
370
								.get(searchItem);
370
						float taxableSellingPrice = tagListing.getSellingPrice() / (1 + taxRate / 100);
371
						float taxableSellingPrice = tagListing.getSellingPrice() / (1 + taxRate / 100);
371
						float amount = taxableSellingPrice * scheme.getAmount() / 100;
372
						float amount = taxableSellingPrice * scheme.getAmount() / 100;
372
						scheme.setAmountModel(
373
						scheme.setAmountModel(
373
								FormattingUtils.formatDecimalTwoDigits(amount) + " (" + scheme.getAmount() + "%)");
374
								FormattingUtils.formatDecimalTwoDigits(amount) + " (" + scheme.getAmount() + "%)");
-
 
375
						nlc -= amount;
374
					}
376
					}
375
 
377
 
376
					else {
378
					else {
377
						scheme.setAmountModel(scheme.getAmount() + "%");
379
						scheme.setAmountModel(scheme.getAmount() + "%");
378
					}
380
					}
379
				} else {
381
				} else {
380
					scheme.setAmountModel(scheme.getAmount() + "");
382
					scheme.setAmountModel(scheme.getAmount() + "");
-
 
383
					nlc -= scheme.getAmount();
381
				}
384
				}
382
			}
385
			}
383
			size = schemeService.selectSchemeCount(partnerType, date, searchItem, isAdmin);
386
			size = schemeService.selectSchemeCount(partnerType, date, searchItem, isAdmin);
384
			model.addAttribute("start", offset + 1);
387
			model.addAttribute("start", offset + 1);
385
			model.addAttribute("size", size);
388
			model.addAttribute("size", size);
Line 388... Line 391...
388
			} else {
391
			} else {
389
				model.addAttribute("end", offset + limit);
392
				model.addAttribute("end", offset + limit);
390
			}
393
			}
391
		}
394
		}
392
		model.addAttribute("searchItem", searchItem);
395
		model.addAttribute("searchItem", searchItem);
-
 
396
		model.addAttribute("nlc", searchItem);
393
		model.addAttribute("searchTerm", searchTerm);
397
		model.addAttribute("searchTerm", searchTerm);
394
		model.addAttribute("partnerType", partnerType);
398
		model.addAttribute("partnerType", partnerType);
395
		model.addAttribute("isAdmin", isAdmin);
399
		model.addAttribute("isAdmin", isAdmin);
396
		model.addAttribute("schemes", schemes);
400
		model.addAttribute("schemes", schemes);
397
		LOGGER.info("schemes" + schemes);
401
		LOGGER.info("schemes" + schemes);