| Line 133... |
Line 133... |
| 133 |
row.getCell(EBAY_LISTINGID_INDEX).getStringCellValue(), null).get(0);
|
133 |
row.getCell(EBAY_LISTINGID_INDEX).getStringCellValue(), null).get(0);
|
| 134 |
row.getCell(TRANSACTION_ID_INDEX).setCellType(Cell.CELL_TYPE_STRING);
|
134 |
row.getCell(TRANSACTION_ID_INDEX).setCellType(Cell.CELL_TYPE_STRING);
|
| 135 |
ebayOrder.setTransactionId(row.getCell(TRANSACTION_ID_INDEX).getStringCellValue());
|
135 |
ebayOrder.setTransactionId(row.getCell(TRANSACTION_ID_INDEX).getStringCellValue());
|
| 136 |
tsc.updateEbayOrder(ebayOrder);
|
136 |
tsc.updateEbayOrder(ebayOrder);
|
| 137 |
order = tsc.getOrder(ebayOrder.getOrderId());
|
137 |
order = tsc.getOrder(ebayOrder.getOrderId());
|
| - |
|
138 |
if(order.getStatus() != OrderStatus.PAYMENT_PENDING) {
|
| - |
|
139 |
setErrorMsg(getErrorMsg() + "<br>Order for row number " + rowId + " has been already processed");
|
| - |
|
140 |
continue;
|
| - |
|
141 |
}
|
| 138 |
transaction = tsc.getTransaction(order.getTransactionId());
|
142 |
transaction = tsc.getTransaction(order.getTransactionId());
|
| 139 |
} catch (Exception e) {
|
143 |
} catch (Exception e) {
|
| 140 |
logger.error("Unable to get EbayOrder for row number " + rowId, e);
|
144 |
logger.error("Unable to get EbayOrder for row number " + rowId, e);
|
| 141 |
addActionError("Unable to get EbayOrder for row number " + rowId);
|
145 |
addActionError("Unable to get EbayOrder for row number " + rowId);
|
| 142 |
setErrorMsg(getErrorMsg() + "<br>Unable to get EbayOrder for row number " + rowId);
|
146 |
setErrorMsg(getErrorMsg() + "<br>Unable to get EbayOrder for row number " + rowId);
|
| Line 234... |
Line 238... |
| 234 |
Collection<String> actionErrors = getActionErrors();
|
238 |
Collection<String> actionErrors = getActionErrors();
|
| 235 |
if(actionErrors != null && !actionErrors.isEmpty()){
|
239 |
if(actionErrors != null && !actionErrors.isEmpty()){
|
| 236 |
for (String str : actionErrors) {
|
240 |
for (String str : actionErrors) {
|
| 237 |
errorMsg += "<BR/>" + str;
|
241 |
errorMsg += "<BR/>" + str;
|
| 238 |
}
|
242 |
}
|
| 239 |
if(rowId>1) {
|
- |
|
| 240 |
errorMsg += "<BR/>" + "Error while processing rowNumber : " + rowId;
|
- |
|
| 241 |
}
|
- |
|
| 242 |
return true;
|
243 |
return true;
|
| 243 |
}
|
244 |
}
|
| 244 |
return false;
|
245 |
return false;
|
| 245 |
}
|
246 |
}
|
| 246 |
|
247 |
|