Subversion Repositories SmartDukaan

Rev

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

Rev 3196 Rev 3205
Line 54... Line 54...
54
54
55 
			for (in.shop2020.model.v1.order.Order t_order: t_orders){
 55 
			for (in.shop2020.model.v1.order.Order t_order: t_orders){
56 
				Order o = getOrderFromThriftOrder(t_order);
 56 
				Order o = getOrderFromThriftOrder(t_order);
57 
 
 57 
 
58 
				orders.add(o);
 58 
				orders.add(o);
- 
 
 59 
				//TODO: We'll figure out how to show an alert. I don't think we need another thrift call for that.
59 
				//check if it has an associated alert
 60 
				//check if it has an associated alert
60 
				List<Alert> alerts = c.getAlerts(t_order.getId(), true);
 61 
//				List<Alert> alerts = c.getAlerts(t_order.getId(), true);
61 
				if(alerts != null && alerts.size() != 0){
 62 
//				if(alerts != null && alerts.size() != 0){
62 
					o.setAlert(true);
 63 
//					o.setAlert(true);
63 
					o.setStatusMessage(alerts.iterator().next().getComment());
 64 
//					o.setStatusMessage(alerts.iterator().next().getComment());
64 
				} else {
 65 
//				} else {
65 
					o.setAlert(false);
 66 
//					o.setAlert(false);
66 
				}
 67 
//				}
67 
			}
 68 
			}
68 
		}catch(Exception e){
 69 
		}catch(Exception e){
69 
			e.printStackTrace();
 70 
			e.printStackTrace();
70 
		}
 71 
		}
71 
		return orders;
 72 
		return orders;