Subversion Repositories SmartDukaan

Rev

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

Rev 4034 Rev 4105
Line 221... Line 221...
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())));
225
        userOrder.put("expectedshipping", sdf.format(new Date(order.getExpected_shipping_time())));
-
 
226
        userOrder.put("promisedshipping", sdf.format(new Date(order.getPromised_shipping_time())));
226
        userOrder.put("delayreason", order.getDelayReason() != null ? order.getDelayReason().name() : "");
227
        userOrder.put("delayreason", order.getDelayReason() != null ? order.getDelayReason().name() : "");
227
        userOrder.put("amount", Double.toString(order.getTotal_amount()));
228
        userOrder.put("amount", Double.toString(order.getTotal_amount()));
228
        userOrder.put("shipping", ModelUtils.extractAddressFromOrder(order));
229
        userOrder.put("shipping", ModelUtils.extractAddressFromOrder(order));
229
    }
230
    }
230
 
231