Subversion Repositories SmartDukaan

Rev

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

Rev 8241 Rev 8252
Line 228... Line 228...
228
            t_order.setLineitems(Collections.singletonList(lineItem));            
228
            t_order.setLineitems(Collections.singletonList(lineItem));            
229
            t_order.setStatus(OrderStatus.PAYMENT_PENDING);
229
            t_order.setStatus(OrderStatus.PAYMENT_PENDING);
230
            t_order.setStatusDescription("Payment Pending");
230
            t_order.setStatusDescription("Payment Pending");
231
            t_order.setCreated_timestamp(new Date().getTime());
231
            t_order.setCreated_timestamp(new Date().getTime());
232
            try {
232
            try {
-
 
233
            	t_order.setPromised_shipping_time(row.getCell(SHIP_DATE_INDEX).getDateCellValue().getTime());
-
 
234
            	t_order.setExpected_shipping_time(row.getCell(SHIP_DATE_INDEX).getDateCellValue().getTime());
233
            	t_order.setPromised_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
235
            	/*t_order.setPromised_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
234
            	t_order.setExpected_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
236
            	t_order.setExpected_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());*/
235
            	Calendar time = Calendar.getInstance();
237
            	Calendar time = Calendar.getInstance();
236
            	time.setTimeInMillis(t_order.getExpected_shipping_time());
238
            	time.setTimeInMillis(t_order.getExpected_shipping_time());
237
            	time.add(Calendar.DAY_OF_MONTH, 3);
239
            	time.add(Calendar.DAY_OF_MONTH, 3);
238
            	t_order.setPromised_delivery_time(time.getTimeInMillis());
240
            	t_order.setPromised_delivery_time(time.getTimeInMillis());
239
            	t_order.setExpected_delivery_time(time.getTimeInMillis());
241
            	t_order.setExpected_delivery_time(time.getTimeInMillis());
Line 319... Line 321...
319
                
321
                
320
                EbayOrder ebayOrder = new EbayOrder();
322
                EbayOrder ebayOrder = new EbayOrder();
321
                ebayOrder.setEbayListingId(ebayItem.getEbayListingId());
323
                ebayOrder.setEbayListingId(ebayItem.getEbayListingId());
322
                ebayOrder.setSalesRecordNumber(new Double(row.getCell(SALES_RECORD_NUM_INDEX).getNumericCellValue()).longValue());
324
                ebayOrder.setSalesRecordNumber(new Double(row.getCell(SALES_RECORD_NUM_INDEX).getNumericCellValue()).longValue());
323
                try {
325
                try {
324
                	ebayOrder.setEbayTxnDate(sdf.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
326
//                	ebayOrder.setEbayTxnDate(sdf.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
-
 
327
                	ebayOrder.setEbayTxnDate(row.getCell(TRANSACTION_DATE_INDEX).getDateCellValue().getTime());
325
                } catch (Exception e) {
328
                } catch (Exception e) {
326
                	logger.error("Error in setting transaction date for Ebay Order with OrderId : " + order.getId());
329
                	logger.error("Error in setting transaction date for Ebay Order with OrderId : " + order.getId());
327
                }
330
                }
328
                ebayOrder.setOrderId(order.getId());
331
                ebayOrder.setOrderId(order.getId());
329
                ebayOrder.setPaisaPayId(paisaPayId);
332
                ebayOrder.setPaisaPayId(paisaPayId);