Subversion Repositories SmartDukaan

Rev

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

Rev 8892 Rev 8925
Line 189... Line 189...
189 
		        	user.setIsAnonymous(false);
 189 
		        	user.setIsAnonymous(false);
190 
		        	user = userClient.createUser(user);
 190 
		        	user = userClient.createUser(user);
191 
		        }
 191 
		        }
192 
            } catch(Exception e) {
 192 
            } catch(Exception e) {
193 
	        	logger.error("Unable to establish connection to the User service for row number " + (rowId + 1), e);
 193 
	        	logger.error("Unable to establish connection to the User service for row number " + (rowId + 1), e);
194 
    	        addActionError("Unable to establish connection to the User servicefor row number " + (rowId + 1));
 194 
    	        addActionError("Unable to establish connection to the User service for row number " + (rowId + 1));
195 
    	        return "authsuccess";
 195 
    	        return "authsuccess";
196 
	        }
 196 
	        }
197 
            Transaction txn = new Transaction();
 197 
            Transaction txn = new Transaction();
198 
            txn.setShoppingCartid(user.getActiveCartId());
 198 
            txn.setShoppingCartid(user.getActiveCartId());
199 
            txn.setCustomer_id(user.getUserId());
 199 
            txn.setCustomer_id(user.getUserId());
Line 262... Line 262...
262 
            order.setStatus(OrderStatus.SUBMITTED_FOR_PROCESSING);
 262 
            order.setStatus(OrderStatus.SUBMITTED_FOR_PROCESSING);
263 
            order.setStatusDescription("In Process");
 263 
            order.setStatusDescription("In Process");
264 
            order.setCreated_timestamp(new Date().getTime());
 264 
            order.setCreated_timestamp(new Date().getTime());
265 
            order.setCod(false);
 265 
            order.setCod(false);
266 
            try {
 266 
            try {
267 
            	Date shippingDate = interchangeDateAndMonth(row.getCell(SHIP_DATE_INDEX).getDateCellValue());
 267 
            	//Date shippingDate = interchangeDateAndMonth(row.getCell(SHIP_DATE_INDEX).getDateCellValue());
- 
 
 268 
            	Date shippingDate = row.getCell(SHIP_DATE_INDEX).getDateCellValue();
268 
            	order.setPromised_shipping_time(shippingDate.getTime());
 269 
            	order.setPromised_shipping_time(shippingDate.getTime());
269 
            	order.setExpected_shipping_time(shippingDate.getTime());
 270 
            	order.setExpected_shipping_time(shippingDate.getTime());
270 
            	//order.setPromised_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
 271 
            	//order.setPromised_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
271 
            	//order.setExpected_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
 272 
            	//order.setExpected_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
272 
            	Calendar time = Calendar.getInstance();
 273 
            	Calendar time = Calendar.getInstance();
Line 338... Line 339...
338 
            	}
 339 
            	}
