Subversion Repositories SmartDukaan

Rev

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

Rev 8194 Rev 8225
Line 226... Line 226...
226 
				}
 226 
				}
227
227
228 
				PdfPTable dispatchAdviceTable = null;
 228 
				PdfPTable dispatchAdviceTable = null;
229 
				//TODO fix this logic
 229 
				//TODO fix this logic
230 
				if ((new Long(order.getSource()).intValue() == OrderSource.EBAY.getValue()) && (order.getLogistics_provider_id()>7)) {
 230 
				if ((new Long(order.getSource()).intValue() == OrderSource.EBAY.getValue()) && (order.getLogistics_provider_id()>7)) {
- 
 
 231 
					if(order.getWarehouse_id() == 7 || order.getWarehouse_id() == 5 || order.getWarehouse_id() == 9) {
- 
 
 232 
						dispatchAdviceTable = new PdfPTable(1);
- 
 
 233 
					} else {
231 
					EbayInvoiceGenerationService invoiceGenerationService = new EbayInvoiceGenerationService();
 234 
						EbayInvoiceGenerationService invoiceGenerationService = new EbayInvoiceGenerationService();
232 
					dispatchAdviceTable = invoiceGenerationService.getDispatchAdviceTable(orderId, warehouseId);
 235 
						dispatchAdviceTable = invoiceGenerationService.getDispatchAdviceTable(orderId, warehouseId);
- 
 
 236 
					}
233 
				} else {
 237 
				} else {
234
238
235 
					dispatchAdviceTable = getDispatchAdviceTable(order, warehouse, provider, barcodeFontSize, destCode, withBill, shippingLocation);
 239 
					dispatchAdviceTable = getDispatchAdviceTable(order, warehouse, provider, barcodeFontSize, destCode, withBill, shippingLocation);
236 
				}
 240 
				}
237 
				dispatchAdviceTable.setSpacingAfter(10.0f);
 241 
				dispatchAdviceTable.setSpacingAfter(10.0f);