| Line 220... |
Line 220... |
| 220 |
userOrder.put("invoiceno", order.getInvoice_number());
|
220 |
userOrder.put("invoiceno", order.getInvoice_number());
|
| 221 |
userOrder.put("receiver", order.getReceiver());
|
221 |
userOrder.put("receiver", order.getReceiver());
|
| 222 |
userOrder.put("status", order.getStatusDescription());
|
222 |
userOrder.put("status", order.getStatusDescription());
|
| 223 |
userOrder.put("trackingid", order.getTracking_id());
|
223 |
userOrder.put("trackingid", order.getTracking_id());
|
| 224 |
userOrder.put("promiseddelivery", sdf.format(new Date(order.getPromised_delivery_time())));
|
224 |
userOrder.put("promiseddelivery", sdf.format(new Date(order.getPromised_delivery_time())));
|
| - |
|
225 |
userOrder.put("expectedshipping", sdf.format(new Date(order.getExpected_shipping_time())));
|
| - |
|
226 |
userOrder.put("delayreason", order.getDelayReason() != null ? order.getDelayReason().name() : "");
|
| 225 |
userOrder.put("amount", Double.toString(order.getTotal_amount()));
|
227 |
userOrder.put("amount", Double.toString(order.getTotal_amount()));
|
| 226 |
userOrder.put("shipping", ModelUtils.extractAddressFromOrder(order));
|
228 |
userOrder.put("shipping", ModelUtils.extractAddressFromOrder(order));
|
| 227 |
}
|
229 |
}
|
| 228 |
|
230 |
|
| 229 |
public String getPaymentMethod(List<Attribute> paymentAttributes) {
|
231 |
public String getPaymentMethod(List<Attribute> paymentAttributes) {
|