Subversion Repositories SmartDukaan

Rev

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

Rev 8304 Rev 13146
Line 120... Line 120...
120
			PdfPTable ordersTable = null;
120
			PdfPTable ordersTable = null;
121
			ordersTable = new PdfPTable(8);
121
			ordersTable = new PdfPTable(8);
122
			if (providerId > 7 && providerId <12) {
122
			if (providerId > 7 && providerId <12) {
123
				ordersTable = new PdfPTable(10);
123
				ordersTable = new PdfPTable(10);
124
			}
124
			}
-
 
125
			if(provider.isGroupShipmentAllowed()){
-
 
126
				ordersTable = new PdfPTable(9);
-
 
127
			}
125
			ordersTable.addCell(new Phrase("Sl No", helvetica8));
128
			ordersTable.addCell(new Phrase("Sl No", helvetica8));
-
 
129
			if(provider.isGroupShipmentAllowed()){
-
 
130
				ordersTable.addCell(new Phrase("Master Order Id", helvetica8));
-
 
131
			}
126
			ordersTable.addCell(new Phrase("Order No", helvetica8));
132
			ordersTable.addCell(new Phrase("Order No", helvetica8));
127
			ordersTable.addCell(new Phrase("AWB No", helvetica8));
133
			ordersTable.addCell(new Phrase("AWB No", helvetica8));
128
			ordersTable.addCell(new Phrase("Packet Wt.", helvetica8));
134
			ordersTable.addCell(new Phrase("Packet Wt.", helvetica8));
129
			
135
			
130
			//if Logistics is Ebay Power Ship add extra fields like Sales Record Number and PaisaPayId
136
			//if Logistics is Ebay Power Ship add extra fields like Sales Record Number and PaisaPayId
Line 160... Line 166...
160
				double weight = 0;
166
				double weight = 0;
161
				for(LineItem lineItem: lineItems)
167
				for(LineItem lineItem: lineItems)
162
					weight += lineItem.getTotal_weight();
168
					weight += lineItem.getTotal_weight();
163
				
169
				
164
				ordersTable.addCell(new Phrase(serialNo + "", helvetica8));
170
				ordersTable.addCell(new Phrase(serialNo + "", helvetica8));
-
 
171
				if(provider.isGroupShipmentAllowed()){
-
 
172
					ordersTable.addCell(new Phrase(order.getLogisticsTransactionId(), helvetica8));
-
 
173
				}
165
				ordersTable.addCell(new Phrase(order.getId() + "", helvetica8));
174
				ordersTable.addCell(new Phrase(order.getId() + "", helvetica8));
166
				ordersTable.addCell(new Phrase(order.getAirwaybill_no(), helvetica8));
175
				ordersTable.addCell(new Phrase(order.getAirwaybill_no(), helvetica8));
167
				ordersTable.addCell(new Phrase(weightFormat.format(weight), helvetica8));
176
				ordersTable.addCell(new Phrase(weightFormat.format(weight), helvetica8));
168
				
177
				
169
				//if Logistics is Ebay Power Ship add extra fields like Sales Record Number and PaisaPayId
178
				//if Logistics is Ebay Power Ship add extra fields like Sales Record Number and PaisaPayId