WebSVN – SmartDukaan – Diff – /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java

 		UNIT_TRANSFER_PRICE(12),
 		UNIT_SELLING_PRICE(13),
 		TOTAL_TRANSFER_PRICE(14),
 		TOTAL_SELLING_PRICE(15),
 		CURRENT_STATUS(16),
+		VENDOR_PAID(17),
-		PAYMENT_STATUS(17),
+		PAYMENT_STATUS(18),
-		PAYMENT_TYPE(18),
+		PAYMENT_TYPE(19),
-		PAYMENT_ID(19),
+		PAYMENT_ID(20),
-		COUPON_CODE(20),
+		COUPON_CODE(21),
-		SETTLEMENT_DATE(21),
+		SETTLEMENT_DATE(22),
-		SERVICE_TAX(22),
+		SERVICE_TAX(23),
-		OTHER_CHARGES(23),
+		OTHER_CHARGES(24),
-		NET_COLLECTION(24),
+		NET_COLLECTION(25),
-		USER_PAYABLE_AMOUNT(25);
+		USER_PAYABLE_AMOUNT(26);
 		private int value;
 		OrderReportColumn(int value) {
 			this.value = value;
 	private File bluedartSettlementReport;
 	private String aramexSettlementDate;
 	private File aramexSettlementReport;
+	private String delhiverySettlementDate;
+	private File delhiverySettlementReport;
 	private Map<Long, String> ebsSettlementSummaries;
 	private List<OrderStatus> refundOrderStatuses;
 	private List<Order> reshippedNonPayableOrders = new ArrayList<Order>();
 			uploadOrderIdsToBeMarkedPaid();
 		} else if (formType.equals("markOrdersAsReturned"))	{
 			uploadOrderIdsToBeMarkedReturned();
+		} else if (formType.equals("uploadDelhiverySettlements"))	{
+			uploadDelhiverySettlements();
 		}
 		initiatializeDashboard();
 		return new DefaultHttpHeaders("report");
