Subversion Repositories SmartDukaan

Rev

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

Rev 5945 Rev 6318
Line 8... Line 8...
8
import in.shop2020.model.v1.order.LineItem;
8
import in.shop2020.model.v1.order.LineItem;
9
import in.shop2020.model.v1.order.Order;
9
import in.shop2020.model.v1.order.Order;
10
import in.shop2020.model.v1.order.TransactionServiceException;
10
import in.shop2020.model.v1.order.TransactionServiceException;
11
import in.shop2020.support.models.AwbDetails;
11
import in.shop2020.support.models.AwbDetails;
12
import in.shop2020.support.utils.FileUtils;
12
import in.shop2020.support.utils.FileUtils;
13
import in.shop2020.thrift.clients.CatalogClient;
-
 
14
import in.shop2020.thrift.clients.HelperClient;
13
import in.shop2020.thrift.clients.HelperClient;
15
import in.shop2020.thrift.clients.InventoryClient;
14
import in.shop2020.thrift.clients.InventoryClient;
16
import in.shop2020.thrift.clients.LogisticsClient;
15
import in.shop2020.thrift.clients.LogisticsClient;
17
import in.shop2020.thrift.clients.TransactionClient;
16
import in.shop2020.thrift.clients.TransactionClient;
18
import in.shop2020.utils.LogisticsUser;
17
import in.shop2020.utils.LogisticsUser;
Line 189... Line 188...
189
	            detailedAwb.setAwbNumber(awbNumber);
188
	            detailedAwb.setAwbNumber(awbNumber);
190
	            detailedAwb.setAccountCode(accountNo);
189
	            detailedAwb.setAccountCode(accountNo);
191
	            detailedAwb.setAddress1(order.getCustomer_address1());
190
	            detailedAwb.setAddress1(order.getCustomer_address1());
192
	            detailedAwb.setAddress2(order.getCustomer_address2());
191
	            detailedAwb.setAddress2(order.getCustomer_address2());
193
	            if(order.isLogisticsCod()){
192
	            if(order.isLogisticsCod()){
194
	                detailedAwb.setAmountToCollect("" + order.getTotal_amount());
193
	                detailedAwb.setAmountToCollect("" + (order.getTotal_amount()-order.getGvAmount()));
195
	            } else {
194
	            } else {
196
	                detailedAwb.setAmountToCollect("" + 0 );
195
	                detailedAwb.setAmountToCollect("" + 0 );
197
	            }
196
	            }
198
	            Date date = new Date(order.getPickup_timestamp());
197
	            Date date = new Date(order.getPickup_timestamp());
199
	            detailedAwb.setAwbDate(date.toString());
198
	            detailedAwb.setAwbDate(date.toString());
Line 212... Line 211...
212
	            detailedAwb.setPickupLocation(warehouse.getLocation());
211
	            detailedAwb.setPickupLocation(warehouse.getLocation());
213
	            detailedAwb.setPinCode(order.getCustomer_pincode());
212
	            detailedAwb.setPinCode(order.getCustomer_pincode());
214
	            LineItem lineitem = order.getLineitems().get(0);
213
	            LineItem lineitem = order.getLineitems().get(0);
215
	            detailedAwb.setProductName(lineitem.getBrand() + " " + lineitem.getModel_name() + " " 
214
	            detailedAwb.setProductName(lineitem.getBrand() + " " + lineitem.getModel_name() + " " 
216
	                                         + lineitem.getItem_number() + " " + lineitem.getColor());
215
	                                         + lineitem.getItem_number() + " " + lineitem.getColor());
217
	            detailedAwb.setShipmentValue("" + order.getTotal_amount());
216
	            detailedAwb.setShipmentValue("" + (order.getTotal_amount()-order.getGvAmount()));
218
	            detailedAwb.setState(order.getCustomer_state());
217
	            detailedAwb.setState(order.getCustomer_state());
219
	            
218
	            
220
	            tempList.add(detailedAwb);
219
	            tempList.add(detailedAwb);
221
 
220
 
222
	        } catch (TTransportException e) {
221
	        } catch (TTransportException e) {