Subversion Repositories SmartDukaan

Rev

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

Rev 8252 Rev 8281
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());
233
            	Date shippingDate = interchangeDateAndMonth(row.getCell(SHIP_DATE_INDEX).getDateCellValue());
-
 
234
            	t_order.setPromised_shipping_time(shippingDate.getTime());
234
            	t_order.setExpected_shipping_time(row.getCell(SHIP_DATE_INDEX).getDateCellValue().getTime());
235
            	t_order.setExpected_shipping_time(shippingDate.getTime());
235
            	/*t_order.setPromised_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
236
            	/*t_order.setPromised_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());*/
237
            	t_order.setExpected_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());*/
237
            	Calendar time = Calendar.getInstance();
238
            	Calendar time = Calendar.getInstance();
238
            	time.setTimeInMillis(t_order.getExpected_shipping_time());
239
            	time.setTimeInMillis(t_order.getExpected_shipping_time());
239
            	time.add(Calendar.DAY_OF_MONTH, 3);
240
            	time.add(Calendar.DAY_OF_MONTH, 3);
Line 322... Line 323...
322
                EbayOrder ebayOrder = new EbayOrder();
323
                EbayOrder ebayOrder = new EbayOrder();
323
                ebayOrder.setEbayListingId(ebayItem.getEbayListingId());
324
                ebayOrder.setEbayListingId(ebayItem.getEbayListingId());
324
                ebayOrder.setSalesRecordNumber(new Double(row.getCell(SALES_RECORD_NUM_INDEX).getNumericCellValue()).longValue());
325
                ebayOrder.setSalesRecordNumber(new Double(row.getCell(SALES_RECORD_NUM_INDEX).getNumericCellValue()).longValue());
325
                try {
326
                try {
326
//                	ebayOrder.setEbayTxnDate(sdf.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
327
//                	ebayOrder.setEbayTxnDate(sdf.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
327
                	ebayOrder.setEbayTxnDate(row.getCell(TRANSACTION_DATE_INDEX).getDateCellValue().getTime());
328
                	Date ebayTransactionDate = interchangeDateAndMonth(row.getCell(TRANSACTION_DATE_INDEX).getDateCellValue());
-
 
329
                	ebayOrder.setEbayTxnDate(ebayTransactionDate.getTime());
328
                } catch (Exception e) {
330
                } catch (Exception e) {
329
                	logger.error("Error in setting transaction date for Ebay Order with OrderId : " + order.getId());
331
                	logger.error("Error in setting transaction date for Ebay Order with OrderId : " + order.getId());
330
                }
332
                }
331
                ebayOrder.setOrderId(order.getId());
333
                ebayOrder.setOrderId(order.getId());
332
                ebayOrder.setPaisaPayId(paisaPayId);
334
                ebayOrder.setPaisaPayId(paisaPayId);
Line 343... Line 345...
343
        
345
        
344
        checkForErrors();
346
        checkForErrors();
345
        return "authsuccess";
347
        return "authsuccess";
346
    }
348
    }
347
    
349
    
-
 
350
    private Date interchangeDateAndMonth(Date date) {
-
 
351
		Date updatedDate = new Date(date.getTime());
-
 
352
		updatedDate.setDate(date.getMonth());
-
 
353
		updatedDate.setMonth(date.getDate());
-
 
354
		return updatedDate;
-
 
355
	}
-
 
356
 
348
    private LineItem createLineItem(long itemId, long quantity, double amount) throws CatalogServiceException, TException {
357
	private LineItem createLineItem(long itemId, long quantity, double amount) throws CatalogServiceException, TException {
349
    	LineItem lineItem = new LineItem();
358
    	LineItem lineItem = new LineItem();
350
    	CatalogService.Client catalogClient = new CatalogClient().getClient();
359
    	CatalogService.Client catalogClient = new CatalogClient().getClient();
351
    	Item item = catalogClient.getItem(itemId);
360
    	Item item = catalogClient.getItem(itemId);
352
    	
361
    	
353
    	lineItem.setProductGroup(item.getProductGroup());
362
    	lineItem.setProductGroup(item.getProductGroup());