Subversion Repositories SmartDukaan

Rev

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

Rev 8105 Rev 8106
Line 265... Line 265...
265
	private PdfPTable getDispatchAdviceTable(Order order, Warehouse warehouse, Provider provider, float barcodeFontSize, String destCode, boolean withBill, Warehouse shippingLocation){
265
	private PdfPTable getDispatchAdviceTable(Order order, Warehouse warehouse, Provider provider, float barcodeFontSize, String destCode, boolean withBill, Warehouse shippingLocation){
266
		Font barCodeFont = getBarCodeFont(provider, barcodeFontSize);
266
		Font barCodeFont = getBarCodeFont(provider, barcodeFontSize);
267
 
267
 
268
		PdfPTable table = new PdfPTable(1);
268
		PdfPTable table = new PdfPTable(1);
269
		table.getDefaultCell().setBorder(Rectangle.NO_BORDER);
269
		table.getDefaultCell().setBorder(Rectangle.NO_BORDER);
-
 
270
		
-
 
271
		PdfPTable titleBarTable = new PdfPTable(new float[]{0.4f, 0.4f, 0.2f});
270
 
272
		
271
		PdfPTable logoTable = new PdfPTable(2);
273
		PdfPTable logoTable = new PdfPTable(2);
272
		addLogoTable(logoTable,order); 
274
		addLogoTable(logoTable,order); 
273
		
275
		
274
		PdfPCell titleCell = getTitleCell();
276
		PdfPCell titleCell = getTitleCell();
275
		PdfPTable customerTable = getCustomerAddressTable(order, destCode, false, helvetica12, false);
277
		PdfPTable customerTable = getCustomerAddressTable(order, destCode, false, helvetica12, false);
Line 339... Line 341...
339
		PdfPTable addressAndNoteTable = new PdfPTable(new float[]{0.3f, 0.7f});
341
		PdfPTable addressAndNoteTable = new PdfPTable(new float[]{0.3f, 0.7f});
340
		addressAndNoteTable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
342
		addressAndNoteTable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
341
		addressAndNoteTable.addCell(addressCell);
343
		addressAndNoteTable.addCell(addressCell);
342
		addressAndNoteTable.addCell(chargesTable);
344
		addressAndNoteTable.addCell(chargesTable);
343
 
345
 
344
		table.addCell(logoTable);
346
		titleBarTable.addCell(logoTable);
-
 
347
		titleBarTable.addCell(titleCell);
-
 
348
		titleBarTable.addCell(" ");
-
 
349
		
345
		table.addCell(titleCell);
350
		table.addCell(titleBarTable);
346
		table.addCell(dispatchTable);
351
		table.addCell(dispatchTable);
347
		table.addCell(invoiceTable);
352
		table.addCell(invoiceTable);
348
		table.addCell(new Phrase("If undelivered, return to:", helvetica10));
353
		table.addCell(new Phrase("If undelivered, return to:", helvetica10));
349
		table.addCell(addressAndNoteTable);
354
		table.addCell(addressAndNoteTable);
350
		return table;
355
		return table;
Line 486... Line 491...
486
		if(order.getBilling_timestamp() == 0){
491
		if(order.getBilling_timestamp() == 0){
487
			awbDate = new Date();
492
			awbDate = new Date();
488
		}else{
493
		}else{
489
			awbDate = new Date(order.getBilling_timestamp());
494
			awbDate = new Date(order.getBilling_timestamp());
490
		}
495
		}
-
 
496
		if(order.getLogistics_provider_id()!=7L){
491
		providerInfoTable.addCell(new Phrase("AWB Date   : " + DateFormat.getDateInstance(DateFormat.MEDIUM).format(awbDate), helvetica8));
497
			providerInfoTable.addCell(new Phrase("AWB Date   : " + DateFormat.getDateInstance(DateFormat.MEDIUM).format(awbDate), helvetica8));
-
 
498
		}
492
		providerInfoTable.addCell(new Phrase("Weight         : " + order.getTotal_weight() + " Kg", helvetica8));
499
		providerInfoTable.addCell(new Phrase("Weight         : " + order.getTotal_weight() + " Kg", helvetica8));
493
		//Start:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
500
		//Start:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
494
		if(order.getLogistics_provider_id()==7L){
501
		if(order.getLogistics_provider_id()==7L){
495
			providerInfoTable.addCell(new Phrase("Bill T/C Sender      "+ "Bill D/T Sender", helvetica8));
502
			providerInfoTable.addCell(new Phrase("Bill T/C Sender      "+ "Bill D/T Sender", helvetica8));
496
		}
503
		}