+	}
 	    	for (Provider provider: logisticsClient.getAllProviders())	{
 	    		codProviders.put(provider.getId(), provider.getName());
+	    	}
 			try	{
+				DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+				String formType = request.getParameter("formtype");
+				long fromTime = 0;
+				long toTime = 0;
+				boolean notall = true;
+				if (formType.equals("downloadbydate")) {
+					if(! request.getParameter("start").isEmpty() && ! request.getParameter("end").isEmpty()) {
+						Date startDate = dateFormat.parse(request.getParameter("start"));
+					    fromTime = startDate.getTime();
+					    Date endDate = dateFormat.parse(request.getParameter("end"));
+					    toTime = endDate.getTime();
+					}
+					else {
+						String errMsg = "No Date Range given";
+						logger.error(errMsg);
+						addActionError(errMsg);
+						return new DefaultHttpHeaders("report");
+					}
+					notall = false;
+				}
 			    long vendorId = Long.parseLong(request.getParameter("vendor"));
 			    String vendorName = "";
 			    logger.info("Vendor ID: " + vendorId);
 			    if(vendorId == -1) {
 				response.setContentType("application/vnd.ms-excel");
 				response.setHeader("Content-disposition", "inline; filename=" + vendorName + "-reconciliation.xls");
 				ServletOutputStream sos;
 				try {
-					ByteArrayOutputStream baos = getReconciliationReport(vendorId);
+					ByteArrayOutputStream baos = getReconciliationReport(vendorId, fromTime, toTime, notall);
 					sos = response.getOutputStream();
 					baos.writeTo(sos);
 					sos.flush();
 				} catch (IOException e)	{
 					String errMsg = "Error while streaming the reconciliation report";
+				}
 			} catch (NullPointerException e) {
 	            String errMsg = "NullPointerException";
 				logger.error(errMsg, e);
 				addActionError(errMsg);
+			} catch (ParseException e) {
+	        	String errMsg = "Could not parse the Dates";
+	        	logger.error(errMsg, e);
+				addActionError(errMsg);
-			}
+	        }
 		} catch (Exception e) {
 			String errMsg = "Exception Occured in generateReconciliationReport";
 			logger.error(errMsg, e);
 			addActionError(errMsg);
         int indexSettlementDate = 1;
         int indexTransactionDateFrom = 2;
         int indexTransactionDateTo = 3;
         int indexAmount = 4;
-        Row firstRow = sheet.getRow(0);
-        Row secondRow = sheet.getRow(1);
-        Row thirdRow = sheet.getRow(2);
-        Row fourthRow = sheet.getRow(3);
-        Row fifthRow = sheet.getRow(4);
 		TransactionClient tsc;
+		int countSuccessfulSaves = 0;
 		long settlementId = 0;
 		try {
 			tsc = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
 			for(Row row: sheet)	{
-				if(row.equals(firstRow) || row.equals(secondRow) || row.equals(thirdRow) || row.equals(fourthRow) || row.equals(fifthRow))	{
+				if(row.getRowNum() < 5) {
-					continue;
+	    			continue;
-				}
+	    		}
-				settlementId = (long) row.getCell(indexSettlementId).getNumericCellValue();
-				String settlementDateStr = row.getCell(indexSettlementDate).getStringCellValue();
-				String transactionDateFromStr = row.getCell(indexTransactionDateFrom).getStringCellValue();
-				String transactionDateToStr = row.getCell(indexTransactionDateTo).getStringCellValue();
-				Double amount = row.getCell(indexAmount).getNumericCellValue();
-				Date settlementDate = settlementDateFormat.parse(settlementDateStr);
-				Date transactionDateFrom = transactionDateFormat.parse(transactionDateFromStr);
-				Date transactionDateTo = transactionDateFormat.parse(transactionDateToStr);
 				try	{
+					settlementId = (long) row.getCell(indexSettlementId).getNumericCellValue();
+					String settlementDateStr = row.getCell(indexSettlementDate).getStringCellValue();
+					String transactionDateFromStr = row.getCell(indexTransactionDateFrom).getStringCellValue();
+					String transactionDateToStr = row.getCell(indexTransactionDateTo).getStringCellValue();
+					Double amount = row.getCell(indexAmount).getNumericCellValue();
+					Date settlementDate = settlementDateFormat.parse(settlementDateStr);
+					Date transactionDateFrom = transactionDateFormat.parse(transactionDateFromStr);
+					Date transactionDateTo = transactionDateFormat.parse(transactionDateToStr);
 					transactionClient.saveEBSSettlementSummary(settlementId, settlementDate.getTime(), transactionDateFrom.getTime(), transactionDateTo.getTime(), amount);
+					countSuccessfulSaves += 1;
 				} catch (TransactionServiceException e) {
                 	String errMsg = "TransactionServiceException recieved for settlement Id, " + Long.toString(settlementId);
         			logger.error(errMsg, e);
         			addActionError(errMsg);
+        		} catch (Exception e) {
+                	String errMsg = "Exception recieved for settlement Id, " + Long.toString(settlementId);
+        			logger.error(errMsg, e);
+        			addActionError(errMsg);
+        		}
+			}
         } catch (Exception e) {
-			String errMsg = "Exception recieved for payment Id," + Long.toString(settlementId);
+			String errMsg = "Exception recieved for settlement Id," + Long.toString(settlementId);
 			logger.error(errMsg, e);
 			addActionError(errMsg);
+		}
+        addActionMessage("Successfully added " + countSuccessfulSaves + " EBS Settlements");
+	}
 	public void uploadHDFCSettlements()	{
 		logger.info("Uploading HDFC settlements");
 			addActionError(errMsg);
 			return;
+		}
 		Sheet sheet = wb.getSheetAt(0);
-		Row firstRow = sheet.getRow(0);
 		int indexRECFMT = 2;
 		int indexSettlementDate = 7;
 		int indexPaymentId = 13;
 		int indexMSF = 14;
 		int indexServiceTax = 15;
 		try {
 			tsc = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
 			for (Row row: sheet)	{
-                if(row.equals(firstRow))	continue;
+				if(row.getRowNum() < 1) {
+	    			continue;
-                if(row.getCell(0).getStringCellValue().equals("Total"))	break;
+	    		}
                 try	{
+                	if(row.getCell(0).getStringCellValue().equals("Total")) {
+                    	break;
+                    }
                     String recfmt = row.getCell(indexRECFMT).getStringCellValue();
                     Date settlementDate = row.getCell(indexSettlementDate).getDateCellValue();
                 	double netCollection = row.getCell(indexNetCollection).getNumericCellValue();
                 	paymentIdStr = row.getCell(indexPaymentId).getStringCellValue().replace("'", "").trim();
                 	paymentId = Long.parseLong(paymentIdStr);
         		} catch (TransactionServiceException e) {
                 	String errMsg = "TransactionServiceException recieved for payment Id, " + Long.toString(paymentId);
         			logger.error(errMsg, e);
         			addActionError(errMsg);
+        		} catch (Exception e) {
+        			String errMsg = "Exception recieved for payment Id," + Long.toString(paymentId);
+        			logger.error(errMsg, e);
+        			addActionError(errMsg);
+        		}
+			}
 		} catch (Exception e) {
 			String errMsg = "Exception recieved for payment Id," + Long.toString(paymentId);
 			logger.error(errMsg, e);
 			return;
+        }
         Sheet sheet = wb.getSheetAt(0);
