Subversion Repositories SmartDukaan

Rev

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

Rev 27424 Rev 27612
Line 77... Line 77...
77 
	private static final Logger LOGGER = LogManager.getLogger(SchemeController.class);
 77 
	private static final Logger LOGGER = LogManager.getLogger(SchemeController.class);
78 
 
 78 
 
79 
	@Autowired
 79 
	@Autowired
80 
	private SchemeService schemeService;
 80 
	private SchemeService schemeService;
81 
 
 81 
 
82
- 
 
83 
	@Autowired
 82 
	@Autowired
84 
	private StateGstRateRepository stateGstRateRepository;
 83 
	private StateGstRateRepository stateGstRateRepository;
85
84 
 
86 
	@Autowired
 85 
	@Autowired
87 
	private ItemRepository itemRepository;
 86 
	private ItemRepository itemRepository;
88
87 
 
89 
	@Autowired
 88 
	@Autowired
90 
	private SchemeRepository schemeRepository;
 89 
	private SchemeRepository schemeRepository;
91 
 
 90 
 
92 
	@Autowired
 91 
	@Autowired
93 
	private SchemeItemRepository schemeItemRepository;
 92 
	private SchemeItemRepository schemeItemRepository;
Line 106... Line 105...
106 
	private TagListingRepository tagListingRepository;
 105 
	private TagListingRepository tagListingRepository;
107 
 
 106 
 
108 
	@Autowired
 107 
	@Autowired
109 
	private RoleManager roleManager;
 108 
	private RoleManager roleManager;
110 
 
 109 
 
111 
 
 - 
 
112 
	@Autowired
 110 
	@Autowired
113 
	private ResponseSender<?> responseSender;
 111 
	private ResponseSender<?> responseSender;
114 
 
 112 
 
115 
 
 - 
 
116 
	@Autowired
 113 
	@Autowired
117 
	private FofoStoreRepository fofoStoreRepository;
 114 
	private FofoStoreRepository fofoStoreRepository;
118 
 
 115 
 
119 
	@Autowired
 116 
	@Autowired
120 
	private RetailerService retailerService;
 117 
	private RetailerService retailerService;
Line 319... Line 316...
319 
		if (partnerType == null) {
 316 
		if (partnerType == null) {
320 
			partnerType = partnerTypeChangeService.getTypeOnDate(loginDetails.getFofoId(), LocalDate.now());
 317 
			partnerType = partnerTypeChangeService.getTypeOnDate(loginDetails.getFofoId(), LocalDate.now());
321 
		}
 318 
		}
