| Line 248... |
Line 248... |
| 248 |
order.setLineitems(Collections.singletonList(lineItem));
|
248 |
order.setLineitems(Collections.singletonList(lineItem));
|
| 249 |
order.setStatus(OrderStatus.SUBMITTED_FOR_PROCESSING);
|
249 |
order.setStatus(OrderStatus.SUBMITTED_FOR_PROCESSING);
|
| 250 |
order.setStatusDescription("In Process");
|
250 |
order.setStatusDescription("In Process");
|
| 251 |
order.setCreated_timestamp(new Date().getTime());
|
251 |
order.setCreated_timestamp(new Date().getTime());
|
| 252 |
try {
|
252 |
try {
|
| - |
|
253 |
order.setPromised_shipping_time(row.getCell(SHIP_DATE_INDEX).getDateCellValue().getTime());
|
| - |
|
254 |
order.setExpected_shipping_time(row.getCell(SHIP_DATE_INDEX).getDateCellValue().getTime());
|
| 253 |
order.setPromised_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
|
255 |
//order.setPromised_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
|
| 254 |
order.setExpected_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
|
256 |
//order.setExpected_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
|
| 255 |
Calendar time = Calendar.getInstance();
|
257 |
Calendar time = Calendar.getInstance();
|
| 256 |
time.setTimeInMillis(order.getExpected_shipping_time());
|
258 |
time.setTimeInMillis(order.getExpected_shipping_time());
|
| 257 |
time.add(Calendar.DAY_OF_MONTH, 3);
|
259 |
time.add(Calendar.DAY_OF_MONTH, 3);
|
| 258 |
order.setPromised_delivery_time(time.getTimeInMillis());
|
260 |
order.setPromised_delivery_time(time.getTimeInMillis());
|
| 259 |
order.setExpected_delivery_time(time.getTimeInMillis());
|
261 |
order.setExpected_delivery_time(time.getTimeInMillis());
|
| 260 |
} catch(Exception e) {
|
262 |
} catch(Exception e) {
|
| 261 |
addActionError("Error in updating Shipping Time for row number " + rowId + 1);
|
263 |
addActionError("Error in updating Shipping Time for row number " + (rowId + 1));
|
| 262 |
logger.error("Error in updating Shipping Time for row number " + (rowId + 1),e);
|
264 |
logger.error("Error in updating Shipping Time for row number " + (rowId + 1),e);
|
| 263 |
}
|
265 |
}
|
| 264 |
|
266 |
|
| 265 |
//TODO Delivery time
|
267 |
//TODO Delivery time
|
| 266 |
InventoryService.Client inventoryClient = null;
|
268 |
InventoryService.Client inventoryClient = null;
|
| Line 329... |
Line 331... |
| 329 |
ebayOrder.setEbayListingId(ebayItem.getEbayListingId());
|
331 |
ebayOrder.setEbayListingId(ebayItem.getEbayListingId());
|
| 330 |
ebayOrder.setSalesRecordNumber(new Double(row.getCell(SALES_RECORD_NUM_INDEX).getNumericCellValue()).longValue());
|
332 |
ebayOrder.setSalesRecordNumber(new Double(row.getCell(SALES_RECORD_NUM_INDEX).getNumericCellValue()).longValue());
|
| 331 |
row.getCell(TRANSACTION_ID_INDEX).setCellType(Cell.CELL_TYPE_STRING);
|
333 |
row.getCell(TRANSACTION_ID_INDEX).setCellType(Cell.CELL_TYPE_STRING);
|
| 332 |
ebayOrder.setTransactionId(row.getCell(TRANSACTION_ID_INDEX).getStringCellValue());
|
334 |
ebayOrder.setTransactionId(row.getCell(TRANSACTION_ID_INDEX).getStringCellValue());
|
| 333 |
try {
|
335 |
try {
|
| 334 |
//ebayOrder.setEbayTxnDate(row.getCell(TRANSACTION_DATE_INDEX).getDateCellValue().getTime());
|
336 |
ebayOrder.setEbayTxnDate(row.getCell(TRANSACTION_DATE_INDEX).getDateCellValue().getTime());
|
| 335 |
//ebayOrder.setEbayTxnDate(sdf2.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
|
337 |
//ebayOrder.setEbayTxnDate(sdf2.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
|
| 336 |
ebayOrder.setEbayTxnDate(sdf.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
|
338 |
//ebayOrder.setEbayTxnDate(sdf.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
|
| 337 |
} catch (Exception e) {
|
339 |
} catch (Exception e) {
|
| 338 |
logger.error("Error in setting transaction date for Ebay Order with OrderId : " + order.getId());
|
340 |
logger.error("Error in setting transaction date for Ebay Order with OrderId : " + order.getId());
|
| 339 |
}
|
341 |
}
|
| 340 |
ebayOrder.setOrderId(transaction.getOrders().get(0).getId());
|
342 |
ebayOrder.setOrderId(transaction.getOrders().get(0).getId());
|
| 341 |
ebayOrder.setPaisaPayId(paisaPayId);
|
343 |
ebayOrder.setPaisaPayId(paisaPayId);
|