WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

 import com.spice.profitmandi.dao.repository.fofo.InventoryItemRepository;
 import com.spice.profitmandi.dao.repository.fofo.InvoiceNumberGenerationSequenceRepository;
 import com.spice.profitmandi.dao.repository.fofo.PaymentOptionRepository;
 import com.spice.profitmandi.dao.repository.fofo.ScanRecordRepository;
 import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
-import com.spice.profitmandi.dao.repository.transaction.OrderRepositoryImpl;
 import com.spice.profitmandi.dao.repository.user.AddressRepository;
 import com.spice.profitmandi.web.model.FofoDetails;
 import com.spice.profitmandi.web.request.CreateOrderRequest;
 import com.spice.profitmandi.web.request.CustomPaymentOption;
 import com.spice.profitmandi.web.response.ItemIdQuantityAvailability;
 	@RequestMapping(value = "/generateInvoice")
 	public ResponseEntity<?> generateInvoice(HttpServletRequest request, HttpServletResponse response, @RequestParam(name = ProfitMandiConstants.ORDER_ID) int orderId) throws Throwable{
 		LOGGER.info("Request received at url {} with params {} ", request.getRequestURI(), request.getParameterMap());
-		FofoDetails fofoDetails;
-		try {
-			fofoDetails = cookiesFetcher.getCookiesObject(request);
+		FofoDetails fofoDetails = cookiesFetcher.getCookiesObject(request);
-		} catch (ProfitMandiBusinessException e) {
-			return null;
-		}
 		FofoOrder fofoOrder = fofoOrderRepository.selectByFofoIdAndOrderId(fofoDetails.getFofoId(), orderId);
 		PdfModel pdfModel = new PdfModel();
 		pdfModel.setAuther("profitmandi");
 		pdfModel.setTitle("Retailer Invoice");
 		Customer customer = customerRepository.selectById(fofoOrder.getCustomerId());
 		CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
 		customCustomer.setAddress(this.createCustomAddress(customerAddress));
 		pdfModel.setCustomer(customCustomer);
 		pdfModel.setInvoiceNumber(fofoOrder.getInvoiceNumber());
 		pdfModel.setTotalAmount(fofoOrder.getTotalAmount());
 		Retailer retailer = retailerRepository.selectById(fofoDetails.getFofoId());
 		User user = userRepository.selectById(userAccountRepository.selectUserIdByRetailerId(retailer.getId()));
 		CustomRetailer customRetailer = new CustomRetailer();
 		customRetailer.setBusinessName(retailer.getName());
 		customRetailer.setMobileNumber(user.getMobileNumber());
 		customRetailer.setTinNumber(retailer.getNumber());
 		Address retailerAddress = addressRepository.selectById(retailerRegisteredAddressRepository.selectAddressIdByRetailerId(retailer.getId()));
 		customRetailer.setAddress(this.createCustomAddress(retailerAddress));
 		pdfModel.setRetailer(customRetailer);
 		List<FofoLineItem> fofoLineItems = fofoLineItemRepository.selectByOrderId(fofoOrder.getId());
 		Set<CustomFofoOrderItem> customerFofoOrderItems = new HashSet<>();
 		for(FofoLineItem fofoLineItem : fofoLineItems){
 			CustomFofoOrderItem customFofoOrderItem = new CustomFofoOrderItem();
+			float totalTaxRate = fofoLineItem.getIgstRate() + fofoLineItem.getSgstRate() + fofoLineItem.getCgstRate();
+			float taxableSellingPrice = fofoLineItem.getSellingPrice() / (1 + totalTaxRate / 100);
-			customFofoOrderItem.setAmount(fofoLineItem.getQuantity() * fofoLineItem.getSellingPrice());
+			customFofoOrderItem.setAmount(fofoLineItem.getQuantity() * taxableSellingPrice);
 			customFofoOrderItem.setDescription(fofoLineItem.getBrand() + " " + fofoLineItem.getModelName() + " " + fofoLineItem.getModelNumber() + " " + fofoLineItem.getColor());
+			//float taxableTotalAmount = customFofoOrderItem.getAmount() / (1 + (totalTaxRate / 100));
-			float itemTotal = customFofoOrderItem.getAmount();
+			//float itemTotal = customFofoOrderItem.getAmount() + taxableAmount;
+			//LOGGER.info("totalTaxRate ={}, taxableAmount ={}, itemTotal ={}", totalTaxRate, taxableAmount, itemTotal);
-			customFofoOrderItem.setRate(fofoLineItem.getSellingPrice());
+			customFofoOrderItem.setRate(taxableSellingPrice);
 			customFofoOrderItem.setQuantity(fofoLineItem.getQuantity());
+			float igstAmount = (customFofoOrderItem.getAmount() * fofoLineItem.getIgstRate()) / 100;
+			float cgstAmount = (customFofoOrderItem.getAmount() * fofoLineItem.getCgstRate()) / 100;
+			float sgstAmount = (customFofoOrderItem.getAmount() * fofoLineItem.getSgstRate()) / 100;
+			//LOGGER.info("igst [{},{}], cgst [{},{}], sgst[{},{}]", fofoLineItem.getIgstRate(), igstAmount, fofoLineItem.getCgstRate(), cgstAmount, fofoLineItem.getSgstRate(), sgstAmount);
 			customFofoOrderItem.setIgstRate(fofoLineItem.getIgstRate());
+			customFofoOrderItem.setIgstAmount(igstAmount);
-			customFofoOrderItem.setCgstRate(fofoLineItem.getIgstRate());
+			customFofoOrderItem.setCgstRate(fofoLineItem.getCgstRate());
+			customFofoOrderItem.setCgstAmount(cgstAmount);
-			customFofoOrderItem.setSgstRate(fofoLineItem.getIgstRate());
+			customFofoOrderItem.setSgstRate(fofoLineItem.getSgstRate());
+			customFofoOrderItem.setSgstAmount(sgstAmount);
 			customFofoOrderItem.setHsnCode(fofoLineItem.getHsnCode());
+			//customFofoOrderItem.setItemTotal(customFofoOrderItem.getAmount() + igstAmount + cgstAmount + sgstAmount);
-			customFofoOrderItem.setItemTotal(itemTotal);
+			//customFofoOrderItem.setAmount(taxableTotalAmount);
 			customFofoOrderItem.setSerialNumbers(String.join(", ",this.toSerialNumbers(fofoLineItem.getFofoLineItemSerialNumbers())));
 			customerFofoOrderItems.add(customFofoOrderItem);
+			//pdfModel.setTotalAmount(pdfModel.getTotalAmount() + customFofoOrderItem.getItemTotal());
+		}
 		pdfModel.setOrderItems(customerFofoOrderItems);
 		ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
 		PdfUtils.generateAndWrite(pdfModel, byteArrayOutputStream);
 		//final MediaType mediaType=MediaType.parseMediaType(profilePhotoModel.getContentType().getValue());
 		LOGGER.info("Pdf Stream length {}", byteArrayOutputStream.toByteArray().length);
-		final HttpHeaders headers=new HttpHeaders();
+        final HttpHeaders headers=new HttpHeaders();
-		headers.setContentType(MediaType.APPLICATION_PDF);
+        headers.setContentType(MediaType.APPLICATION_PDF);
-		//headers.set("Content-Disposition", "Order-pdf-"+custom);
+        headers.set("Content-Disposition", "Order-"+orderId);
-		headers.setContentLength(byteArrayOutputStream.toByteArray().length);
+        headers.setContentLength(byteArrayOutputStream.toByteArray().length);
-		final InputStream inputStream=new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+        final InputStream inputStream=new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
-		final InputStreamResource inputStreamResource=new InputStreamResource(inputStream);
+        final InputStreamResource inputStreamResource=new InputStreamResource(inputStream);
-		return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
+        return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
+	}
 	private Set<String> toSerialNumbers(Set<FofoLineItemSerialNumber> fofoLineItemSerialNumbers){
 		Set<String> serialNumbers = new HashSet<>(fofoLineItemSerialNumbers.size());
 		for(FofoLineItemSerialNumber fofoLineItemSerialNumber : fofoLineItemSerialNumbers){

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java – Rev 21985 → 22026