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

 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 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;
+import org.apache.thrift.TApplicationException;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import com.opensymphony.xwork2.ValidationAwareSupport;
 /**
  * @author Varun Gupta
  * @description: This class handles web requests to generate vendor specific reconciliation reports
  *               for given vendor for a given date range
  */
-@InterceptorRefs({
+//@InterceptorRefs({
-    @InterceptorRef("defaultStack"),
+//    @InterceptorRef("defaultStack"),
-    @InterceptorRef("login")
+//    @InterceptorRef("login")
-})
+//})
-@Results({
+//@Results({
-    @Result(name="authfail", type="redirectAction", params = {"actionName" , "reports"})
+//    @Result(name="authfail", type="redirectAction", params = {"actionName" , "reports"})
-})
+//})
-public class VendorReconciliationController implements ServletRequestAware, ServletResponseAware, ServletContextAware {
+public class VendorReconciliationController extends ValidationAwareSupport implements ServletRequestAware, ServletResponseAware, ServletContextAware {
     private static Logger logger = LoggerFactory.getLogger(VendorReconciliationController.class);
 	private enum OrderReportColumn {
 	    ORDER_ID(0),
 		PAYMENT_TYPE(17),
 		PAYMENT_ID(18),
 		COUPON_CODE(19),
 		SERVICE_TAX(20),
 		OTHER_CHARGES(21),
-		NET_COLLECTION(22);
+		NET_COLLECTION(22),
+	    REFUND(23),
+	    FINAL_AMOUNT(24),
+	    IS_RESHIPED_ORDER(25);
 //		COUPON_CATEGORY(19),
 //		DISCOUNT(20),
 		private int value;
 	private HttpServletResponse response;
 	private ServletContext context;
     private HttpSession session;
 	private List<Vendor> vendors;
 	private String reportSource;
+	private List<Long> orderIdsWithoutSuccess;
 	private File hdfcSettlementReport;
 	private File ebsSettlementReport;
 	private File ebsSettlementSummary;
 	private String bluedartSettlementDate;
 	private File bluedartSettlementReport;
+	private String aramexSettlementDate;
+	private File aramexSettlementReport;
 	private Map<Long, Map<String, Double>> misMatches = new HashMap<Long, Map<String, Double>>();
 	private Map<Long, String> ebsSettlementSummaries;
 	private final DateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy");
 		try	{
 			CatalogClient csc = new CatalogClient();
 			Client catalogClient = csc.getClient();
 			vendors = catalogClient.getAllVendors();
+			orderIdsWithoutSuccess = new ArrayList<Long>();
 			TransactionClient tsc = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
 			ebsSettlementSummaries = transactionClient.getEBSSettlementSummaries();
-			System.out.println(ebsSettlementSummaries);
+			logger.info("", ebsSettlementSummaries);
+		} catch (TException e) {
+			logger.error("TException", e);
-		} catch (Exception e) {
+		} catch (TransactionServiceException e) {
-			// TODO: handle exception
+			logger.error("TransactionServiceException", e);
+		}
+	}
 	public String index()	{
 		return "report";
+	}
 	public HttpHeaders create()	{
 		String formType = request.getParameter("formtype");
-		System.out.println(formType);
+		logger.info("Form Type: " + formType);
 		if (formType.equals("uploadEBSSettlementSummary")) {
 			uploadEBSSettlementSummary();
 		} else if (formType.equals("uploadEBSSettlements")) {
 		} else if (formType.equals("uploadHDFCSettlements")) {
 			uploadHDFCSettlements();
 		} else if (formType.equals("uploadBluedartSettlements")) {
 			uploadBluedartSettlements();
+		} else if (formType.equals("uploadAramexSettlements")) {
+			uploadAramexSettlements();
+		}
+	    logger.info("Order Ids where no successful payment was found", orderIdsWithoutSuccess);
 		return new DefaultHttpHeaders("report");
+	}
 	public HttpHeaders generateReconciliationReport()	{
 		DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
 			Date endDate = dateFormat.parse(request.getParameter("end"));
 		    long vendorId = Long.parseLong(request.getParameter("vendor"));
 		    logger.info(startDate + " " + endDate + " " + vendorId);
-			CatalogClient csc = new CatalogClient();
-			Client catalogClient= csc.getClient();
-			vendors = catalogClient.getAllVendors();
 			TransactionClient tsc = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
 			List<Order> orders = transactionClient.getBilledOrdersForVendor(vendorId, startDate.getTime(), endDate.getTime());
 			logger.info("Order count: " + orders.size());
 			DateFormat dateFormatForFile = new SimpleDateFormat("dd.MM.yyyy");
 			String vendorName = getVendorName(vendorId);
 			response.setContentType("application/vnd.ms-excel");
 			response.setHeader("Content-disposition", "inline; filename=" + vendorName + "-reconciliation-from-" + dateFormatForFile.format(startDate) + "-" + dateFormatForFile.format(endDate) + ".xls");
 			ServletOutputStream sos;
 			try {
                 	paymentIdStr = row.getCell(indexPaymentId).getStringCellValue().replace("'", "");
                 	paymentId = Long.parseLong(paymentIdStr);
                 	logger.info("paymentId: " + paymentId + ", recfmt: " + recfmt + ", settlementDate: " + settlementDate + ", netCollection: " + netCollection);
-                    if (recfmt.equalsIgnoreCase("CVD"))	{
+                    if (recfmt.trim().equalsIgnoreCase("CVD"))	{
-                    	if (netCollection > 0)	netCollection *= -1;
+                    	if (netCollection > 0.0)	netCollection *= -1.0;
-                    	transactionClient.savePaymentSettlements(settlementDate.getTime(), 1, paymentId, 0, 0, netCollection);
+                    	transactionClient.savePaymentSettlements(settlementDate.getTime(), 1, paymentId, 0.0, 0.0, netCollection);
                     } else	{
                     	double msf = row.getCell(indexMSF).getNumericCellValue();
                     	double serviceTax = row.getCell(indexServiceTax).getNumericCellValue();
                     	double eduCess = row.getCell(indexEduCess).getNumericCellValue();
         	in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
 			psc = new PaymentClient();
 	    	in.shop2020.payments.PaymentService.Client paymentClient = psc.getClient();
         	for (Row row : sheet) {
+        		Order order = null;
         		try	{
         			if(row.equals(firstRow))	continue;
         			long awbNumber = (long) row.getCell(indexAWBno).getNumericCellValue();
         			double amount = row.getCell(indexAmount).getNumericCellValue();
-//        			mapAWBAndAmount.put(awbNumber, amount);
-        			Order order = transactionClient.getOrderForAwb(Long.toString(awbNumber));
+        			order = transactionClient.getOrderForAwb(Long.toString(awbNumber));
         			Payment payment = paymentClient.getSuccessfulPaymentForTxnId(order.getTransactionId());
         			logger.info("settlementDate: " + settlementDate + ", PaymentId: " + payment.getPaymentId() + ", Amount: " + amount);
         			transactionClient.savePaymentSettlements(settlementDate, 4, payment.getPaymentId(), 0.0, 0, amount);
         		} catch (NullPointerException e) {
         		} catch (PaymentException e) {
         			logger.error("" + e);
 				} catch (TransactionServiceException e) {
 					logger.error("" + e);
+				} catch (TApplicationException e)	{
+					orderIdsWithoutSuccess.add(order.getId());
+					logger.error("Application Exception while getting successfull payment for transaction Id, " + order.getTransactionId(), e);
+					addActionError("Application Exception while getting payment for transaction Id, " + order.getTransactionId());
+				}
+        	}
         } catch (ParseException e) {
         	logger.error("Could not parse " + bluedartSettlementDate + " " + e);
 		} catch (TTransportException e) {
 			logger.error("" + e);
         } catch (TException e) {
         	logger.error("" + e);
+        }
+	}
+	public void uploadAramexSettlements()	{
-//        Map<Long, Double> mapAWBAndAmount = new HashMap<Long, Double>();
+		logger.info("Uploading Aramex Settlements" + this.aramexSettlementDate);
+		if(this.aramexSettlementDate.equals(""))	{
+			addActionError("Settlement date cannot be left blank");
-//
+			return;
+		}
-//        for (Row row : sheet) {
+		Workbook wb = null;
-//        	try	{
+        try {
+            wb = new HSSFWorkbook(new FileInputStream(this.aramexSettlementReport));
-//                if(row.equals(firstRow))	continue;
+        } catch (FileNotFoundException e) {
-//                long awbNumber = (long) row.getCell(indexAWBno).getNumericCellValue();
+            logger.error("Unable to open the Settlement report", e);
+        } catch (IOException e) {
-//                double amount = row.getCell(indexAmount).getNumericCellValue();
+            logger.error("Unable to open the Settlement report", e);
+        } catch (NullPointerException e) {
-//                mapAWBAndAmount.put(awbNumber, amount);
+        	addActionError(e.getMessage());
+        	logger.error("Unable to open the Settlement report", e);
+        	return;
+		}
-//
-//        	} catch (NullPointerException e) {
+        Sheet sheet = wb.getSheetAt(0);
-//        		logger.error("" + e);
+        int indexOrderId = 0;
-//        	}
+        int indexAmount = 4;
-//        }
+        Row firstRow = sheet.getRow(0);
+        logger.info("Cell count:" + firstRow.getPhysicalNumberOfCells());
-//
-//		TransactionClient tsc;
+        TransactionClient tsc;
+        PaymentClient psc;
-//		try {
+        try	{
+			long settlementDate = DATE_FORMAT.parse(aramexSettlementDate).getTime();
-//			tsc = new TransactionClient();
+        	tsc = new TransactionClient();
-//			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
+        	in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
+			psc = new PaymentClient();
+	    	in.shop2020.payments.PaymentService.Client paymentClient = psc.getClient();
+	    	for (Row row: sheet)	{
+	    		if(row.equals(firstRow))	continue;
+	    		long orderId = (long) row.getCell(indexOrderId).getNumericCellValue();
+	    		double amount = row.getCell(indexAmount).getNumericCellValue();
+	    		Order order = null;
+	    		try {
+					order = transactionClient.getOrder(orderId);
+					Payment payment = paymentClient.getSuccessfulPaymentForTxnId(order.getTransactionId());
+					transactionClient.savePaymentSettlements(settlementDate, 4, payment.getPaymentId(), 0.0, 0.0, amount);
-//
+				} catch (TransactionServiceException e) {
-//	        transactionClient.saveBluedartSettlements(mapAWBAndAmount);
+					logger.error("Transaction Service Exception while getting order for id, " + orderId, e);
+					addActionError("Transaction Service Exception while getting order for id, " + orderId);
-//		} catch (TTransportException e) {
+				} catch (PaymentException e) {
+					logger.error("Payment Service Exception while getting successfull payment for transaction Id, " + order.getTransactionId(), e);
+					addActionError("Payment Service Exception while getting payment for transaction Id, " + order.getTransactionId());
+				} catch (TApplicationException e)	{
-//			logger.error("" + e);
+					orderIdsWithoutSuccess.add(orderId);
+					logger.error("Application Exception while getting successfull payment for transaction Id, " + order.getTransactionId(), e);
+					addActionError("Application Exception while getting payment for transaction Id, " + order.getTransactionId());
+				}
+	    	}
+        } catch (ParseException e) {
+        	addActionError("Could not parse " + aramexSettlementDate);
+        	logger.error("Could not parse " + aramexSettlementDate + " " + e);
+        	return;
-//		} catch (TransactionServiceException e) {
+        } catch (TTransportException e) {
-//			logger.error("" + e);
+        	logger.error("" + e);
-//		} catch (TException e) {
+        } catch (TException e) {
-//			logger.error("" + e);
+        	logger.error("" + e);
-//		}
+        }
+	}
 	// Prepares the XLS worksheet object and fills in the data with proper formatting
 	private ByteArrayOutputStream getReconciliationReport(List<Order> orders, Date startDate, Date endDate)	{
 		ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
 //	    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");
+	    headerRow.createCell(OrderReportColumn.IS_RESHIPED_ORDER.getValue()).setCellValue("Is Reshipped Order");
 	    sheet.createRow(serialNo ++);
 		TransactionClient tsc;
     	PaymentClient psc;
 	    	for (PaymentGateway tPaymentGateway: tPaymentGateways)	{
 	    		paymentGateways.put(tPaymentGateway.getId(), tPaymentGateway.getName());
+	    	}
+			List<PaymentSettlement> settlements = transactionClient.getSettlementsByDate(startDate.getTime(), endDate.getTime(), true);
+			logger.info("Refunds: " + settlements.size());
+			logger.info(settlements.toString());
+			Map<Long, PaymentSettlement> refunds = new HashMap<Long, PaymentSettlement>();
+			for (PaymentSettlement settlement: settlements)	{
+				refunds.put(settlement.getPaymentId(), settlement);
+			}
+			List <Long> orderIds = new ArrayList<Long>();
 			for(Order order : orders)	{
+				orderIds.add(order.getId());
+			}
+			List<Long> reshippedOrderIds = null;
+			reshippedOrderIds = transactionClient.getReshippedOrderIds(orderIds);
+			for(Order order : orders)	{
-		    	Row contentRow = sheet.createRow(serialNo++);
+			    logger.info("For order: " + order.getId());
 			    LineItem lineItem = order.getLineitems().get(0);
 			    double transferPrice = lineItem.getTransfer_price();
+			    Payment payment = null;
+			    try	{
-			    Payment payment = paymentClient.getSuccessfulPaymentForTxnId(order.getTransactionId());
+			    	payment = paymentClient.getSuccessfulPaymentForTxnId(order.getTransactionId());
+				    logger.info("getSuccessfulPaymentForTxnId: " + payment);
+			    } catch (TApplicationException e)	{
+			    	orderIdsWithoutSuccess.add(order.getId());
+					logger.error("Exception while getting successfull payment for transaction Id, " + order.getTransactionId(), e);
+					addActionError("Exception while getting payment for transaction Id, " + order.getTransactionId());
+				}
 			    Transaction txn = transactionClient.getTransaction(order.getTransactionId());
+			    PaymentSettlement paymentSettlement = null;
+			    String paymentType = null;
+			    if(payment != null)	{
-			    PaymentSettlement paymentSettlement = transactionClient.getSettlementForPaymentId(payment.getPaymentId());
+			    	paymentSettlement = transactionClient.getSettlementForPaymentId(payment.getPaymentId());
+			    	paymentType = paymentGateways.get(payment.getGatewayId());
+			    }
 	            double totalSellingPrice = lineItem.getTotal_price();
-	            double serviceTax = paymentSettlement.getServiceTax();
+	            double serviceTax = 0.0;
-	            double otherCollectionCharges = paymentSettlement.getOtherCharges();
+	            double otherCollectionCharges = 0.0;
-	            double netCollection = paymentSettlement.getNetCollection();
+	            double netCollection = 0.0;
+	            if(paymentSettlement != null)	{
+		            serviceTax = paymentSettlement.getServiceTax();
-	            String paymentType = paymentGateways.get(payment.getGatewayId());
+		            otherCollectionCharges = paymentSettlement.getOtherCharges();
+		            netCollection = paymentSettlement.getNetCollection();
+	            }
 	            if (netCollection < 0.0)	{
 	            	paymentType = paymentType + "-REFUND";
+	            }
 	            double expectedCollection = totalSellingPrice - otherCollectionCharges - serviceTax;
 	            	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.SETTLEMENT_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(paymentSettlement.getSettlementDate())));
 			    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 (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.GATEWAY_TRANSACTION_ID.getValue()).setCellValue(payment.getGatewayTxnId());
-			    contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue(paymentType);
+			    	contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue(paymentType);
-			    contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
+			    	contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
+			    	if(refunds.containsKey(payment.getPaymentId()))	{
+			    		refund = refunds.get(payment.getPaymentId()).getNetCollection();
+			    		refunds.remove(payment.getPaymentId());
+			    	}
+			    	contentRow.createCell(OrderReportColumn.REFUND.getValue()).setCellValue(refund);
+			    }
 			    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);
+			    boolean isReshippedOrder = reshippedOrderIds.contains(order.getId());
+			    contentRow.createCell(OrderReportColumn.IS_RESHIPED_ORDER.getValue()).setCellValue(isReshippedOrder ? 1 : 0);
+		    }
+		    logger.info("Order Ids where no successful payment was found: " + orderIdsWithoutSuccess.size());
+		    logger.info(orderIdsWithoutSuccess.toString());
+		    logger.info("Pending Refunds: " + refunds);
+		    logger.info("Reshipped Order Ids" + reshippedOrderIds);
+	    	sheet.createRow(serialNo++);
+		    // Refunds belonging to orders billed before the start date of supplied billing date range
+		    for (long paymentId: refunds.keySet())	{
+		    	Payment payment = paymentClient.getPayment(paymentId);
+		    	Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());
+		    	PaymentSettlement paymentSettlement = refunds.get(paymentId);
+		    	for (Order order: txn.getOrders())	{
+			    	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.REFUND.getValue()).setCellValue(paymentSettlement.getNetCollection());
+				    contentRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue(txn.getCoupon_code());
+				    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());
+		    	}
+		    }
 		} catch (TTransportException e) {
-			logger.error("Transport exception", e);
+			logger.error("TTransportException " + e);
 		} catch (PaymentException e) {
-			logger.error("Payment Service exception", e);
+			logger.error("PaymentException " + e);
 		} catch (TException e) {
-			logger.error("Thrift exception", e);
+			logger.error("TException " + e);
 		} catch (TransactionServiceException e) {
-			logger.error("Transaction Service exception", e);
+			logger.error("TransactionServiceException " + e);
+		}
+	}
 	public List<Vendor> getAllVendors()	{
 		return this.vendors;
     public void setBluedartSettlementReport(File bluedartSettlementReport)	{
     	this.bluedartSettlementReport = bluedartSettlementReport;
+    }
+    public String getAramexSettlementDate()	{
+    	return this.aramexSettlementDate;
+    }
+    public void setAramexSettlementDate(String aramexSettlementDate)	{
+    	this.aramexSettlementDate = aramexSettlementDate;
+    }
+    public void setAramexSettlementReport(File aramexSettlementReport) {
+		this.aramexSettlementReport = aramexSettlementReport;
+	}
+	public File getAramexSettlementReport() {
+		return aramexSettlementReport;
+	}
 	@Override
-    public void setServletContext(ServletContext context) {
+     public void setServletContext(ServletContext context) {
         this.context = context;
+    }
     public String getServletContextPath() {
         return context.getContextPath();

Subversion Repositories SmartDukaan

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