322 
		if (!(searchTerm.equals(""))) {
 319 
		if (!(searchTerm.equals(""))) {
323 
			schemes = schemeRepository.selectBySearchTerm(searchTerm, offset, limit);
 320 
			schemes = schemeRepository.selectBySearchTerm(searchTerm, offset, limit);
324 
			for(Scheme scheme  : schemes) {
 321 
			for (Scheme scheme : schemes) {
325 
				if(scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
 322 
				if (scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
326 
					scheme.setAmountModel(scheme.getAmount() + "%");
 323 
					scheme.setAmountModel(scheme.getAmount() + "%");
327 
				} else {
 324 
				} else {
328 
					scheme.setAmountModel(scheme.getAmount() + "");
 325 
					scheme.setAmountModel(scheme.getAmount() + "");
329 
				}
 326 
				}
330 
			}
 327 
			}
331 
			if (!(schemes.size() == 0)) {
 328 
			if (!(schemes.size() == 0)) {
332
- 
 
333 
				size = schemeRepository.selectAllCount();
 329 
				size = schemeRepository.selectAllCount();
334 
				LOGGER.info("schemes" + schemes);
 330 
				LOGGER.info("schemes" + schemes);
335 
				model.addAttribute("schemes", schemes);
 331 
				model.addAttribute("schemes", schemes);
336 
				model.addAttribute("start", offset + 1);
 332 
				model.addAttribute("start", offset + 1);
337 
				model.addAttribute("size", size);
 333 
				model.addAttribute("size", size);
338 
				if (schemes.size() < limit) {
 334 
				if (schemes.size() < limit) {
339 
					model.addAttribute("end", offset + schemes.size());
 335 
					model.addAttribute("end", offset + schemes.size());
- 
 
 336 
				}
- 
 
 337 
 
340 
				} else {
 338 
				else {
341 
					model.addAttribute("end", offset + limit);
 339 
					model.addAttribute("end", offset + limit);
342 
				}
 340 
				}
- 
 
 341 
			}
- 
 
 342 
 
343 
			} else {
 343 
			else {
344 
				throw new ProfitMandiBusinessException("SchemeId", searchTerm, "SchemeId Not Found");
 344 
				throw new ProfitMandiBusinessException("SchemeId", searchTerm, "SchemeId Not Found");
345 
			}
 345 
			}
346 
		} else {
 346 
		}
- 
 
 347 
 
- 
 
 348 
		else if (!searchItem.equals("")) {
347 
			int itemId = 0;
 349 
			int itemId = 0;
348 
			TagListing tagListing = null;
 350 
			TagListing tagListing = null;
349 
			if (!searchItem.equals("")) {
 351 
			if (!searchItem.equals("")) {
350 
				itemId = Integer.parseInt(searchItem);
 352 
				itemId = Integer.parseInt(searchItem);
351 
				tagListing = tagListingRepository.selectByItemId(itemId);
 353 
				tagListing = tagListingRepository.selectByItemId(itemId);
352 
				if(tagListing!=null) {
 354 
				if (tagListing != null) {
353 
					model.addAttribute("dp", tagListing.getSellingPrice());
 355 
					model.addAttribute("dp", tagListing.getSellingPrice());
354 
					model.addAttribute("mop", tagListing.getMop());
 356 
					model.addAttribute("mop", tagListing.getMop());
355 
				}
 357 
				}
356 
			}
 358 
			}
357 
			schemes = schemeService.selectSchemeByPartnerType(partnerType, itemId, isAdmin, offset, limit);
 359 
			schemes = schemeService.selectSchemeByPartnerType(partnerType, itemId, isAdmin, offset, limit);
358 
			model.addAttribute("schemes", schemes);
 360 
			model.addAttribute("schemes", schemes);
359 
			if(schemes.size()==0) {
 361 
			if (schemes.size() == 0) {
360 
				return "schemes";
 362 
				return "schemes";
361 
			}
 363 
			}
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(itemId)).get(itemId);
 368 
						float taxRate = stateGstRateRepository.getIgstTaxRate(Arrays.asList(itemId)).get(itemId);
367 
						float taxableSellingPrice = tagListing.getSellingPrice() / (1 + taxRate / 100);
 369 
						float taxableSellingPrice = tagListing.getSellingPrice() / (1 + taxRate / 100);
368 
						float amount = taxableSellingPrice * scheme.getAmount() / 100;
 370 
						float amount = taxableSellingPrice * scheme.getAmount() / 100;
- 
 
 371 
						scheme.setAmountModel(
369 
						scheme.setAmountModel(FormattingUtils.formatDecimalTwoDigits(amount) +" ("+ scheme.getAmount() + "%)");
 372 
								FormattingUtils.formatDecimalTwoDigits(amount) + " (" + scheme.getAmount() + "%)");
370 
					}
 373 
					}
371
374 
 
372 
					else {
 375 
					else {
373 
						scheme.setAmountModel(scheme.getAmount() + "%");
 376 
						scheme.setAmountModel(scheme.getAmount() + "%");
374 
					}
 377 
					}
375 
				} else {
 378 
				} else {
376 
					scheme.setAmountModel(scheme.getAmount() + "");
 379 
					scheme.setAmountModel(scheme.getAmount() + "");
377 
				}
 380 
				}
378
- 
 
379
381 
 
380 
			}
 382 
			}
