Subversion Repositories SmartDukaan

Rev

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

Rev 25562 Rev 25606
Line 333... Line 333...
333
		model.addAttribute("markDefective", this.markDefective(fofoOrder));
333
		model.addAttribute("markDefective", this.markDefective(fofoOrder));
334
		return "sale-details";
334
		return "sale-details";
335
	}
335
	}
336
 
336
 
337
	private void markDoa(FofoOrder fofoOrder, FofoOrderItem foi, boolean isAdmin) {
337
	private void markDoa(FofoOrder fofoOrder, FofoOrderItem foi, boolean isAdmin) {
338
		if(isAdmin) {
338
		if (isAdmin) {
339
			foi.setDoa(true);
339
			foi.setDoa(true);
340
			return;
340
			return;
341
		}
341
		}
342
		LocalDateTime buyDate = fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS);
342
		LocalDateTime buyDate = fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS);
343
		LocalDateTime curDate = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);
343
		LocalDateTime curDate = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);
Line 569... Line 569...
569
			throws ProfitMandiBusinessException {
569
			throws ProfitMandiBusinessException {
570
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
570
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
571
 
571
 
572
		Map<String, Object> map = orderService.getSaleHistory(loginDetails.getFofoId(), searchType, searchValue,
572
		Map<String, Object> map = orderService.getSaleHistory(loginDetails.getFofoId(), searchType, searchValue,
573
				startTime, endTime, offset, limit);
573
				startTime, endTime, offset, limit);
-
 
574
		long size = 0;
574
		model.addAllAttributes(map);
575
		model.addAllAttributes(map);
-
 
576
		size = map.size();
-
 
577
 
-
 
578
		model.addAttribute("start", offset + 1);
-
 
579
		model.addAttribute("size", size);
-
 
580
 
-
 
581
		model.addAttribute("url", "/getPaginatedSaleHistory");
-
 
582
 
-
 
583
		if (map.size() < limit) {
-
 
584
			model.addAttribute("end", offset + map.size());
-
 
585
		} else {
-
 
586
			model.addAttribute("end", offset + limit);
-
 
587
		}
575
 
588
 
576
		return "sale-history";
589
		return "sale-history";
577
	}
590
	}
578
 
591
 
579
	@RequestMapping(value = "/downloadInvoices")
592
	@RequestMapping(value = "/downloadInvoices")
Line 601... Line 614...
601
		ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
614
		ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
602
		List<PdfModel> pdfModels = new ArrayList<>();
615
		List<PdfModel> pdfModels = new ArrayList<>();
603
		for (FofoOrder fofoOrder : fofoOrders) {
616
		for (FofoOrder fofoOrder : fofoOrders) {
604
			try {
617
			try {
605
				pdfModels.add(orderService.getInvoicePdfModel(fofoOrder.getId()));
618
				pdfModels.add(orderService.getInvoicePdfModel(fofoOrder.getId()));
606
			} catch(Exception e) {
619
			} catch (Exception e) {
607
				LOGGER.info("could not create invoice for {}, invoice number {}", fofoOrder.getId(), fofoOrder.getInvoiceNumber());
620
				LOGGER.info("could not create invoice for {}, invoice number {}", fofoOrder.getId(),
-
 
621
						fofoOrder.getInvoiceNumber());
608
			}
622
			}
609
		}
623
		}
610
		PdfUtils.generateAndWrite(pdfModels, byteArrayOutputStream);
624
		PdfUtils.generateAndWrite(pdfModels, byteArrayOutputStream);
611
		headers.setContentLength(byteArrayOutputStream.toByteArray().length);
625
		headers.setContentLength(byteArrayOutputStream.toByteArray().length);
612
		final InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
626
		final InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
Line 642... Line 656...
642
			throws ProfitMandiBusinessException {
656
			throws ProfitMandiBusinessException {
643
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
657
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
644
		Map<String, Object> map = orderService.getSaleHistoryPaginated(loginDetails.getFofoId(), searchType,
658
		Map<String, Object> map = orderService.getSaleHistoryPaginated(loginDetails.getFofoId(), searchType,
645
				searchValue, startTime, endTime, offset, limit);
659
				searchValue, startTime, endTime, offset, limit);
646
		model.addAllAttributes(map);
660
		model.addAllAttributes(map);
647
 
-
 
-
 
661
		model.addAttribute("url", "/getPaginatedSaleHistory");
648
		return "sale-history-paginated";
662
		return "sale-history-paginated";
649
	}
663
	}
650
 
664
 
651
	@PutMapping(value = "/updatePaymentTransaction")
665
	@PutMapping(value = "/updatePaymentTransaction")
652
	public String updateTransactionDetails(HttpServletRequest request, @RequestParam String referenceType,
666
	public String updateTransactionDetails(HttpServletRequest request, @RequestParam String referenceType,