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

 package in.shop2020.support.controllers;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import in.shop2020.logistics.LogisticsServiceException;
 import in.shop2020.logistics.Provider;
 import in.shop2020.model.v1.catalog.InventoryService.Client;
 import in.shop2020.model.v1.catalog.Vendor;
 import in.shop2020.model.v1.order.LineItem;
 import in.shop2020.model.v1.order.Order;
 import in.shop2020.model.v1.order.OrderStatus;
+import in.shop2020.model.v1.order.OrderStatusGroups;
 import in.shop2020.model.v1.order.PaymentSettlement;
 import in.shop2020.model.v1.order.Transaction;
 import in.shop2020.model.v1.order.TransactionServiceException;
 import in.shop2020.payments.Payment;
 import in.shop2020.payments.PaymentException;
 import in.shop2020.thrift.clients.CatalogClient;
 import in.shop2020.thrift.clients.LogisticsClient;
 import in.shop2020.thrift.clients.PaymentClient;
 import in.shop2020.thrift.clients.TransactionClient;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.struts2.convention.annotation.InterceptorRef;
-import org.apache.struts2.convention.annotation.InterceptorRefs;
-import org.apache.struts2.convention.annotation.Result;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.struts2.convention.annotation.Results;
 import org.apache.struts2.interceptor.ServletRequestAware;
 import org.apache.struts2.interceptor.ServletResponseAware;
 import org.apache.struts2.rest.DefaultHttpHeaders;
 import org.apache.struts2.rest.HttpHeaders;
 import org.apache.struts2.util.ServletContextAware;
 		QUANTITY(11),
 		UNIT_TRANSFER_PRICE(12),
 		UNIT_SELLING_PRICE(13),
 		TOTAL_TRANSFER_PRICE(14),
 		TOTAL_SELLING_PRICE(15),
-		GATEWAY_TRANSACTION_ID(16),
-		PAYMENT_TYPE(17),
+		PAYMENT_TYPE(16),
-		PAYMENT_ID(18),
+		PAYMENT_ID(17),
-		COUPON_CODE(19),
+		COUPON_CODE(18),
-		SERVICE_TAX(20),
+		SERVICE_TAX(19),
-		OTHER_CHARGES(21),
+		OTHER_CHARGES(20),
-		NET_COLLECTION(22),
+		NET_COLLECTION(21),
-	    REFUND(23),
+	    REFUND(22),
-	    FINAL_AMOUNT(24),
+	    FINAL_AMOUNT(23),
-	    IS_RESHIPED_ORDER(25);
+	    IS_RESHIPED_ORDER(24);
 //		COUPON_CATEGORY(19),
 //		DISCOUNT(20),
 		private int value;
 	private HttpServletRequest request;
 	private HttpServletResponse response;
 	private ServletContext context;
     private HttpSession session;
 	private List<Vendor> vendors;
+	private Map<Long, String> codProviders = new HashMap<Long, String>();
+	private Map<Long, String> paymentGateways = new HashMap<Long, String>();
 	private String reportSource;
 	private List<Long> orderIdsWithoutSuccess;
 	private File hdfcSettlementReport;
 	private File aramexSettlementReport;
 	private Map<Long, Map<String, Double>> misMatches = new HashMap<Long, Map<String, Double>>();
 	private Map<Long, String> ebsSettlementSummaries;
-	private List<OrderStatus> refundOrderStatuses = new ArrayList<OrderStatus>();
+	private List<OrderStatus> refundOrderStatuses;
 	private List<Order> refundedOrdersBilledinDateRange = new ArrayList<Order>();
 	private List<Order> reshippedOrders = new ArrayList<Order>();
+	private Map<Long, PaymentSettlement> paymentSettlementsMap;
 	private final DateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy");