381 
			size = schemeService.selectSchemeCount(partnerType, itemId, isAdmin);
 383 
			size = schemeService.selectSchemeCount(partnerType, itemId, isAdmin);
382 
			model.addAttribute("start", offset + 1);
 384 
			model.addAttribute("start", offset + 1);
383 
			model.addAttribute("size", size);
 385 
			model.addAttribute("size", size);
384 
			if (schemes.size() < limit) {
 386 
			if (schemes.size() < limit) {
385 
				model.addAttribute("end", offset + schemes.size());
 387 
				model.addAttribute("end", offset + schemes.size());
386 
			} else {
 388 
			} else {
387 
				model.addAttribute("end", offset + limit);
 389 
				model.addAttribute("end", offset + limit);
388 
			}
 390 
			}
389 
		}
 391 
		}
- 
 
 392 
		model.addAttribute("schemes", schemes);
- 
 
 393 
		LOGGER.info("schemes"+schemes);
390 
		// model.addAttribute("roleTypes", loginDetails.getRoleTypes());
 394 
		// model.addAttribute("roleTypes", loginDetails.getRoleTypes());
391 
		return "schemes";
 395 
		return "schemes";
392 
	}
 396 
	}
393 
 
 397 
 
394 
	@RequestMapping(value = "/getPaginatedSchemes", method = RequestMethod.GET)
 398 
	@RequestMapping(value = "/getPaginatedSchemes", method = RequestMethod.GET)
Line 416... Line 420...
416 
		LOGGER.info("partnerType" + partnerType);
 420 
		LOGGER.info("partnerType" + partnerType);
417 
		int itemId = 0;
 421 
		int itemId = 0;
418 
		TagListing tagListing = null;
 422 
		TagListing tagListing = null;
419 
		if (!(searchItem.equals(""))) {
 423 
		if (!(searchItem.equals(""))) {
420 
			itemId = Integer.parseInt(searchItem);
 424 
			itemId = Integer.parseInt(searchItem);
421 
			tagListing = tagListingRepository.selectByItemId(itemId);
425 
			tagListing = tagListingRepository.selectByItemId(itemId);
422 
		}
 426 
		}
- 
 
 427 
 
423 
		schemes = schemeService.selectSchemeByPartnerType(partnerType, itemId, isAdmin, offset, limit);
 428 
		schemes = schemeService.selectSchemeByPartnerType(partnerType, itemId, isAdmin, offset, limit);
424 
		for(Scheme scheme : schemes) {
 429 
		for (Scheme scheme : schemes) {
425 
			if(scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
 430 
			if (scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
426 
				if(itemId > 0) {
 431 
				if (itemId > 0) {
427 
					float taxRate = stateGstRateRepository.getIgstTaxRate(Arrays.asList(itemId)).get(itemId);
 432 
					float taxRate = stateGstRateRepository.getIgstTaxRate(Arrays.asList(itemId)).get(itemId);
428 
					float taxableSellingPrice = tagListing.getSellingPrice() / (1 + taxRate / 100);
 433 
					float taxableSellingPrice = tagListing.getSellingPrice() / (1 + taxRate / 100);
429 
					float amount = taxableSellingPrice * scheme.getAmount() / 100;
 434 
					float amount = taxableSellingPrice * scheme.getAmount() / 100;
- 
 
 435 
					scheme.setAmountModel(
430 
					scheme.setAmountModel(FormattingUtils.formatDecimalTwoDigits(amount) +" ("+ scheme.getAmount() + "%)");
 436 
							FormattingUtils.formatDecimalTwoDigits(amount) + " (" + scheme.getAmount() + "%)");
431 
				} else {
 437 
				} else {
432 
					scheme.setAmountModel(scheme.getAmount() + "%");
 438 
					scheme.setAmountModel(scheme.getAmount() + "%");
433 
				}
 439 
				}
434 
			} else {
 440 
			} else {
435 
				scheme.setAmountModel("₹" + scheme.getAmount());
 441 
				scheme.setAmountModel("₹" + scheme.getAmount());