Subversion Repositories SmartDukaan

Rev

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

Rev 22701 Rev 23246
Line 14... Line 14...
14 
import in.shop2020.warehouse.InventoryItem;
 14 
import in.shop2020.warehouse.InventoryItem;
15 
 
 15 
 
16 
import java.io.File;
 16 
import java.io.File;
17 
import java.io.FileInputStream;
 17 
import java.io.FileInputStream;
18 
import java.util.ArrayList;
 18 
import java.util.ArrayList;
- 
 
 19 
import java.util.Arrays;
19 
import java.util.Date;
 20 
import java.util.Date;
20 
import java.util.HashMap;
 21 
import java.util.HashMap;
21 
import java.util.List;
 22 
import java.util.List;
22 
import java.util.Map;
 23 
import java.util.Map;
23 
import java.util.Set;
 24 
import java.util.Set;
Line 165... Line 166...
165 
			Set<Long> orderIdSet = itemNumbersMap.keySet();
 166 
			Set<Long> orderIdSet = itemNumbersMap.keySet();
166 
			List<Long> order_ids = new ArrayList<Long>();
 167 
			List<Long> order_ids = new ArrayList<Long>();
167 
			order_ids.addAll(orderIdSet);
 168 
			order_ids.addAll(orderIdSet);
168 
 
 169 
 
169 
			boolean status = client.addBillingDetailsForGrouppedOrders(order_ids, "", itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap , user, jacket_number, billing_type, false, invoice_type);
 170 
			boolean status = client.addBillingDetailsForGrouppedOrders(order_ids, "", itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap , user, jacket_number, billing_type, false, invoice_type);
- 
 
 171 
			// If provider is ECom Express then forward shipping request after billing
- 
 
 172 
			if(t_order.getLogistics_provider_id()==49) {
- 
 
 173 
				return "Order billed but could not forward request to provider";
- 
 
 174 
				try {
- 
 
 175 
					LogisticsClient lc = new LogisticsClient();
- 
 
 176 
					lc.getClient().pushCourierDetailsForEcomExpress(Arrays.asList(t_order.getLogisticsTransactionId()));
- 
 
 177 
				} catch (Exception e) {
- 
 
 178 
					logger.error("Error pushing courier details", e);
- 
 
 179 
				}
- 
 
 180 
			}
170 
 
 181 
 
171 
			if(!status)
 182 
			if(!status)
172 
				return "Couldn't add billing info on server";
 183 
				return "Couldn't add billing info on server";
173 
 
 184 
 
174 
			return "Billing Info added successfully";
 185 
			return "Billing Info added successfully";