Subversion Repositories SmartDukaan

Rev

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

Rev 5945 Rev 6387
Line 1... Line 1...
1 
package in.shop2020.support.controllers;
 1 
package in.shop2020.support.controllers;
2 
 
 2 
 
3 
import in.shop2020.logistics.Provider;
 3 
import in.shop2020.logistics.Provider;
4 
import in.shop2020.model.v1.inventory.Vendor;
 4 
import in.shop2020.model.v1.inventory.Vendor;
- 
 
 5 
import in.shop2020.model.v1.inventory.InventoryService.Client;
5 
import in.shop2020.model.v1.order.LineItem;
 6 
import in.shop2020.model.v1.order.LineItem;
6 
import in.shop2020.model.v1.order.Order;
 7 
import in.shop2020.model.v1.order.Order;
7 
import in.shop2020.model.v1.order.OrderStatus;
 8 
import in.shop2020.model.v1.order.OrderStatus;
8 
import in.shop2020.model.v1.order.OrderStatusGroups;
 9 
import in.shop2020.model.v1.order.OrderStatusGroups;
9 
import in.shop2020.model.v1.order.PaymentSettlement;
 10 
import in.shop2020.model.v1.order.PaymentSettlement;
Line 27... Line 28...
27 
import java.text.SimpleDateFormat;
 28 
import java.text.SimpleDateFormat;
28 
import java.util.ArrayList;
 29 
import java.util.ArrayList;
29 
import java.util.Date;
 30 
import java.util.Date;
30 
import java.util.HashMap;
 31 
import java.util.HashMap;
31 
import java.util.HashSet;
 32 
import java.util.HashSet;
- 
 
 33 
import java.util.Hashtable;
32 
import java.util.List;
 34 
import java.util.List;
33 
import java.util.Map;
 35 
import java.util.Map;
34 
import java.util.Set;
 36 
import java.util.Set;
35 
import java.util.Map.Entry;
 37 
import java.util.Map.Entry;
36 
 
 38 
 