339 
            	try {
340 
            	try {
340 
	            	LogisticsService.Client logisticsClient = new LogisticsClient().getClient();
 341 
	            	LogisticsService.Client logisticsClient = new LogisticsClient().getClient();
341 
	            	LogisticsInfo logisticsInfo = logisticsClient.getLogisticsInfo(order.getCustomer_pincode(),
342 
	            	LogisticsInfo logisticsInfo = logisticsClient.getLogisticsInfo(order.getCustomer_pincode(),
342 
	            			new Double(order.getLineitems().get(0).getItem_id()).longValue(), DeliveryType.PREPAID, PickUpType.COURIER);
 343 
	            			new Double(order.getLineitems().get(0).getItem_id()).longValue(), DeliveryType.PREPAID, PickUpType.COURIER);
- 
 
 344 
	            	if(logisticsInfo.getProviderId()<7) {
- 
 
 345 
	            		String airwaybillNo= logisticsClient.getEmptyAWB(logisticsInfo.getProviderId(), DeliveryType.PREPAID);
- 
 
 346 
	            		order.setAirwaybill_no(airwaybillNo);
- 
 
 347 
		            	order.setTracking_id(airwaybillNo);
- 
 
 348 
	            	}
343 
	            	order.setLogistics_provider_id(logisticsInfo.getProviderId());
 349 
	            	order.setLogistics_provider_id(logisticsInfo.getProviderId());
344 
            	} catch (Exception e) {
 350 
            	} catch (Exception e) {
345 
            		logger.error("Error while setting logistics provider for order for rowId " + rowId, e);
 351 
            		logger.error("Error while setting logistics provider for order for rowId " + rowId, e);
346 
                    addActionError("Error while setting logistics provider for order for rowId " + rowId);
 352 
                    addActionError("Error while setting logistics provider for order for rowId " + rowId);
347 
                    setErrorMsg(getErrorMsg() + "<br>Error while setting logistics provider for order for rowId " + rowId);
 353 
                    setErrorMsg(getErrorMsg() + "<br>Error while setting logistics provider for order for rowId " + rowId);
Line 374... Line 380...
374 
                ebayOrder.setEbayListingId(ebayItem.getEbayListingId());
 380 
                ebayOrder.setEbayListingId(ebayItem.getEbayListingId());
375 
                ebayOrder.setSalesRecordNumber(new Double(row.getCell(SALES_RECORD_NUM_INDEX).getNumericCellValue()).longValue());
 381 
                ebayOrder.setSalesRecordNumber(new Double(row.getCell(SALES_RECORD_NUM_INDEX).getNumericCellValue()).longValue());
376 
                row.getCell(TRANSACTION_ID_INDEX).setCellType(Cell.CELL_TYPE_STRING);
 382 
                row.getCell(TRANSACTION_ID_INDEX).setCellType(Cell.CELL_TYPE_STRING);
377 
                ebayOrder.setTransactionId(row.getCell(TRANSACTION_ID_INDEX).getStringCellValue());
 383 
                ebayOrder.setTransactionId(row.getCell(TRANSACTION_ID_INDEX).getStringCellValue());
378 
                try {
 384 
                try {
379 
                	Date ebayTransactionDate = interchangeDateAndMonth(row.getCell(TRANSACTION_DATE_INDEX).getDateCellValue());
 385 
                	//Date ebayTransactionDate = interchangeDateAndMonth(row.getCell(TRANSACTION_DATE_INDEX).getDateCellValue());
- 
 
 386 
                	Date ebayTransactionDate = row.getCell(TRANSACTION_DATE_INDEX).getDateCellValue();
380 
                	ebayOrder.setEbayTxnDate(ebayTransactionDate.getTime());
 387 
                	ebayOrder.setEbayTxnDate(ebayTransactionDate.getTime());
381 
                	//ebayOrder.setEbayTxnDate(sdf2.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
 388 
                	//ebayOrder.setEbayTxnDate(sdf2.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
382 
                	//ebayOrder.setEbayTxnDate(sdf.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
 389 
                	//ebayOrder.setEbayTxnDate(sdf.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
383 
                } catch (Exception e) {
 390 
                } catch (Exception e) {
384 
                	logger.error("Error in setting transaction date for Ebay Order with OrderId : " + order.getId());
 391 
                	logger.error("Error in setting transaction date for Ebay Order with OrderId : " + order.getId());
Line 399... Line 406...
399
406
400 
        checkForErrors();
 407 
        checkForErrors();
401 
        return "authsuccess";
 408 
        return "authsuccess";
402 
    }
 409 
    }
403
410
404 
    private Date interchangeDateAndMonth(Date date) {
 411 
    /*private Date interchangeDateAndMonth(Date date) {
405 
		Date updatedDate = new Date(date.getTime());
 412 
		Date updatedDate = new Date(date.getTime());
406 
		updatedDate.setDate(date.getMonth() + 1);
 413 
		updatedDate.setDate(date.getMonth() + 1);
407 
		updatedDate.setMonth(date.getDate() - 1);
 414 
		updatedDate.setMonth(date.getDate() - 1);
408 
		return updatedDate;
 415 
		return updatedDate;
409 
	}
 416 
	}*/
410
417
411 
    private LineItem createLineItem(long itemId, long quantity, double amount) throws CatalogServiceException, TException {
 418 
    private LineItem createLineItem(long itemId, long quantity, double amount) throws CatalogServiceException, TException {
412 
    	LineItem lineItem = new LineItem();
 419 
    	LineItem lineItem = new LineItem();
413 
    	CatalogService.Client catalogClient = new CatalogClient().getClient();
 420 
    	CatalogService.Client catalogClient = new CatalogClient().getClient();
414 
    	Item item = catalogClient.getItem(itemId);
 421 
    	Item item = catalogClient.getItem(itemId);