+	private int rowCount = 0;
 	public VendorReconciliationController()	{
 		try	{
 			CatalogClient csc = new CatalogClient();
 			Client catalogClient = csc.getClient();
+			OrderStatusGroups orderStatusGroups = new OrderStatusGroups();
+			refundOrderStatuses = orderStatusGroups.getRefundedOrders();
 			vendors = catalogClient.getAllVendors();
 			orderIdsWithoutSuccess = new ArrayList<Long>();
 			TransactionClient tsc = new TransactionClient();
 		return new DefaultHttpHeaders("report");
+	}
 	public HttpHeaders generateReconciliationReport()	{
 		DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
-		refundOrderStatuses.add(OrderStatus.CANCELLED_ON_CUSTOMER_REQUEST);
-		refundOrderStatuses.add(OrderStatus.RTO_REFUNDED);
-		refundOrderStatuses.add(OrderStatus.DOA_VALID_REFUNDED);
-		refundOrderStatuses.add(OrderStatus.DOA_INVALID_REFUNDED);
-		refundOrderStatuses.add(OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY);
-		refundOrderStatuses.add(OrderStatus.DOA_REFUNDED_RCVD_DAMAGED);
-		refundOrderStatuses.add(OrderStatus.DOA_REFUNDED_LOST_IN_TRANSIT);
-		refundOrderStatuses.add(OrderStatus.RTO_DAMAGED_REFUNDED);
-		refundOrderStatuses.add(OrderStatus.RTO_LOST_IN_TRANSIT_REFUNDED);
-		refundOrderStatuses.add(OrderStatus.RET_PRODUCT_USABLE_REFUNDED);
-		refundOrderStatuses.add(OrderStatus.RET_PRODUCT_UNUSABLE_REFUNDED);
-		refundOrderStatuses.add(OrderStatus.RET_REFUNDED_LOST_IN_TRANSIT);
-		refundOrderStatuses.add(OrderStatus.RET_REFUNDED_RCVD_DAMAGED);
-		refundOrderStatuses.add(OrderStatus.LOST_IN_TRANSIT_REFUNDED);
 		try	{
 			//Formatting Form input parameters
-		    Date startDate = dateFormat.parse(request.getParameter("start"));
+//		    Date startDate = dateFormat.parse(request.getParameter("start"));
-			Date endDate = dateFormat.parse(request.getParameter("end"));
+//			Date endDate = dateFormat.parse(request.getParameter("end"));
 		    long vendorId = Long.parseLong(request.getParameter("vendor"));
-		    logger.info(startDate + " " + endDate + " " + vendorId);
+		    logger.info("Vendor ID: " + vendorId);
 		    String vendorName = getVendorName(vendorId);
 			DateFormat dateFormatForFile = new SimpleDateFormat("dd.MM.yyyy");
 			response.setContentType("application/vnd.ms-excel");
-			response.setHeader("Content-disposition", "inline; filename=" + vendorName + "-reconciliation-from-" + dateFormatForFile.format(startDate) + "-" + dateFormatForFile.format(endDate) + ".xls");
+			response.setHeader("Content-disposition", "inline; filename=" + vendorName + "-reconciliation.xls");
 			ServletOutputStream sos;
 			try {
-				ByteArrayOutputStream baos = getReconciliationReport(vendorId, startDate, endDate);
+				ByteArrayOutputStream baos = getReconciliationReport(vendorId);
 				sos = response.getOutputStream();
 				baos.writeTo(sos);
 				sos.flush();
 			} catch (IOException e)	{
 				logger.error("Error while streaming the hotspot reconciliation report", e);
+			}
-		} catch (ParseException e)	{
-			logger.error("Unable to parse the start or end date", e);
 		} catch (NullPointerException e)   {
             logger.error("NullPointerException", e);
+		}
 		return new DefaultHttpHeaders("report");
+	}
         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;
 		try {
 			tsc = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
 		int indexNetCollection = 17;
 		TransactionClient tsc;
 		String paymentIdStr = "";
 		long paymentId = 0;
 		int countSuccessfulInserts = 0;
 		int countRefunds = 0;
 		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.getCell(0).getStringCellValue().equals("Total"))	break;
                 try	{
                     String recfmt = row.getCell(indexRECFMT).getStringCellValue();
                     Date settlementDate = row.getCell(indexSettlementDate).getDateCellValue();
                 	double netCollection = row.getCell(indexNetCollection).getNumericCellValue();
-                	paymentIdStr = row.getCell(indexPaymentId).getStringCellValue().replace("'", "");
+                	paymentIdStr = row.getCell(indexPaymentId).getStringCellValue().replace("'", "").trim();
                 	paymentId = Long.parseLong(paymentIdStr);
                 	logger.info("paymentId: " + paymentId + ", recfmt: " + recfmt + ", settlementDate: " + settlementDate + ", netCollection: " + netCollection);
                     if (recfmt.trim().equalsIgnoreCase("CVD"))	{
                     	if (netCollection > 0.0)	netCollection *= -1.0;
                     	transactionClient.savePaymentSettlements(settlementDate.getTime(), 1, paymentId, 0.0, 0.0, netCollection);
                     	countRefunds += 1;
                     } else	{
                     	double msf = row.getCell(indexMSF).getNumericCellValue();
                     	double serviceTax = row.getCell(indexServiceTax).getNumericCellValue();
                     	double eduCess = row.getCell(indexEduCess).getNumericCellValue();
                     	logger.info("msf: " + msf + ", serviceTax: " + serviceTax + ", eduCess: " + eduCess);
         Sheet sheet = wb.getSheetAt(0);
         Row firstRow = sheet.getRow(0);
         logger.info("Cell count:" + firstRow.getPhysicalNumberOfCells());
-        int indexOrderId = 0;
+        int indexOrderId = 16;
-        int indexAmount = 1;
+        int indexAmount = 17;
         TransactionClient tsc;
     	int countSuccessfulSaves = 0;
         try	{
         	for (Row row : sheet) {
     			long orderId = 0;
         		try	{
         			if(row.equals(firstRow))	continue;
-        			orderId = (long) row.getCell(indexOrderId).getNumericCellValue();
+        			orderId = Long.parseLong(row.getCell(indexOrderId).getStringCellValue());
         			double amount = row.getCell(indexAmount).getNumericCellValue();
+        			logger.info("Bluedart SettlementDate: " + settlementDate + ", OrderId: " + orderId + ", Amount: " + amount);
         			transactionClient.savePaymentSettlements(settlementDate, 4, orderId, 0.0, 0.0, amount);
-        			logger.info("SettlementDate: " + settlementDate + ", OrderId: " + orderId + ", Amount: " + amount);
         			countSuccessfulSaves += 1;
         		} catch (NullPointerException e) {
         			logger.error("For OrderId: " + orderId + " " + e);
 			return;
+		}
 		Workbook wb = null;
         try {
-            wb = new HSSFWorkbook(new FileInputStream(this.aramexSettlementReport));
+        	wb = new XSSFWorkbook(new FileInputStream(this.aramexSettlementReport));
         } catch (FileNotFoundException e) {
         	addActionError(e.getMessage());
             logger.error("Unable to open the Settlement report", e);
         } catch (IOException e) {
         	addActionError(e.getMessage());
         	return;
+		}
         Sheet sheet = wb.getSheetAt(0);
-        int indexOrderId = 0;
+        int indexOrderId = 7;
         int indexAmount = 1;
         Row firstRow = sheet.getRow(0);
         logger.info("Cell count:" + firstRow.getPhysicalNumberOfCells());
         	in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
 	    	for (Row row: sheet)	{
 	    		if(row.equals(firstRow))	continue;
-	    		long orderId = (long) row.getCell(indexOrderId).getNumericCellValue();
+	    		if(row.getCell(indexOrderId).getStringCellValue().equals(""))	break;
-	    		double amount = row.getCell(indexAmount).getNumericCellValue();
+	    		long orderId = Long.parseLong(row.getCell(indexOrderId).getStringCellValue());
+	    		double amount = row.getCell(indexAmount).getNumericCellValue();
+	    		logger.info("Aramex Settlement, Order Id: " + orderId + " Amount: " + amount);
 	    		try {
 					transactionClient.savePaymentSettlements(settlementDate, 4, orderId, 0.0, 0.0, amount);
 					countSuccessfulSaves += 1;
 				} catch (TransactionServiceException e) {
+        }
         addActionMessage("Successfully added Aramex settlement details for " + countSuccessfulSaves + " orders");
+	}
 	// Prepares the XLS worksheet object and fills in the data with proper formatting
-	private ByteArrayOutputStream getReconciliationReport(long vendorId, Date startDate, Date endDate)	{
+	private ByteArrayOutputStream getReconciliationReport(long vendorId)	{
-		List<Order> billedOrders = null;
+		List<PaymentSettlement> paymentSettlements = new ArrayList<PaymentSettlement>();
-		List<Order> settledOrders = null;
+		List<PaymentSettlement> refundPaymentSettlements = new ArrayList<PaymentSettlement>();
 		try	{
 			TransactionClient tsc = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
-			PaymentClient psc = new PaymentClient();
-	    	in.shop2020.payments.PaymentService.Client paymentClient = psc.getClient();
-			billedOrders = transactionClient.getBilledOrdersForVendor(vendorId, startDate.getTime(), endDate.getTime());
-			logger.info("Billed Orders count: " + billedOrders.size());
-			List<PaymentSettlement> paymentSettlements = transactionClient.getSettlementsByDate(startDate.getTime(), endDate.getTime(), false);
+			paymentSettlements = transactionClient.getSettlementsByDate(0, (new Date()).getTime(), false);
 			logger.info("Settlement Count: " + paymentSettlements.size());
+			refundPaymentSettlements = transactionClient.getSettlementsByDate(0, (new Date()).getTime(), true);
-			settledOrders = new ArrayList<Order>();
+			logger.info("Refund Settlement Count: " + refundPaymentSettlements.size());
-			for (PaymentSettlement paymentSettlement: paymentSettlements)	{
-				Payment payment = paymentClient.getPayment(paymentSettlement.getReferenceId());
-				Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());
-				settledOrders.addAll(txn.getOrders());
-			}
-			logger.info("Settled Orders count: " + settledOrders.size());
 		} catch	(TransactionServiceException e)	{
 			String errMsg = "Transaction Service Exception occured";
 			logger.error(errMsg, e);
 			addActionError(errMsg);
 		} catch (TTransportException e) {
 		} catch (TException e) {
 			// TODO Auto-generated
 			String errMsg = "Transaction Service Exception occured";
 			logger.error(errMsg, e);
 			addActionError(errMsg);
-		} catch (PaymentException e) {
-			String errMsg = "Transaction Service Exception occured";
-			logger.error(errMsg, e);
-			addActionError(errMsg);
-		}
-		List<Order> settledOrdersForVendor = new ArrayList<Order>();
-		for (Order order: settledOrders)	{
-			if(order.getVendorId() == vendorId)	{
-				settledOrdersForVendor.add(order);
-			}
+		}
-		logger.info("Settled Order count for Vendor: " + settledOrdersForVendor.size());
 		ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
 	    Workbook wb = new HSSFWorkbook();
 		Sheet orderSheet = wb.createSheet("Orders");
 		Sheet reshippedOrderSheet = wb.createSheet("Reshipped");
 		Sheet mismatchSheet = wb.createSheet("Mismatches");
-	    populateOrderSheet(settledOrdersForVendor, startDate, endDate, orderSheet, boldStyle, rightAlignStyle);
+	    populateOrderSheet(paymentSettlements, refundPaymentSettlements, vendorId, orderSheet, boldStyle, rightAlignStyle);
-	    populateReshippedOrderSheet(reshippedOrders, reshippedOrderSheet);
+//	    populateReshippedOrderSheet(reshippedOrders, reshippedOrderSheet);
-	    populateMismatchSheet(mismatchSheet);
+//	    populateMismatchSheet(mismatchSheet);
 		// Write the workbook to the output stream
 		try {
 			wb.write(baosXLS);
 			baosXLS.close();
 	    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.GATEWAY_TRANSACTION_ID.getValue()).setCellValue("Gateway Transaction Id");
 	    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");
 //	    headerRow.createCell(OrderReportColumn.COUPON_CATEGORY.getValue()).setCellValue("Coupon Category");
 			    	contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue(paymentType);
+		    	}
 			    if (payment != null)	{
 				    contentRow.createCell(OrderReportColumn.SETTLEMENT_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(paymentSettlement.getSettlementDate())));
-			    	contentRow.createCell(OrderReportColumn.GATEWAY_TRANSACTION_ID.getValue()).setCellValue(payment.getGatewayTxnId());
 			    	contentRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue(payment.getStatus().name());
 			    	contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
+			    }
 			    contentRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue(txn.getCoupon_code());
 			    contentRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue(serviceTax);
 			addActionError("Error loading list of COD providers");
 			logger.error("Logistics Service Exception " + e);
+		}
+	}
-	private void populateOrderSheet(List<Order> orders, Date startDate, Date endDate, Sheet sheet, CellStyle style, CellStyle rightAlignStyle) {
+	private void populateOrderSheet(List<PaymentSettlement> paymentSettlements, List<PaymentSettlement> refundSettlements, long vendorId, Sheet sheet, CellStyle style, CellStyle rightAlignStyle) {
-	    short serialNo = 0;
-	    // Create the title row and put all the titles in it. Rows are 0 based.
+	    // Create the title row and put all the titles in it. Rows are 0 based
-	    Row titleRow = sheet.createRow(serialNo ++);
+	    Row titleRow = sheet.createRow(rowCount ++);
 	    Cell titleCell = titleRow.createCell(0);
-	    titleCell.setCellValue("Order Reconciliation Report (" + DATE_FORMAT.format(startDate) + " - " + DATE_FORMAT.format(endDate) + ")");
+	    titleCell.setCellValue("Order Reconciliation Report");
 	    titleCell.setCellStyle(style);
-	    sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));
+	    sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 4));
-	    sheet.createRow(serialNo ++);
+	    sheet.createRow(rowCount ++);
-	    Row headerRow = sheet.createRow(serialNo ++);
+	    Row headerRow = sheet.createRow(rowCount ++);
 	    headerRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue("Order Id");
 	    headerRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue("Order Date");
 	    headerRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue("Billing Number");
 	    headerRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue("Billing Date");
 	    headerRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue("Delivery Date");
 	    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.GATEWAY_TRANSACTION_ID.getValue()).setCellValue("Gateway Transaction Id");
 	    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");
