Subversion Repositories SmartDukaan

Rev

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

Rev 7174 Rev 7178
Line 58... Line 58...
58 
	private TransactionClient tsc;
 58 
	private TransactionClient tsc;
59 
    private in.shop2020.model.v1.order.TransactionService.Client tClient;
 59 
    private in.shop2020.model.v1.order.TransactionService.Client tClient;
60
60
61 
    private final DateFormat formatter = new SimpleDateFormat("EEE, dd-MMM-yyyy hh:mm a");
 61 
    private final DateFormat formatter = new SimpleDateFormat("EEE, dd-MMM-yyyy hh:mm a");
62 
    private final DateFormat dateFormatter = new SimpleDateFormat("dd/MM/yyyy");
 62 
    private final DateFormat dateFormatter = new SimpleDateFormat("dd/MM/yyyy");
- 
 
 63 
    private final DateFormat df4Filename = new SimpleDateFormat("EEE_dd_MMM");
63
64
64 
    private List<RechargeTransaction> txns = null;
 65 
    private List<RechargeTransaction> txns = null;
65 
    private List<RechargeTransaction> searchResult = null;
 66 
    private List<RechargeTransaction> searchResult = null;
66 
 
 67 
 
67 
    private boolean showReprintColumn = false;
 68 
    private boolean showReprintColumn = false;
Line 122... Line 123...
122 
	    List<RechargeTransaction> successfulRecharges = tClient.getRechargeTrans(Long.parseLong((String) request.getSession().getAttribute("STORE_ID")), today, today, RechargeOrderStatus.RECHARGE_SUCCESSFUL);
 123 
	    List<RechargeTransaction> successfulRecharges = tClient.getRechargeTrans(Long.parseLong((String) request.getSession().getAttribute("STORE_ID")), today, today, RechargeOrderStatus.RECHARGE_SUCCESSFUL);
123 
	    List<RechargeTransaction> refundedRecharges = tClient.getRechargeTrans(Long.parseLong((String) request.getSession().getAttribute("STORE_ID")), today, today, RechargeOrderStatus.RECHARGE_FAILED_REFUNDED);
 124 
	    List<RechargeTransaction> refundedRecharges = tClient.getRechargeTrans(Long.parseLong((String) request.getSession().getAttribute("STORE_ID")), today, today, RechargeOrderStatus.RECHARGE_FAILED_REFUNDED);
124 
	    ByteArrayOutputStream baos = generateCollectionReport(successfulRecharges, refundedRecharges);
 125 
	    ByteArrayOutputStream baos = generateCollectionReport(successfulRecharges, refundedRecharges);
125 
	    response.setContentType("application/vnd.ms-excel");
 126 
	    response.setContentType("application/vnd.ms-excel");
126 
        String fileName = "collection-report";
 127 
        String fileName = "collection-report";
127 
        String todayDate = dateFormatter.format(new Date(today));
 128 
        String todayDate = df4Filename.format(new Date(today));
128 
        fileName = fileName + "-" + todayDate.replaceAll("\\\\", "-") ;
 129 
        fileName = fileName + "-" + todayDate;
129 
        fileName = fileName + ".xls";
 130 
        fileName = fileName + ".xls";
130 
        response.setHeader("Content-disposition", "inline; filename=" + fileName);
 131 
        response.setHeader("Content-disposition", "inline; filename=" + fileName);
131 
        ServletOutputStream sos;
 132 
        ServletOutputStream sos;
132 
        try {
 133 
        try {
133 
            sos = response.getOutputStream();
 134 
            sos = response.getOutputStream();
Line 237... Line 238...
237 
		if(st!=null){
 238 
		if(st!=null){
238 
			st1 = st.name();
 239 
			st1 = st.name();
239 
		}
 240 
		}
240 
		String fileName = st1 + "-recharge-report";
 241 
		String fileName = st1 + "-recharge-report";
241 
		if (!startDate.equals("")) {
 242 
		if (!startDate.equals("")) {
242 
			fileName = fileName + "-" + startDate.replaceAll("\\\\", "") ;
 243 
			fileName = fileName + "-" + startDate.replaceAll("\\\\", "_") ;
243 
		}
 244 
		}
244 
		if (!endDate.equals("")) {
 245 
		if (!endDate.equals("")) {
245 
			fileName = fileName + "-" + endDate.replaceAll("\\\\", "") ;
 246 
			fileName = fileName + "-" + endDate.replaceAll("\\\\", "_") ;
246 
		}
 247 
		}
247 
		fileName = fileName + ".xls";
 248 
		fileName = fileName + ".xls";
248 
		response.setHeader("Content-disposition", "inline; filename=" + fileName);
 249 
		response.setHeader("Content-disposition", "inline; filename=" + fileName);
249 
        ServletOutputStream sos;
 250 
        ServletOutputStream sos;
250 
        try {
 251 
        try {