| Line 198... |
Line 198... |
| 198 |
}
|
198 |
}
|
| 199 |
}
|
199 |
}
|
| 200 |
List<Attribute> newAttributes = new ArrayList<Attribute>();
|
200 |
List<Attribute> newAttributes = new ArrayList<Attribute>();
|
| 201 |
if(order.isCod()){
|
201 |
if(order.isCod()){
|
| 202 |
double amount = Double.parseDouble(request.getParameter("amount"));
|
202 |
double amount = Double.parseDouble(request.getParameter("amount"));
|
| 203 |
if(order.getTotal_amount() != amount){
|
203 |
if(order.getTotal_amount()-order.getGvAmount() != amount){
|
| 204 |
error = "<br>Amount does not match";
|
204 |
error = "<br>Amount does not match";
|
| 205 |
}
|
205 |
}
|
| 206 |
}
|
206 |
}
|
| 207 |
if(!error.equalsIgnoreCase("")){
|
207 |
if(!error.equalsIgnoreCase("")){
|
| 208 |
setId("deliver");
|
208 |
setId("deliver");
|
| Line 327... |
Line 327... |
| 327 |
contentRow.createCell(0).setCellValue(collectionSerialNo-1);
|
327 |
contentRow.createCell(0).setCellValue(collectionSerialNo-1);
|
| 328 |
contentRow.createCell(1).setCellValue(order.getId());
|
328 |
contentRow.createCell(1).setCellValue(order.getId());
|
| 329 |
contentRow.createCell(2).setCellValue(productName);
|
329 |
contentRow.createCell(2).setCellValue(productName);
|
| 330 |
contentRow.createCell(3).setCellValue(order.isCod() ? "COD" : "Prepaid");
|
330 |
contentRow.createCell(3).setCellValue(order.isCod() ? "COD" : "Prepaid");
|
| 331 |
contentRow.createCell(4).setCellValue(formatter.format(order.getDelivery_timestamp()));
|
331 |
contentRow.createCell(4).setCellValue(formatter.format(order.getDelivery_timestamp()));
|
| 332 |
contentRow.createCell(5).setCellValue(order.getTotal_amount());
|
332 |
contentRow.createCell(5).setCellValue(order.getTotal_amount()-order.getGvAmount());
|
| 333 |
contentRow.createCell(6).setCellValue(order.isCod() ? order.getTotal_amount() : 0.0);
|
333 |
contentRow.createCell(6).setCellValue(order.isCod() ? order.getTotal_amount() : 0.0);
|
| 334 |
contentRow.createCell(7).setCellValue(order.isCod() ? .01 * order.getTotal_amount() : .005 * order.getTotal_amount());
|
334 |
contentRow.createCell(7).setCellValue(order.isCod() ? .01 * order.getTotal_amount() : .005 * order.getTotal_amount());
|
| 335 |
}
|
335 |
}
|
| 336 |
|
336 |
|
| 337 |
try {
|
337 |
try {
|