Subversion Repositories SmartDukaan

Rev

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

Rev 3578 Rev 3996
Line 166... Line 166...
166
    private void setLineItems(List<LineItem> lineitems) {
166
    private void setLineItems(List<LineItem> lineitems) {
167
        lineItemsList = new ArrayList<Map<String, String>>();
167
        lineItemsList = new ArrayList<Map<String, String>>();
168
        for (LineItem lItem : lineitems) {
168
        for (LineItem lItem : lineitems) {
169
            Map<String, String> lineItemMap = new HashMap<String, String>();
169
            Map<String, String> lineItemMap = new HashMap<String, String>();
170
            lineItemMap.put("name",
170
            lineItemMap.put("name",
171
                    ModelUtils.extractProductNameFromLineItem(lItem));
171
                    ModelUtils.extractProductNameFromLineItem(lItem) + " " + lItem.getColor());
172
            lineItemMap.put("quantity", Double.toString(lItem.getQuantity()));
172
            lineItemMap.put("quantity", Double.toString(lItem.getQuantity()));
173
            lineItemMap.put("unit_price",
173
            lineItemMap.put("unit_price",
174
                    Double.toString(lItem.getUnit_price()));
174
                    Double.toString(lItem.getUnit_price()));
175
            lineItemMap.put("total_price",
175
            lineItemMap.put("total_price",
176
                    Double.toString(lItem.getTotal_price()));
176
                    Double.toString(lItem.getTotal_price()));
Line 211... Line 211...
211
        }
211
        }
212
        if (order.getOutofstock_timestamp() != 0) {
212
        if (order.getOutofstock_timestamp() != 0) {
213
            userOrder.put("outofstockts",
213
            userOrder.put("outofstockts",
214
                    sdf.format(new Date(order.getOutofstock_timestamp())));
214
                    sdf.format(new Date(order.getOutofstock_timestamp())));
215
        }
215
        }
-
 
216
        
216
        userOrder.put("serialno", Long.toString(order.getSerialNo()));
217
        userOrder.put("serialno", Long.toString(order.getSerialNo()));
217
        userOrder.put("airwaybillno", order.getAirwaybill_no());
218
        userOrder.put("airwaybillno", order.getAirwaybill_no());
218
        userOrder.put("billedby", order.getBilled_by());
219
        userOrder.put("billedby", order.getBilled_by());
219
        userOrder.put("invoiceno", order.getInvoice_number());
220
        userOrder.put("invoiceno", order.getInvoice_number());
220
        userOrder.put("receiver", order.getReceiver());
221
        userOrder.put("receiver", order.getReceiver());
221
        userOrder.put("status", order.getStatusDescription());
222
        userOrder.put("status", order.getStatusDescription());
222
        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())));
223
        userOrder.put("amount", Double.toString(order.getTotal_amount()));
225
        userOrder.put("amount", Double.toString(order.getTotal_amount()));
224
        userOrder.put("shipping", ModelUtils.extractAddressFromOrder(order));
226
        userOrder.put("shipping", ModelUtils.extractAddressFromOrder(order));
225
    }
227
    }
226
 
228
 
227
    public String getPaymentMethod(List<Attribute> paymentAttributes) {
229
    public String getPaymentMethod(List<Attribute> paymentAttributes) {