Subversion Repositories SmartDukaan

Rev

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

Rev 22588 Rev 22589
Line 128... Line 128...
128 
				String airway_billno = null;
 128 
				String airway_billno = null;
129 
				if(live.equals("true")) {
 129 
				if(live.equals("true")) {
130 
					try{
 130 
					try{
131 
						//If aramaex then
 131 
						//If aramaex then
132 
						if (t_order.getLogistics_provider_id()==2){
 132 
						if (t_order.getLogistics_provider_id()==2){
133 
							List<in.shop2020.model.v1.order.Order> orders = client.getGroupOrdersByLogisticsTxnId(t_order.getLogisticsTransactionId());
 - 
 
134 
							Provider logisticsProvider = ProviderFactory.getProvider((int)orders.get(0).getLogistics_provider_id());
 133 
							Provider logisticsProvider = ProviderFactory.getProvider((int)orders_list.get(0).getLogistics_provider_id());
135 
							airway_billno = logisticsProvider.getAirwayBillNo(orders);
 134 
							airway_billno = logisticsProvider.getAirwayBillNo(orders_list);
136 
						}
 135 
						}
137 
						else{
 136 
						else{
138 
							LogisticsClient lc = new LogisticsClient();
 137 
							LogisticsClient lc = new LogisticsClient();
139 
							airway_billno = lc.getClient().getEmptyAWB(t_order.getLogistics_provider_id(), t_order.getLogisticsTransactionId());
 138 
							airway_billno = lc.getClient().getEmptyAWB(t_order.getLogistics_provider_id(), t_order.getLogisticsTransactionId());
140 
						}
 139 
						}
Line 147... Line 146...
147 
						return "Unable to assign airway bill number";
 146 
						return "Unable to assign airway bill number";
148 
					}
 147 
					}
149 
				} else {
 148 
				} else {
150 
					airway_billno = String.valueOf(new Date().getTime());
 149 
					airway_billno = String.valueOf(new Date().getTime());
151 
				}
 150 
				}
- 
 
 151 
				client.updateMasterOrderAWB(t_order.getLogisticsTransactionId(), airway_billno);
152 
			}
 152 
			}
153 
 
 153 
 
154 
 
 154 
 
155 
			if((billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL) && t_order.getStatus().getValue() >= OrderStatus.BILLED.getValue()){
 155 
			if((billingType == BillingType.OURS || billingType == BillingType.OURS_EXTERNAL) && t_order.getStatus().getValue() >= OrderStatus.BILLED.getValue()){
156 
				return "Already Billed";
 156 
				return "Already Billed";