Subversion Repositories SmartDukaan

Rev

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

Rev 22695 Rev 22729
Line 788... Line 788...
788
				long currentTime = date.getTime();
788
				long currentTime = date.getTime();
789
				try{
789
				try{
790
					currentDateTime = newSdf.parse(newSdf.format(date)).getTime();
790
					currentDateTime = newSdf.parse(newSdf.format(date)).getTime();
791
					promisedShippingTime = newSdf.parse(newSdf.format(new Date(order.getPromisedShippingTime()))).getTime();
791
					promisedShippingTime = newSdf.parse(newSdf.format(new Date(order.getPromisedShippingTime()))).getTime();
792
				}catch(Exception e){
792
				}catch(Exception e){
-
 
793
					logger.error("Error formatting date for order" + order.getOrderId());
-
 
794
					logger.error("Error formatting date " + date.getTime());
-
 
795
					logger.error("Error formatting date " + order.getPromisedShippingTime());
793
					e.printStackTrace();
796
					e.printStackTrace();
794
				}
797
				}
795
				if(promisedShippingTime >0 && (order.getStatus()==3 || order.getStatus()==5 || order.getStatus()==41 ||
798
				if(promisedShippingTime >0 && (order.getStatus()==3 || order.getStatus()==5 || order.getStatus()==41 ||
796
						order.getStatus()==35 || order.getStatus()==36 || order.getStatus()==37)){
799
						order.getStatus()==35 || order.getStatus()==36 || order.getStatus()==37)){
797
					if(promisedShippingTime <= currentDateTime){
800
					if(promisedShippingTime <= currentDateTime){