Line 68... Line 70...
68
70
69 
	private enum OrderReportColumn {
 71 
	private enum OrderReportColumn {
70 
	    ORDER_ID(0),
 72 
	    ORDER_ID(0),
71 
	    ORIGINAL_ORDER_ID(1),
 73 
	    ORIGINAL_ORDER_ID(1),
72 
	    VENDOR_ID(2),
 74 
	    VENDOR_ID(2),
- 
 
 75 
	    VENDOR_NAME(3),
73 
	    ORDER_DATE(3),
 76 
	    ORDER_DATE(4),
74 
		BILLING_NUMBER(4),
 77 
		BILLING_NUMBER(5),
75 
		BILLING_DATE(5),
 78 
		BILLING_DATE(6),
76 
		DELIVERY_DATE(6),
 79 
		DELIVERY_DATE(7),
77 
		BRAND(7),
 80 
		BRAND(8),
78 
		MODEL_NAME(8),
 81 
		MODEL_NAME(9),
79 
		MODEL_NUMBER(9),
 82 
		MODEL_NUMBER(10),
80 
		COLOR(10),
 83 
		COLOR(11),
81 
		QUANTITY(11),
 84 
		QUANTITY(12),
82 
		UNIT_TRANSFER_PRICE(12),
 85 
		UNIT_TRANSFER_PRICE(13),
83 
		UNIT_SELLING_PRICE(13),
 86 
		UNIT_SELLING_PRICE(14),
84 
		TOTAL_TRANSFER_PRICE(14),
 87 
		TOTAL_TRANSFER_PRICE(15),
85 
		TOTAL_SELLING_PRICE(15),
 88 
		TOTAL_SELLING_PRICE(16),
86 
		CURRENT_STATUS(16),
 89 
		CURRENT_STATUS(17),
87 
		VENDOR_PAID(17),
 90 
		VENDOR_PAID(18),
88 
		PAYMENT_STATUS(18),
 91 
		PAYMENT_STATUS(19),
89 
		PAYMENT_TYPE(19),
 92 
		PAYMENT_TYPE(20),
90 
		PAYMENT_ID(20),
 93 
		PAYMENT_ID(21),
91 
		COUPON_CODE(21),
 94 
		COUPON_CODE(22),
92 
		SETTLEMENT_DATE(22),
 95 
		SETTLEMENT_DATE(23),
93 
		SERVICE_TAX(23),
 96 
		SERVICE_TAX(24),
94 
		OTHER_CHARGES(24),
 97 
		OTHER_CHARGES(25),
95 
		NET_COLLECTION(25),
 98 
		NET_COLLECTION(26),
96 
		USER_PAYABLE_AMOUNT(26);
 99 
		USER_PAYABLE_AMOUNT(27);
97
100
98 
		private int value;
 101 
		private int value;
99
102
100 
		OrderReportColumn(int value) {
 103 
		OrderReportColumn(int value) {
101 
			this.value = value;
 104 
			this.value = value;
Line 135... Line 138...
135 
	private List<Order> returnedOrders = new ArrayList<Order>();
 138 
	private List<Order> returnedOrders = new ArrayList<Order>();
136 
	private List<Order> unsettledOrders = new ArrayList<Order>();
 139 
	private List<Order> unsettledOrders = new ArrayList<Order>();
137 
	private List<Order> userPaymentNotRequiredOrders = new ArrayList<Order>();
 140 
	private List<Order> userPaymentNotRequiredOrders = new ArrayList<Order>();
138 
	private Map<Order, PaymentSettlement> paymentSettledOrdersMap = new HashMap<Order, PaymentSettlement>();
 141 
	private Map<Order, PaymentSettlement> paymentSettledOrdersMap = new HashMap<Order, PaymentSettlement>();
139 
	private List<Order> ordersWithErrors = new ArrayList<Order>();
 142 
	private List<Order> ordersWithErrors = new ArrayList<Order>();
- 
 
 143 
	private Map<Long, String> vendorIdNameMap;
140
144
141 
	private final DateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy");
 145 
	private final DateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy");
142
146
143 
	public String index()	{
 147 
	public String index()	{
144 
		initiatializeDashboard();
 148 
		initiatializeDashboard();
Line 941... Line 945...
941 
	private ByteArrayOutputStream getReconciliationReport(long vendorId, long fromTime, long toTime, boolean notall) {
 945 
	private ByteArrayOutputStream getReconciliationReport(long vendorId, long fromTime, long toTime, boolean notall) {
942 
		ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
 946 
		ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
943
947
944 
		try {
 948 
		try {
945
949
- 
 
 950 
			InventoryClient inventoryServiceClient = new InventoryClient();
- 
 
 951 
            Client inventoryClient = inventoryServiceClient.getClient();
- 
 
 952 
            List<Vendor> vendors = inventoryClient.getAllVendors();
- 
 
 953 
            vendorIdNameMap = new Hashtable<Long, String>();
- 
 
 954 
            for(Vendor vendor : vendors){
- 
 
 955 
            	vendorIdNameMap.put(vendor.getId(), vendor.getName());
- 
 
 956 
            }
- 
 
 957
946 
			TransactionClient tsc = new TransactionClient();
 958 
			TransactionClient tsc = new TransactionClient();
947 
			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
 959 
			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
948
960
949 
			List<Order> unpaidOrders = transactionClient.getBilledOrders(vendorId, notall, fromTime, toTime);
 961 
			List<Order> unpaidOrders = transactionClient.getBilledOrders(vendorId, notall, fromTime, toTime);
950 
			logger.info("Unpaid Order count: " + unpaidOrders.size());
 962 
			logger.info("Unpaid Order count: " + unpaidOrders.size());
Line 1170... Line 1182...
1170
1182
1171 
		Row headerRow = sheet.createRow(rowCount ++);
 1183 
		Row headerRow = sheet.createRow(rowCount ++);
1172 
	    headerRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue("Order Id");
 1184 
	    headerRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue("Order Id");
1173 
	    headerRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue("Original Order Id");
 1185 
	    headerRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue("Original Order Id");
1174 
	    headerRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue("Vendor Id");
 1186 
	    headerRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue("Vendor Id");
- 
 
 1187 
	    headerRow.createCell(OrderReportColumn.VENDOR_NAME.getValue()).setCellValue("Vendor Name");
1175 
	    headerRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue("Order Date");
 1188 
	    headerRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue("Order Date");
1176 
	    headerRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue("Billing Number");
 1189 
	    headerRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue("Billing Number");
1177 
	    headerRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue("Billing Date");
 1190 
	    headerRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue("Billing Date");
1178 
	    headerRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue("Returned Date");
 1191 
	    headerRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue("Returned Date");
1179 
	    headerRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue("Brand");
 1192 
	    headerRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue("Brand");
Line 1204... Line 1217...
1204 
				}
 1217 
				}
1205 
				else {
 1218 
				else {
1206 
					contentRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue(order.getOriginalOrderId());
 1219 
					contentRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue(order.getOriginalOrderId());
1207 
				}
 1220 
				}
1208 
		        contentRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue(order.getVendorId());
 1221 
		        contentRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue(order.getVendorId());
- 
 
 1222 
		        contentRow.createCell(OrderReportColumn.VENDOR_NAME.getValue()).setCellValue(vendorIdNameMap.get(order.getVendorId()));
1209 
		        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
 1223 
		        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
1210 
			    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
 1224 
			    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
1211 
			    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
 1225 
			    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
1212 
			    contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
 1226 
			    contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
1213 
			    contentRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue(getValueForEmptyString(lineItem.getBrand()));
 1227 
			    contentRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue(getValueForEmptyString(lineItem.getBrand()));
Line 1234... Line 1248...
1234
1248
1235 
		Row headerRow = sheet.createRow(rowCount ++);
 1249 
		Row headerRow = sheet.createRow(rowCount ++);
1236 
	    headerRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue("Order Id");
 1250 
	    headerRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue("Order Id");
1237 
	    headerRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue("Original Order Id");
 1251 
	    headerRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue("Original Order Id");
1238 
	    headerRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue("Vendor Id");
 1252 
	    headerRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue("Vendor Id");
- 
 
 1253 
	    headerRow.createCell(OrderReportColumn.VENDOR_NAME.getValue()).setCellValue("Vendor Name");
1239 
	    headerRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue("Order Date");
 1254 
	    headerRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue("Order Date");
1240 
	    headerRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue("Billing Number");
 1255 
	    headerRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue("Billing Number");
1241 
	    headerRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue("Billing Date");
 1256 
	    headerRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue("Billing Date");
1242 
	    headerRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue("Returned Date");
 1257 
	    headerRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue("Returned Date");
1243 
	    headerRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue("Brand");
 1258 
	    headerRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue("Brand");
Line 1268... Line 1283...
1268 
				}
 1283 
				}
1269 
				else {
 1284 
				else {
1270 
					contentRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue(order.getOriginalOrderId());
 1285 
					contentRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue(order.getOriginalOrderId());
1271 
				}
 1286 
				}
1272 
		        contentRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue(order.getVendorId());
 1287 
		        contentRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue(order.getVendorId());
- 
 
 1288 
		        contentRow.createCell(OrderReportColumn.VENDOR_NAME.getValue()).setCellValue(vendorIdNameMap.get(order.getVendorId()));
1273 
		        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
 1289 
		        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
1274 
			    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
 1290 
			    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
1275 
			    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
 1291 
			    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
1276 
			    contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
 1292 
			    contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
1277 
			    contentRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue(getValueForEmptyString(lineItem.getBrand()));
 1293 
			    contentRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue(getValueForEmptyString(lineItem.getBrand()));
Line 1298... Line 1314...
1298
1314
1299 
	    Row headerRow = sheet.createRow(rowCount ++);
 1315 
	    Row headerRow = sheet.createRow(rowCount ++);
1300 
	    headerRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue("Order Id");
 1316 
	    headerRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue("Order Id");
1301 
	    headerRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue("Original Order Id");
 1317 
	    headerRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue("Original Order Id");
1302 
	    headerRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue("Vendor Id");
 1318 
	    headerRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue("Vendor Id");
- 
 
 1319 
	    headerRow.createCell(OrderReportColumn.VENDOR_NAME.getValue()).setCellValue("Vendor Name");
1303 
	    headerRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue("Order Date");
 1320 
	    headerRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue("Order Date");
1304 
	    headerRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue("Billing Number");
 1321 
	    headerRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue("Billing Number");
1305 
	    headerRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue("Billing Date");
 1322 
	    headerRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue("Billing Date");
1306 
	    headerRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue("Delivery Date");
 1323 
	    headerRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue("Delivery Date");
1307 
	    headerRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue("Brand");
 1324 
	    headerRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue("Brand");
Line 1332... Line 1349...
1332 
				}
 1349 
				}
1333 
				else {
 1350 
				else {
1334 
					contentRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue(order.getOriginalOrderId());
 1351 
					contentRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue(order.getOriginalOrderId());
1335 
				}
 1352 
				}
1336 
		        contentRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue(order.getVendorId());
 1353 
		        contentRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue(order.getVendorId());
- 
 
 1354 
		        contentRow.createCell(OrderReportColumn.VENDOR_NAME.getValue()).setCellValue(vendorIdNameMap.get(order.getVendorId()));
1337 
		        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
 1355 
		        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
1338 
			    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
 1356 
			    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
1339 
			    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
 1357 
			    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
1340 
			    if(order.getDelivery_timestamp() != 0)	{
 1358 
			    if(order.getDelivery_timestamp() != 0)	{
1341 
			    	contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
 1359 
			    	contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
Line 1364... Line 1382...
1364
1382
1365 
	    Row headerRow = sheet.createRow(rowCount ++);
 1383 
	    Row headerRow = sheet.createRow(rowCount ++);
1366 
	    headerRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue("Order Id");
 1384 
	    headerRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue("Order Id");
1367 
	    headerRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue("Original Order Id");
 1385 
	    headerRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue("Original Order Id");
1368 
	    headerRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue("Vendor Id");
 1386 
	    headerRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue("Vendor Id");
- 
 
 1387 
	    headerRow.createCell(OrderReportColumn.VENDOR_NAME.getValue()).setCellValue("Vendor Name");
1369 
	    headerRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue("Order Date");
 1388 
	    headerRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue("Order Date");
1370 
	    headerRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue("Billing Number");
 1389 
	    headerRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue("Billing Number");
1371 
	    headerRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue("Billing Date");
 1390 
	    headerRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue("Billing Date");
1372 
	    headerRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue("Delivery Date");
 1391 
	    headerRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue("Delivery Date");
1373 
	    headerRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue("Brand");
 1392 
	    headerRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue("Brand");
Line 1452... Line 1471...
1452 
					}
 1471 
					}
1453 
					else {
 1472 
					else {
1454 
						contentRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue(order.getOriginalOrderId());
 1473 
						contentRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue(order.getOriginalOrderId());
1455 
					}
 1474 
					}
1456 
			        contentRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue(order.getVendorId());
 1475 
			        contentRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue(order.getVendorId());
- 
 
 1476 
			        contentRow.createCell(OrderReportColumn.VENDOR_NAME.getValue()).setCellValue(vendorIdNameMap.get(order.getVendorId()));
1457 
			        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
 1477 
			        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
1458 
				    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
 1478 
				    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
1459 
				    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
 1479 
				    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
1460 
				    if(order.getDelivery_timestamp() != 0)	{
 1480 
				    if(order.getDelivery_timestamp() != 0)	{
1461 
				    	contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
 1481 
				    	contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
Line 1503... Line 1523...
1503
1523
1504 
	    Row headerRow = sheet.createRow(rowCount ++);
 1524 
	    Row headerRow = sheet.createRow(rowCount ++);
1505 
	    headerRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue("Order Id");
 1525 
	    headerRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue("Order Id");
1506 
	    headerRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue("Original Order Id");
 1526 
	    headerRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue("Original Order Id");
1507 
	    headerRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue("Vendor Id");
 1527 
	    headerRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue("Vendor Id");
- 
 
 1528 
	    headerRow.createCell(OrderReportColumn.VENDOR_NAME.getValue()).setCellValue("Vendor Name");
1508 
	    headerRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue("Order Date");
 1529 
	    headerRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue("Order Date");
1509 
	    headerRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue("Billing Number");
 1530 
	    headerRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue("Billing Number");
1510 
	    headerRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue("Billing Date");
 1531 
	    headerRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue("Billing Date");
1511 
	    headerRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue("Delivery Date");
 1532 
	    headerRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue("Delivery Date");
1512 
	    headerRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue("Brand");
 1533 
	    headerRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue("Brand");
Line 1605... Line 1626...
1605 
					}
 1626 
					}
1606 
					else {
 1627 
					else {
1607 
						contentRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue(order.getOriginalOrderId());
 1628 
						contentRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue(order.getOriginalOrderId());
1608 
					}
 1629 
					}
1609 
			        contentRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue(order.getVendorId());
 1630 
			        contentRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue(order.getVendorId());
- 
 
 1631 
			        contentRow.createCell(OrderReportColumn.VENDOR_NAME.getValue()).setCellValue(vendorIdNameMap.get(order.getVendorId()));
1610 
			        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
 1632 
			        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
1611 
				    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
 1633 
				    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
1612 
				    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
 1634 
				    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
1613 
				    if(order.getDelivery_timestamp() != 0)	{
 1635 
				    if(order.getDelivery_timestamp() != 0)	{
1614 
				    	contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
 1636 
				    	contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
Line 1678... Line 1700...
1678 
				}
 1700 
				}
1679 
				else {
 1701 
				else {
1680 
					contentRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue(order.getOriginalOrderId());
 1702 
					contentRow.createCell(OrderReportColumn.ORIGINAL_ORDER_ID.getValue()).setCellValue(order.getOriginalOrderId());
1681 
				}
 1703 
				}
1682 
		        contentRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue(order.getVendorId());
 1704 
		        contentRow.createCell(OrderReportColumn.VENDOR_ID.getValue()).setCellValue(order.getVendorId());
- 
 
 1705 
		        contentRow.createCell(OrderReportColumn.VENDOR_NAME.getValue()).setCellValue(vendorIdNameMap.get(order.getVendorId()));
1683 
		        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
 1706 
		        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
1684 
			    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
 1707 
			    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
1685 
			    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
 1708 
			    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
1686 
			    if(order.getDelivery_timestamp() != 0)	{
 1709 
			    if(order.getDelivery_timestamp() != 0)	{
1687 
			    	contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
 1710 
			    	contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));