Subversion Repositories SmartDukaan

Rev

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

Rev 8892 Rev 8925
Line 238... Line 238...
238 
	            t_order.setStatus(OrderStatus.PAYMENT_PENDING);
 238 
	            t_order.setStatus(OrderStatus.PAYMENT_PENDING);
239 
	            t_order.setStatusDescription("Payment Pending");
 239 
	            t_order.setStatusDescription("Payment Pending");
240 
	            t_order.setCreated_timestamp(new Date().getTime());
 240 
	            t_order.setCreated_timestamp(new Date().getTime());
241 
	            t_order.setCod(false);
 241 
	            t_order.setCod(false);
242 
	            try {
 242 
	            try {
243 
	            	Date shippingDate = interchangeDateAndMonth(row.getCell(SHIP_DATE_INDEX).getDateCellValue());
 243 
	            	//Date shippingDate = interchangeDateAndMonth(row.getCell(SHIP_DATE_INDEX).getDateCellValue());
- 
 
 244 
	            	Date shippingDate = row.getCell(SHIP_DATE_INDEX).getDateCellValue();
244 
	            	t_order.setPromised_shipping_time(shippingDate.getTime());
 245 
	            	t_order.setPromised_shipping_time(shippingDate.getTime());
245 
	            	t_order.setExpected_shipping_time(shippingDate.getTime());
 246 
	            	t_order.setExpected_shipping_time(shippingDate.getTime());
246 
	            	/*t_order.setPromised_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
 247 
	            	/*t_order.setPromised_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
247 
	            	t_order.setExpected_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());*/
 248 
	            	t_order.setExpected_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());*/
248 
	            	Calendar time = Calendar.getInstance();
 249 
	            	Calendar time = Calendar.getInstance();
Line 349... Line 350...
349
350
350 
	                EbayOrder ebayOrder = new EbayOrder();
 351 
	                EbayOrder ebayOrder = new EbayOrder();
351 
	                ebayOrder.setEbayListingId(ebayItem.getEbayListingId());
 352 
	                ebayOrder.setEbayListingId(ebayItem.getEbayListingId());
352 
	                ebayOrder.setSalesRecordNumber(new Double(row.getCell(SALES_RECORD_NUM_INDEX).getNumericCellValue()).longValue());
 353 
	                ebayOrder.setSalesRecordNumber(new Double(row.getCell(SALES_RECORD_NUM_INDEX).getNumericCellValue()).longValue());
353 
	                try {
 354 
	                try {
354 
	                	Date ebayTransactionDate = interchangeDateAndMonth(row.getCell(TRANSACTION_DATE_INDEX).getDateCellValue());
 355 
	                	//Date ebayTransactionDate = interchangeDateAndMonth(row.getCell(TRANSACTION_DATE_INDEX).getDateCellValue());
- 
 
 356 
	                	Date ebayTransactionDate = row.getCell(TRANSACTION_DATE_INDEX).getDateCellValue();
355 
	                	ebayOrder.setEbayTxnDate(ebayTransactionDate.getTime());
 357 
	                	ebayOrder.setEbayTxnDate(ebayTransactionDate.getTime());
356 
	                } catch (Exception e) {
 358 
	                } catch (Exception e) {
357 
	                	logger.error("Error in setting transaction date for Ebay Order with OrderId : " + order.getId());
 359 
	                	logger.error("Error in setting transaction date for Ebay Order with OrderId : " + order.getId());
358 
	                }
 360 
	                }
359 
	                ebayOrder.setOrderId(order.getId());
 361 
	                ebayOrder.setOrderId(order.getId());
Line 377... Line 379...
377
379
378 
        checkForErrors();
 380 
        checkForErrors();
379 
        return "authsuccess";
 381 
        return "authsuccess";
380 
    }
 382 
    }
381
383
382 
    private Date interchangeDateAndMonth(Date date) {
 384 
    /*private Date interchangeDateAndMonth(Date date) {
383 
		Date updatedDate = new Date(date.getTime());
 385 
		Date updatedDate = new Date(date.getTime());
384 
		updatedDate.setDate(date.getMonth() + 1);
 386 
		updatedDate.setDate(date.getMonth() + 1);
385 
		updatedDate.setMonth(date.getDate() - 1);
 387 
		updatedDate.setMonth(date.getDate() - 1);
386 
		return updatedDate;
 388 
		return updatedDate;
387 
	}
 389 
	}*/
388 
 
 390 
 
389 
	private LineItem createLineItem(long itemId, long quantity, double amount) throws CatalogServiceException, TException {
 391 
	private LineItem createLineItem(long itemId, long quantity, double amount) throws CatalogServiceException, TException {
390 
    	LineItem lineItem = new LineItem();
 392 
    	LineItem lineItem = new LineItem();
391 
    	CatalogService.Client catalogClient = new CatalogClient().getClient();
 393 
    	CatalogService.Client catalogClient = new CatalogClient().getClient();
392 
    	Item item = catalogClient.getItem(itemId);
 394 
    	Item item = catalogClient.getItem(itemId);