-        Row firstRow = sheet.getRow(0);
-        logger.info("Cell count:" + firstRow.getPhysicalNumberOfCells());
         int indexOrderId = 15;
         int indexAmount = 14;
         TransactionClient tsc;
     	int countSuccessfulSaves = 0;
         	long orderId = 0;
         	for (Row row : sheet) {
     			String orderIdString = "";
+    			if(row.getRowNum() < 1) {
+	    			continue;
+	    		}
         		try	{
         			orderIdString = row.getCell(indexOrderId).getStringCellValue();
         			orderId = Long.parseLong(orderIdString);
         			double amount = row.getCell(indexAmount).getNumericCellValue();
         		} catch (TransactionServiceException e) {
         			String errMsg = "TransactionServiceException For OrderId: " + orderId;
                 	logger.error(errMsg, e);
         			addActionError(errMsg);
+				} catch (Exception e) {
+					String errMsg = "Exception recieved for OrderId:" + orderId;
+					logger.error(errMsg, e);
+					addActionError(errMsg);
-				}
+		        }
+        	}
         } catch (ParseException e) {
         	String errMsg = "Could not parse " + bluedartSettlementDate;
 			logger.error(errMsg, e);
 			addActionError(errMsg);
         Sheet sheet = wb.getSheetAt(0);
         int indexAWB = 0;
         int indexAmount = 1;
         int indexComment = 2;
-        Row firstRow = sheet.getRow(0);
-        logger.info("Cell count:" + firstRow.getPhysicalNumberOfCells());
         TransactionClient tsc;
         int countSuccessfulSaves = 0;
         try	{
 			long settlementDate = DATE_FORMAT.parse(aramexSettlementDate).getTime();
         	tsc = new TransactionClient();
         	in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
 	    	for (Row row: sheet)	{
-	    		if(row.equals(firstRow)) {
+	    		if(row.getRowNum() < 1) {
 	    			continue;
+	    		}
 	    		if(row.getCell(indexAWB) == null) {
 	    			continue;
+	    		}
 				long awb = -1;
+				try {
-				if(row.getCell(indexAWB).getCellType() == 0) {
+					if(row.getCell(indexAWB).getCellType() == 0) {
-					awb = (long) row.getCell(indexAWB).getNumericCellValue();
+						awb = (long) row.getCell(indexAWB).getNumericCellValue();
-				}
+					}
-			    else if(row.getCell(indexAWB).getCellType() == 1) {
+				    else if(row.getCell(indexAWB).getCellType() == 1) {
-			    	awb = Long.parseLong(row.getCell(indexAWB).getStringCellValue());
+				    	awb = Long.parseLong(row.getCell(indexAWB).getStringCellValue());
-			    }
+				    }
-				if(awb == -1) {
+					if(awb == -1) {
-					continue;
+						continue;
+					}
+		    		else if(row.getCell(indexComment).getStringCellValue().equals("LOST SHIPMENT")) {
+		    			logger.info("LOST SHIPMENT");
+		    			continue;
+		    		}
+		    		long orderId = transactionClient.getOrderForAwb(Long.toString(awb)).getId();
+		    		double amount = row.getCell(indexAmount).getNumericCellValue();
+		    		logger.info("Aramex Settlement, Order Id: " + orderId + " Amount: " + amount);
+					transactionClient.savePaymentSettlements(settlementDate, 4, orderId, 0.0, 0.0, amount);
+					countSuccessfulSaves += 1;
+				} catch (TransactionServiceException e) {
+					logger.error("Transaction Service Exception while getting order for AWB, " + awb, e);
+					addActionError("Transaction Service Exception while getting order for AWB, " + awb);
+				} catch (Exception e) {
+					String errMsg = "Exception recieved for AWB," + awb;
+					logger.error(errMsg, e);
+					addActionError(errMsg);
+				}
+	    	}
+        } catch (ParseException e) {
+        	String errMsg = "Could not parse " + aramexSettlementDate;
+        	logger.error(errMsg, e);
+			addActionError(errMsg);
+        } catch (Exception e) {
+        	String errMsg = e.getMessage();
+			logger.error(errMsg, e);
+			addActionError(errMsg);
+        }
+        addActionMessage("Successfully added Aramex settlement details for " + countSuccessfulSaves + " orders");
+	}
+	public void uploadDelhiverySettlements() {
+		logger.info("Uploading Delhivery Settlements" + this.delhiverySettlementDate);
+		if(this.delhiverySettlementDate.equals("")) {
+			addActionError("Settlement date cannot be left blank");
+			return;
+		}
+		Workbook wb = null;
+        try {
-	    		else if(row.getCell(indexComment).getStringCellValue().equals("LOST SHIPMENT")) {
+        	wb = new XSSFWorkbook(new FileInputStream(this.delhiverySettlementReport));
+        } catch (FileNotFoundException e) {
+        	String errMsg = "Unable to open the Delhivery Settlement report";
+			logger.error(errMsg, e);
+			addActionError(errMsg);
+			return;
+        } catch (IOException e) {
+        	String errMsg = "Unable to open the Delhivery Settlement report";
-	    			logger.info("LOST SHIPMENT");
+			logger.error(errMsg, e);
+			addActionError(errMsg);
+			return;
+        }
+        Sheet sheet = wb.getSheetAt(0);
+        int indexAWB = 1;
+        int indexAmount = 13;
+        TransactionClient tsc;
+        int countSuccessfulSaves = 0;
+        try	{
+			long settlementDate = DATE_FORMAT.parse(delhiverySettlementDate).getTime();
+        	tsc = new TransactionClient();
+        	in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
+	    	for (Row row: sheet)	{
+	    		if(row.getRowNum() < 9) {
+	    			continue;
+	    		}
+	    		if(row.getCell(indexAWB) == null) {
 	    			continue;
+	    		}
+				long awb = -1;
-	    		try {
+				try {
+					if(row.getCell(indexAWB).getCellType() == 0) {
+						awb = (long) row.getCell(indexAWB).getNumericCellValue();
+					}
+				    else if(row.getCell(indexAWB).getCellType() == 1) {
+				    	awb = Long.parseLong(row.getCell(indexAWB).getStringCellValue());
+				    }
+					if(awb == -1) {
+						continue;
+					}
 		    		long orderId = transactionClient.getOrderForAwb(Long.toString(awb)).getId();
 		    		double amount = row.getCell(indexAmount).getNumericCellValue();
-		    		logger.info("Aramex Settlement, Order Id: " + orderId + " Amount: " + amount);
+		    		logger.info("Delhivery Settlement, Order Id: " + orderId + " Amount: " + amount);
 					transactionClient.savePaymentSettlements(settlementDate, 4, orderId, 0.0, 0.0, amount);
 					countSuccessfulSaves += 1;
 				} catch (TransactionServiceException e) {
 					logger.error("Transaction Service Exception while getting order for AWB, " + awb, e);
 					addActionError("Transaction Service Exception while getting order for AWB, " + awb);
+				} catch (Exception e) {
+					String errMsg = "Exception recieved for AWB," + awb;
+					logger.error(errMsg, e);
+					addActionError(errMsg);
+				}
+	    	}
         } catch (ParseException e) {
-        	String errMsg = "Could not parse " + aramexSettlementDate;
+        	String errMsg = "Could not parse " + delhiverySettlementDate;
         	logger.error(errMsg, e);
 			addActionError(errMsg);
         } catch (Exception e) {
         	String errMsg = e.getMessage();
 			logger.error(errMsg, e);
 			addActionError(errMsg);
+        }
-        addActionMessage("Successfully added Aramex settlement details for " + countSuccessfulSaves + " orders");
+        addActionMessage("Successfully added Delhivery settlement details for " + countSuccessfulSaves + " orders");
+	}
 	public void uploadOrderIdsToBeMarkedPaid()	{
 		logger.info("Uploading Order Ids to be marked as paid");
 		List<Long> orderIds = new ArrayList<Long>();
 			addActionError(errMsg);
+		}
         addActionMessage("Successfully marked " + countSuccessfulSaves + " orders as returned to vendor");
+	}
-	private ByteArrayOutputStream getReconciliationReport(long vendorId) {
+	private ByteArrayOutputStream getReconciliationReport(long vendorId, long fromTime, long toTime, boolean notall) {
 		ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
 		try {
 			TransactionClient tsc = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
-			List<Order> unpaidOrders = transactionClient.getOrdersWhereVendorNotPaid(vendorId);
+			List<Order> unpaidOrders = transactionClient.getBilledOrders(vendorId, notall, fromTime, toTime);
 			logger.info("Unpaid Order count: " + unpaidOrders.size());
 			List<ReturnOrder> returns = new ArrayList<ReturnOrder>();
 			try {
-				returns = transactionClient.getReturnOrders(-1, 0L, 0L);
+				returns = transactionClient.getAllReturnOrders(notall, fromTime, toTime);
 			} catch (TTransportException e) {
 				tsc = new TransactionClient();
 				transactionClient = tsc.getClient();
-				returns = transactionClient.getReturnOrders(-1, 0L, 0L);
+				returns = transactionClient.getAllReturnOrders(notall, fromTime, toTime);
+			}
 			Map<Long, ReturnOrder> mapReturnOrderIds = new HashMap<Long, ReturnOrder>();
 			for (ReturnOrder returnOrder: returns)
+			}
 			for (Order order: listofreturnedOrders)
+			{
 				order.setDelivery_timestamp(mapReturnOrderIds.get(order.getId()).getCreatedAt());
+				order.setVendorPaid(mapReturnOrderIds.get(order.getId()).isProcessedStatus());
 				returnedOrders.add(order);
+			}
 			Set<Long> OriginalOrderIds = new HashSet<Long>();
 			Map<Long, Order> mapUnpaidOrders = new HashMap<Long, Order>();
 	    headerRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue("Unit Transfer Price");
 	    headerRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue("Unit Selling Price");
 	    headerRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue("Total Transfer Price");
 	    headerRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue("Total Selling Price");
 	    headerRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue("Current Status");
+	    headerRow.createCell(OrderReportColumn.VENDOR_PAID.getValue()).setCellValue("Vendor Paid");
     	try	{
     		Row contentRow = null;
 			LineItem lineItem = null;
 			    contentRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue(lineItem.getTransfer_price());
 			    contentRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue(lineItem.getUnit_price());
 			    contentRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue(lineItem.getTransfer_price() * lineItem.getQuantity());
 			    contentRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue(lineItem.getTotal_price());
 			    contentRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue(order.getStatus().name());
+			    contentRow.createCell(OrderReportColumn.VENDOR_PAID.getValue()).setCellValue(order.isVendorPaid());
+	    	}
 	    } catch (Exception e) {
 	    	String errMsg = e.getMessage();
 			logger.error(errMsg, e);
 			addActionError(errMsg);
 	    headerRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue("Unit Transfer Price");
 	    headerRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue("Unit Selling Price");
 	    headerRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue("Total Transfer Price");
 	    headerRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue("Total Selling Price");
 	    headerRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue("Current Status");
+	    headerRow.createCell(OrderReportColumn.VENDOR_PAID.getValue()).setCellValue("Processed");
     	try	{
     		Row contentRow = null;
 			LineItem lineItem = null;
 			    contentRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue(lineItem.getTransfer_price());
 			    contentRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue(lineItem.getUnit_price());
 			    contentRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue(lineItem.getTransfer_price() * lineItem.getQuantity());
 			    contentRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue(lineItem.getTotal_price());
 			    contentRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue(order.getStatus().name());
+			    contentRow.createCell(OrderReportColumn.VENDOR_PAID.getValue()).setCellValue(order.isVendorPaid());
+	    	}
 	    } catch (Exception e) {
 	    	String errMsg = e.getMessage();
 			logger.error(errMsg, e);
 			addActionError(errMsg);
 	    headerRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue("Unit Transfer Price");
 	    headerRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue("Unit Selling Price");
 	    headerRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue("Total Transfer Price");
 	    headerRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue("Total Selling Price");
 	    headerRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue("Current Status");
+	    headerRow.createCell(OrderReportColumn.VENDOR_PAID.getValue()).setCellValue("Vendor Paid");
     	try	{
     		Row contentRow = null;
 			LineItem lineItem = null;
 			    contentRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue(lineItem.getTransfer_price());
 			    contentRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue(lineItem.getUnit_price());
 			    contentRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue(lineItem.getTransfer_price() * lineItem.getQuantity());
 			    contentRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue(lineItem.getTotal_price());
 			    contentRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue(order.getStatusDescription());
+			    contentRow.createCell(OrderReportColumn.VENDOR_PAID.getValue()).setCellValue(order.isVendorPaid());
+	    	}
 	    } catch (Exception e) {
 	    	String errMsg = e.getMessage();
 			logger.error(errMsg, e);
 			addActionError(errMsg);
 	    headerRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue("Unit Transfer Price");
 	    headerRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue("Unit Selling Price");
 	    headerRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue("Total Transfer Price");
 	    headerRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue("Total Selling Price");
 	    headerRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue("Current Status");
+	    headerRow.createCell(OrderReportColumn.VENDOR_PAID.getValue()).setCellValue("Vendor Paid");
 	    headerRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue("Payment Type");
 	    headerRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue("Payment Status");
 	    headerRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue("Payment Id");
 	    headerRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue("Coupon Code");
 				    contentRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue(lineItem.getTransfer_price());
 				    contentRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue(lineItem.getUnit_price());
 				    contentRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue(lineItem.getTransfer_price() * lineItem.getQuantity());
 				    contentRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue(lineItem.getTotal_price());
 				    contentRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue(order.getStatus().name());
+				    contentRow.createCell(OrderReportColumn.VENDOR_PAID.getValue()).setCellValue(order.isVendorPaid());
 				    if(pmt.getGatewayId() == 4)	{
 				    	contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue("COD-" + codProviders.get(order.getLogistics_provider_id()));
+				    }
 				    else {
 	    headerRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue("Unit Transfer Price");
 	    headerRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue("Unit Selling Price");
 	    headerRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue("Total Transfer Price");
 	    headerRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue("Total Selling Price");
 	    headerRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue("Current Status");
+	    headerRow.createCell(OrderReportColumn.VENDOR_PAID.getValue()).setCellValue("Vendor Paid");
 	    headerRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue("Payment Type");
 	    headerRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue("Payment Status");
 	    headerRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue("Payment Reference");
 	    headerRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue("Coupon Code");
 	    headerRow.createCell(OrderReportColumn.SETTLEMENT_DATE.getValue()).setCellValue("Settlement Date");
 				    contentRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue(lineItem.getTransfer_price());
 				    contentRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue(lineItem.getUnit_price());
 				    contentRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue(lineItem.getTransfer_price() * lineItem.getQuantity());
 				    contentRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue(lineItem.getTotal_price());
 				    contentRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue(order.getStatus().name());
+				    contentRow.createCell(OrderReportColumn.VENDOR_PAID.getValue()).setCellValue(order.isVendorPaid());
 					if(pmt.getGatewayId() == 4)	{
 				    	contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue("COD-" + codProviders.get(order.getLogistics_provider_id()));
 				    	contentRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue(paymentSettlement.getServiceTax());
 					    contentRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue(paymentSettlement.getOtherCharges());
 			    contentRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue(lineItem.getTransfer_price());
 			    contentRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue(lineItem.getUnit_price());
 			    contentRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue(lineItem.getTransfer_price() * lineItem.getQuantity());
 			    contentRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue(lineItem.getTotal_price());
 			    contentRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue(order.getStatus().name());
+			    contentRow.createCell(OrderReportColumn.VENDOR_PAID.getValue()).setCellValue(order.isVendorPaid());
 			    contentRow.createCell(OrderReportColumn.USER_PAYABLE_AMOUNT.getValue()).setCellValue(0);
+			}
 		} catch (Exception e) {
 			String errMsg = e.getMessage();
 			logger.error(errMsg, e);
 	public File getAramexSettlementReport() {
 		return aramexSettlementReport;
+	}
+	public String getDelhiverySettlementDate()	{
+    	return this.delhiverySettlementDate;
+    }
+    public void setDelhiverySettlementDate(String delhiverySettlementDate)	{
+    	this.delhiverySettlementDate = delhiverySettlementDate;
+    }
+    public void setDelhiverySettlementReport(File delhiverySettlementReport) {
+		this.delhiverySettlementReport = delhiverySettlementReport;
+	}
+	public File getDelhiverySettlementReport() {
+		return delhiverySettlementReport;
+	}
 	@Override
     public void setServletContext(ServletContext context) {
         this.context = context;
+    }

Subversion Repositories SmartDukaan

(root)/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java – Rev 5441 → 5481