Subversion Repositories SmartDukaan

Rev

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

Rev 5945 Rev 8256
Line 4... Line 4...
4
import in.shop2020.logistics.PickUpType;
4
import in.shop2020.logistics.PickUpType;
5
import in.shop2020.logistics.PickupStore;
5
import in.shop2020.logistics.PickupStore;
6
import in.shop2020.logistics.Provider;
6
import in.shop2020.logistics.Provider;
7
import in.shop2020.model.v1.inventory.InventoryServiceException;
7
import in.shop2020.model.v1.inventory.InventoryServiceException;
8
import in.shop2020.model.v1.inventory.Warehouse;
8
import in.shop2020.model.v1.inventory.Warehouse;
-
 
9
import in.shop2020.model.v1.order.EbayOrder;
9
import in.shop2020.model.v1.order.LineItem;
10
import in.shop2020.model.v1.order.LineItem;
10
import in.shop2020.model.v1.order.Order;
11
import in.shop2020.model.v1.order.Order;
11
import in.shop2020.model.v1.order.OrderStatus;
12
import in.shop2020.model.v1.order.OrderStatus;
12
import in.shop2020.model.v1.order.TransactionServiceException;
13
import in.shop2020.model.v1.order.TransactionServiceException;
13
import in.shop2020.thrift.clients.InventoryClient;
14
import in.shop2020.thrift.clients.InventoryClient;
Line 119... Line 120...
119
			PdfPTable ordersTable = new PdfPTable(8);
120
			PdfPTable ordersTable = new PdfPTable(8);
120
			ordersTable.addCell(new Phrase("Sl No", helvetica8));
121
			ordersTable.addCell(new Phrase("Sl No", helvetica8));
121
			ordersTable.addCell(new Phrase("Order No", helvetica8));
122
			ordersTable.addCell(new Phrase("Order No", helvetica8));
122
			ordersTable.addCell(new Phrase("AWB No", helvetica8));
123
			ordersTable.addCell(new Phrase("AWB No", helvetica8));
123
			ordersTable.addCell(new Phrase("Packet Wt.", helvetica8));
124
			ordersTable.addCell(new Phrase("Packet Wt.", helvetica8));
-
 
125
			
-
 
126
			//if Logistics is Ebay Power Ship add extra fields like Sales Record Number and PaisaPayId
-
 
127
			if(providerId > 7 && providerId <12) {
-
 
128
				ordersTable.addCell(new Phrase("PaisaPayId", helvetica8));
-
 
129
				ordersTable.addCell(new Phrase("Sales Rec No.", helvetica8));
-
 
130
			}
-
 
131
			
124
			if(runner == null){
132
			if(runner == null){
125
				ordersTable.addCell(new Phrase("Name", helvetica8));
133
				ordersTable.addCell(new Phrase("Name", helvetica8));
126
				ordersTable.addCell(new Phrase("Destination City", helvetica8));
134
				ordersTable.addCell(new Phrase("Destination City", helvetica8));
127
				ordersTable.addCell(new Phrase("Pincode", helvetica8));
135
				ordersTable.addCell(new Phrase("Pincode", helvetica8));
128
				ordersTable.addCell(new Phrase("State", helvetica8));
136
				ordersTable.addCell(new Phrase("State", helvetica8));
Line 151... Line 159...
151
				
159
				
152
				ordersTable.addCell(new Phrase(serialNo + "", helvetica8));
160
				ordersTable.addCell(new Phrase(serialNo + "", helvetica8));
153
				ordersTable.addCell(new Phrase(order.getId() + "", helvetica8));
161
				ordersTable.addCell(new Phrase(order.getId() + "", helvetica8));
154
				ordersTable.addCell(new Phrase(order.getAirwaybill_no(), helvetica8));
162
				ordersTable.addCell(new Phrase(order.getAirwaybill_no(), helvetica8));
155
				ordersTable.addCell(new Phrase(weightFormat.format(weight), helvetica8));
163
				ordersTable.addCell(new Phrase(weightFormat.format(weight), helvetica8));
-
 
164
				
-
 
165
				//if Logistics is Ebay Power Ship add extra fields like Sales Record Number and PaisaPayId
-
 
166
				if(providerId > 7 && providerId <12) {
-
 
167
					try {
-
 
168
						EbayOrder ebayOrder = txnClient.getEbayOrderByOrderId(order.getId());
-
 
169
						ordersTable.addCell(new Phrase(ebayOrder.getPaisaPayId(), helvetica8));
-
 
170
						ordersTable.addCell(new Phrase(new Long(ebayOrder.getSalesRecordNumber()).toString(), helvetica8));
-
 
171
					} catch (Exception e) {
-
 
172
						logger.error("Error getting Ebay Order for OrderId : " + order.getId(), e);
-
 
173
						return baosPDF;
-
 
174
					}
-
 
175
				}
-
 
176
				
156
				if(runner == null){
177
				if(runner == null){
157
					ordersTable.addCell(new Phrase(order.getCustomer_name(), helvetica8));
178
					ordersTable.addCell(new Phrase(order.getCustomer_name(), helvetica8));
158
					ordersTable.addCell(new Phrase(order.getCustomer_city(), helvetica8));
179
					ordersTable.addCell(new Phrase(order.getCustomer_city(), helvetica8));
159
					ordersTable.addCell(new Phrase(order.getCustomer_pincode(), helvetica8));
180
					ordersTable.addCell(new Phrase(order.getCustomer_pincode(), helvetica8));
160
					ordersTable.addCell(new Phrase(order.getCustomer_state(), helvetica8));
181
					ordersTable.addCell(new Phrase(order.getCustomer_state(), helvetica8));