-//	    headerRow.createCell(OrderReportColumn.COUPON_CATEGORY.getValue()).setCellValue("Coupon Category");
-//	    headerRow.createCell(OrderReportColumn.DISCOUNT.getValue()).setCellValue("Discount");
 	    headerRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue("Service Tax");
 	    headerRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue("Other Charges");
 	    headerRow.createCell(OrderReportColumn.NET_COLLECTION.getValue()).setCellValue("Net Collection");
-	    headerRow.createCell(OrderReportColumn.REFUND.getValue()).setCellValue("Refund");
-	    headerRow.createCell(OrderReportColumn.FINAL_AMOUNT.getValue()).setCellValue("Final Amount");
-	    sheet.createRow(serialNo ++);
+	    sheet.createRow(rowCount ++);
 		TransactionClient tsc;
     	PaymentClient psc;
     	LogisticsClient lsc;
 		try {
 			tsc = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
-			psc = new PaymentClient();
-	    	in.shop2020.payments.PaymentService.Client paymentClient = psc.getClient();
 	    	lsc = new LogisticsClient();
 	    	in.shop2020.logistics.LogisticsService.Client logisticsClient = lsc.getClient();
-	    	Map<Long, String> codProviders = new HashMap<Long, String>();
+			psc = new PaymentClient();
-	    	for (Provider provider: logisticsClient.getAllProviders())	{
-	    		codProviders.put(provider.getId(), provider.getName());
+	    	in.shop2020.payments.PaymentService.Client paymentClient = psc.getClient();
-	    	}
 	    	List<PaymentGateway> tPaymentGateways = paymentClient.getActivePaymentGateways();
-	    	Map<Long, String> paymentGateways = new HashMap<Long, String>();
 	    	for (PaymentGateway tPaymentGateway: tPaymentGateways)	{
 	    		paymentGateways.put(tPaymentGateway.getId(), tPaymentGateway.getName());
+	    	}
+	    	for (Provider provider: logisticsClient.getAllProviders())	{
-			List <Long> orderIds = new ArrayList<Long>();
+	    		codProviders.put(provider.getId(), provider.getName());
+	    	}
-			Map<Long, List<Order>> orderMap = new HashMap<Long, List<Order>>();
+	    	for (PaymentSettlement paymentSettlement: paymentSettlements)	{
-			int countMultipleOrderTxns = 0;
+    			try {
-			for(Order order : orders)	{
+    				if(paymentSettlement.getPaymentGatewayId() == 4)	{	// If COD
-				if(order.getBilling_timestamp() == 0)	{
+	    				Order order = transactionClient.getOrder(paymentSettlement.getReferenceId());
-					continue;
+	    				Transaction txn = transactionClient.getTransaction(order.getTransactionId());
-				}
-				orderIds.add(order.getId());
+	    				Payment payment = paymentClient.getPaymentForTxnId(txn.getId()).get(0);
-				if (orderMap.containsKey(order.getTransactionId()))	{
+		    			if (order.getVendorId() == vendorId)	{
-					orderMap.get(order.getTransactionId()).add(order);
+					    	Row contentRow = sheet.createRow(rowCount ++);
-					countMultipleOrderTxns += 1;
+					    	outputCODRow(contentRow, paymentSettlement, order, txn, payment);
+		    			}
-				} else	{
+    				} else	{	// If prepaid
+    					Payment payment = paymentClient.getPayment(paymentSettlement.getReferenceId());
+    					Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());
+    					outputPrepaidTransactionRows(sheet, vendorId, paymentSettlement, txn, payment);
+    				}
+    			} catch (TransactionServiceException e) {
-					List<Order> o = new ArrayList<Order>();
+					logger.error("TransactionServiceException " + e);
-					o.add(order);
+				} catch (TException e) {
+					logger.error("TException " + e);
+				} catch (PaymentException e) {
-					orderMap.put(order.getTransactionId(), o);
+					logger.error("PaymentException " + e);
+				}
-			}
+	    	}
-			// Getting list of order ids belonging to reshipped orders
+	    	rowCount ++;
-			List<Long> reshippedOrderIds = transactionClient.getReshippedOrderIds(orderIds);
-			for(long txnId: orderMap.keySet())	{
+	    	for (PaymentSettlement paymentSettlement: refundSettlements)	{
-				List<Order> orderList = orderMap.get(txnId);
+	    		try {
-				for (Order order: orderList)	{
+	    			Payment payment = paymentClient.getPayment(paymentSettlement.getReferenceId());
-				    logger.info("For order: " + order.getId());
+					Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());
-				    // Orders where payment was captured but never billed
+					outputRefundRows(sheet, vendorId, paymentSettlement, txn, payment);
-				    if(order.getBilling_timestamp() == 0)	{
+    			} catch (TransactionServiceException e) {
-						continue;
-					}
-				    if (reshippedOrderIds.contains(order.getId()))	{
-				    	reshippedOrders.add(order);
-				    	continue;
-				    }
-				    LineItem lineItem = order.getLineitems().get(0);
+					logger.error("TransactionServiceException " + e);
-				    double transferPrice = lineItem.getTransfer_price();
-				    Payment payment = null;
-				    try	{
-				    	if(order.isCod())	{
-				    		payment = paymentClient.getPaymentForTxnId(order.getTransactionId()).get(0);
-				    	} else	{
-				    		payment = paymentClient.getSuccessfulPaymentForTxnId(order.getTransactionId());
-				    	}
-					    logger.info("getSuccessfulPaymentForTxnId, " + order.getTransactionId() + ": " + payment);
-				    } catch (TApplicationException e)	{
+				} catch (TException e) {
-				    	orderIdsWithoutSuccess.add(order.getId());
-				    	String errMsg = "Exception while getting successfull payment for transaction Id, " + order.getTransactionId();
-						logger.error(errMsg, e);
+					logger.error("TException " + e);
-						addActionError(errMsg);
-					}
-				    Transaction txn = transactionClient.getTransaction(order.getTransactionId());
-				    PaymentSettlement paymentSettlement = null;
-				    String paymentType = null;
-				    if(payment != null)	{
+				} catch (PaymentException e) {
-				    	paymentSettlement = transactionClient.getSettlementForPaymentId(payment.getPaymentId());
-				    	paymentType = paymentGateways.get(payment.getGatewayId());
-				    }
-		            double totalSellingPrice = lineItem.getTotal_price();
-		            double serviceTax = 0.0;
-		            double otherCollectionCharges = 0.0;
-		            double netCollection = 0.0;
+					logger.error("PaymentException " + e);
-		            if(paymentSettlement != null)	{
-			            serviceTax = paymentSettlement.getServiceTax();
-			            otherCollectionCharges = paymentSettlement.getOtherCharges();
-			            netCollection = paymentSettlement.getNetCollection();
-		            }
-		            if (netCollection < 0.0)	{
-		            	paymentType = paymentType + "-REFUND";
-		            }
-		            double expectedCollection = totalSellingPrice - otherCollectionCharges - serviceTax;
-		            //FIXME ignore differences of upto 50 paisa
-		            if (netCollection > 0.0 && expectedCollection != netCollection)	{
-		            	Map <String, Double> mismatch = new HashMap<String, Double>();
-		            	mismatch.put("expected", expectedCollection);
-		            	mismatch.put("actual", netCollection);
-		            	misMatches.put(order.getId(), mismatch);
-		            }
-			    	Row contentRow = sheet.createRow(serialNo++);
-		            contentRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue(order.getId());
-		            contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
-				    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
-				    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
-				    contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
-				    contentRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue(getValueForEmptyString(lineItem.getBrand()));
-				    contentRow.createCell(OrderReportColumn.MODEL_NAME.getValue()).setCellValue(getValueForEmptyString(lineItem.getModel_name()));
-				    contentRow.createCell(OrderReportColumn.MODEL_NUMBER.getValue()).setCellValue(getValueForEmptyString(lineItem.getModel_number()));
-				    contentRow.createCell(OrderReportColumn.COLOR.getValue()).setCellValue(getValueForEmptyString(lineItem.getColor()));
-				    contentRow.createCell(OrderReportColumn.QUANTITY.getValue()).setCellValue(lineItem.getQuantity());
-				    contentRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue(transferPrice);
-				    contentRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue(lineItem.getUnit_price());
-				    contentRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue(transferPrice * lineItem.getQuantity());
-				    contentRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue(totalSellingPrice);
-				    contentRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue(order.getStatusDescription());
-			    	double refund = 0.0;
-			    	if(order.isCod())	{
-			    		contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue("COD - " + codProviders.get(order.getLogistics_provider_id()));
-			    	} else	{
-				    	contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue(paymentType);
-			    	}
-				    if (payment != null)	{
-					    contentRow.createCell(OrderReportColumn.SETTLEMENT_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(paymentSettlement.getSettlementDate())));
-				    	contentRow.createCell(OrderReportColumn.GATEWAY_TRANSACTION_ID.getValue()).setCellValue(payment.getGatewayTxnId());
-				    	contentRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue(payment.getStatus().name());
-				    	contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
-				    }
-				    contentRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue(txn.getCoupon_code());
-				    contentRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue(serviceTax);
-				    contentRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue(otherCollectionCharges);
-				    contentRow.createCell(OrderReportColumn.NET_COLLECTION.getValue()).setCellValue(netCollection);
-				    contentRow.createCell(OrderReportColumn.FINAL_AMOUNT.getValue()).setCellValue(netCollection - refund);
+				}
+	    	}
+		} catch (TTransportException e) {
+			logger.error("TTransportException", e);
+		} catch (LogisticsServiceException e) {
+			logger.error("LogisticsServiceException" + e);
+		} catch (TException e) {
+			logger.error("TException" + e);
+		} catch (PaymentException e) {
+			logger.error("PaymentException" + e);
+		}
+	}
+	private void outputRefundRows(Sheet sheet, long vendorId, PaymentSettlement paymentSettlement, Transaction txn, Payment payment)	{
+		logger.info("Printing orders for pmt Id, " + payment.getPaymentId());
+		boolean isFirstOrderForTransaction = true;
+		for (Order order: txn.getOrders())	{
+			if(order.getVendorId() == vendorId && refundOrderStatuses.contains(order.getStatus()))	{
+		    	Row contentRow = sheet.createRow(rowCount ++);
+		    	LineItem lineItem = order.getLineitems().get(0);
+		        contentRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue(order.getId());
+		        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
+			    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
+			    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
+			    contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
+			    contentRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue(getValueForEmptyString(lineItem.getBrand()));
+			    contentRow.createCell(OrderReportColumn.MODEL_NAME.getValue()).setCellValue(getValueForEmptyString(lineItem.getModel_name()));
+			    contentRow.createCell(OrderReportColumn.MODEL_NUMBER.getValue()).setCellValue(getValueForEmptyString(lineItem.getModel_number()));
+			    contentRow.createCell(OrderReportColumn.COLOR.getValue()).setCellValue(getValueForEmptyString(lineItem.getColor()));
+			    contentRow.createCell(OrderReportColumn.QUANTITY.getValue()).setCellValue(lineItem.getQuantity());
+			    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.PAYMENT_TYPE.getValue()).setCellValue(paymentGateways.get(payment.getGatewayId()));
+			    contentRow.createCell(OrderReportColumn.SETTLEMENT_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(paymentSettlement.getSettlementDate())));
+			    contentRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue(txn.getCoupon_code());
+		    	contentRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue(payment.getStatus().name());
+		    	contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
+		    	if(isFirstOrderForTransaction)	{
+			    	contentRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue(paymentSettlement.getServiceTax());
+				    contentRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue(paymentSettlement.getOtherCharges());
+				    contentRow.createCell(OrderReportColumn.NET_COLLECTION.getValue()).setCellValue(paymentSettlement.getNetCollection());
+				    isFirstOrderForTransaction = false;
+		    	}
+			}
+		}
-			logger.info("Reshipped Orders ", reshippedOrders);
+	}
+//9810579334
-		    logger.info("Order Ids where no successful payment was found: " + orderIdsWithoutSuccess.size());
+	private void outputPrepaidTransactionRows(Sheet sheet, long vendorId, PaymentSettlement paymentSettlement, Transaction txn, Payment payment)	{
-		    logger.info(orderIdsWithoutSuccess.toString());
-		    logger.info("Reshipped Order Ids: " + reshippedOrderIds);
+		logger.info("Printing orders for pmt Id, " + payment.getPaymentId());
-			logger.info("countMultipleOrderTxns: " + countMultipleOrderTxns);
-	    	sheet.createRow(serialNo++);
+		boolean isFirstOrderForTransaction = true;
-			List<PaymentSettlement> refundSettlements = transactionClient.getSettlementsByDate(startDate.getTime(), endDate.getTime(), true);
+		for (Order order: txn.getOrders())	{
-			logger.info("Refunds: " + refundSettlements.size());
+			if(order.getVendorId() == vendorId)	{
-			logger.info(refundSettlements.toString());
+		    	Row contentRow = sheet.createRow(rowCount ++);
-			Map<Long, PaymentSettlement> refunds = new HashMap<Long, PaymentSettlement>();
+		    	LineItem lineItem = order.getLineitems().get(0);
-			for (PaymentSettlement settlement: refundSettlements)	{
+		        contentRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue(order.getId());
+		        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
-				refunds.put(settlement.getReferenceId(), settlement);
+			    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
-			}
+			    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
+			    contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
-		    // Refunds belonging to orders billed before the start date of supplied billing date range
+			    contentRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue(getValueForEmptyString(lineItem.getBrand()));
+			    contentRow.createCell(OrderReportColumn.MODEL_NAME.getValue()).setCellValue(getValueForEmptyString(lineItem.getModel_name()));
+			    contentRow.createCell(OrderReportColumn.MODEL_NUMBER.getValue()).setCellValue(getValueForEmptyString(lineItem.getModel_number()));
+			    contentRow.createCell(OrderReportColumn.COLOR.getValue()).setCellValue(getValueForEmptyString(lineItem.getColor()));
-		    for (long paymentId: refunds.keySet())	{
+			    contentRow.createCell(OrderReportColumn.QUANTITY.getValue()).setCellValue(lineItem.getQuantity());
+			    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.PAYMENT_TYPE.getValue()).setCellValue(paymentGateways.get(payment.getGatewayId()));
+			    contentRow.createCell(OrderReportColumn.SETTLEMENT_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(paymentSettlement.getSettlementDate())));
-		    	Payment payment = paymentClient.getPayment(paymentId);
+			    contentRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue(txn.getCoupon_code());
-		    	Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());
+		    	contentRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue(payment.getStatus().name());
-		    	PaymentSettlement paymentSettlement = refunds.get(paymentId);
+		    	contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
-		    	for (Order order: txn.getOrders())	{
+		    	if(isFirstOrderForTransaction)	{
-		    		if(!refundOrderStatuses.contains(order.getStatus()))	continue;
-			    	Row contentRow = sheet.createRow(serialNo++);
-			    	LineItem lineItem = order.getLineitems().get(0);
-				    double transferPrice = lineItem.getTransfer_price();
-		            double totalSellingPrice = lineItem.getTotal_price();
-		            String paymentType = paymentGateways.get(payment.getGatewayId()) + "-REFUND";
-			    	contentRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue(order.getId());
-		            contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
-				    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
-				    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
-				    contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
-				    contentRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue(getValueForEmptyString(lineItem.getBrand()));
-				    contentRow.createCell(OrderReportColumn.MODEL_NAME.getValue()).setCellValue(getValueForEmptyString(lineItem.getModel_name()));
-				    contentRow.createCell(OrderReportColumn.MODEL_NUMBER.getValue()).setCellValue(getValueForEmptyString(lineItem.getModel_number()));
-				    contentRow.createCell(OrderReportColumn.COLOR.getValue()).setCellValue(getValueForEmptyString(lineItem.getColor()));
-				    contentRow.createCell(OrderReportColumn.QUANTITY.getValue()).setCellValue(lineItem.getQuantity());
-				    contentRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue(transferPrice);
-				    contentRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue(lineItem.getUnit_price());
-				    contentRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue(transferPrice * lineItem.getQuantity());
-				    contentRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue(totalSellingPrice);
-				    contentRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue(order.getStatusDescription());
-				    contentRow.createCell(OrderReportColumn.SETTLEMENT_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(paymentSettlement.getSettlementDate())));
-			    	contentRow.createCell(OrderReportColumn.GATEWAY_TRANSACTION_ID.getValue()).setCellValue(payment.getGatewayTxnId());
-			    	contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue(paymentType);
-			    	contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
+			    	contentRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue(paymentSettlement.getServiceTax());
-				    contentRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue(txn.getCoupon_code());
+				    contentRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue(paymentSettlement.getOtherCharges());
-				    contentRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue(0.0);
-				    contentRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue(0.0);
 				    contentRow.createCell(OrderReportColumn.NET_COLLECTION.getValue()).setCellValue(paymentSettlement.getNetCollection());
+				    isFirstOrderForTransaction = false;
+		    	}
-		    }
+			}
-		} catch (TTransportException e) {
-			logger.error("TTransportException " + e);
-		} catch (PaymentException e) {
-			logger.error("PaymentException " + e);
-		} catch (TException e) {
-			logger.error("TException " + e);
-		} catch (TransactionServiceException e) {
-			logger.error("Transaction Service Exception " + e);
-		} catch (LogisticsServiceException e) {
-			addActionError("Error loading list of COD providers");
-			logger.error("Logistics Service Exception " + e);
+		}
+	}
+	private void outputCODRow(Row contentRow, PaymentSettlement paymentSettlement, Order order, Transaction txn, Payment payment)	{
+		LineItem lineItem = order.getLineitems().get(0);
+        contentRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue(order.getId());
+        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
+	    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
+	    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
+	    contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
+	    contentRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue(getValueForEmptyString(lineItem.getBrand()));
+	    contentRow.createCell(OrderReportColumn.MODEL_NAME.getValue()).setCellValue(getValueForEmptyString(lineItem.getModel_name()));
+	    contentRow.createCell(OrderReportColumn.MODEL_NUMBER.getValue()).setCellValue(getValueForEmptyString(lineItem.getModel_number()));
+	    contentRow.createCell(OrderReportColumn.COLOR.getValue()).setCellValue(getValueForEmptyString(lineItem.getColor()));
+	    contentRow.createCell(OrderReportColumn.QUANTITY.getValue()).setCellValue(lineItem.getQuantity());
+	    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.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.NET_COLLECTION.getValue()).setCellValue(paymentSettlement.getNetCollection());
+	    contentRow.createCell(OrderReportColumn.SETTLEMENT_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(paymentSettlement.getSettlementDate())));
+	    contentRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue(txn.getCoupon_code());
+    	contentRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue(payment.getStatus().name());
+    	contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
+	}
 	public List<Vendor> getAllVendors()	{
 		return this.vendors;
+	}
 	private String getValueForEmptyString(String s){

Subversion Repositories SmartDukaan

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