Subversion Repositories SmartDukaan

Rev

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

Rev 8039 Rev 8040
Line 297... Line 297...
297
				}
297
				}
298
				PdfPCell formIdCell= new PdfPCell(new Paragraph("COD Return "+order.getAirwaybill_no()+" Form id-0325", helvetica6));
298
				PdfPCell formIdCell= new PdfPCell(new Paragraph("COD Return "+order.getAirwaybill_no()+" Form id-0325", helvetica6));
299
				formIdCell.setPaddingTop(5.0f);
299
				formIdCell.setPaddingTop(5.0f);
300
				formIdCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
300
				formIdCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
301
				formIdCell.setBorder(Rectangle.NO_BORDER);
301
				formIdCell.setBorder(Rectangle.NO_BORDER);
302
				Barcode128 code128 = new Barcode128();
-
 
303
				code128.setGenerateChecksum(true);
302
				
304
				code128.setCode("*"+fedexCodReturnBarcode+"*"); 
-
 
305
				chargesTable.addCell(new Phrase("PRIORITY OVERNIGHT ", helvetica8));
303
				chargesTable.addCell(new Phrase("PRIORITY OVERNIGHT ", helvetica8));
306
				chargesTable.addCell(formIdCell);
304
				chargesTable.addCell(formIdCell);
307
				chargesTable.addCell(new Phrase(code128.getCode(),new Font(code128.getFont())));
-
 
308
				
305
				
-
 
306
				PdfPCell awbNumberCell= new PdfPCell(new Paragraph("*"+fedexCodReturnBarcode+"*", barCodeFont));
-
 
307
				awbNumberCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
-
 
308
				awbNumberCell.setBorder(Rectangle.NO_BORDER);
-
 
309
 
-
 
310
				chargesTable.addCell(awbNumberCell);
309
				
311
				
310
			}
312
			}
311
			//End:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
313
			//End:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
312
		} else {
314
		} else {
313
			chargesTable.addCell(new Phrase("Do not pay any extra charges to the Courier."));  
315
			chargesTable.addCell(new Phrase("Do not pay any extra charges to the Courier."));  
Line 414... Line 416...
414
			try {
416
			try {
415
				fedexPackageBarcode = tclient.getOrderAttributeValue(order.getId(), "FedEx_Package_BarCode");
417
				fedexPackageBarcode = tclient.getOrderAttributeValue(order.getId(), "FedEx_Package_BarCode");
416
			} catch (TException e1) {
418
			} catch (TException e1) {
417
				logger.error("Error while getting the provider information.", e1);
419
				logger.error("Error while getting the provider information.", e1);
418
			}
420
			}
419
			awbNumberCell = new PdfPCell(new Paragraph(" ", helvetica6));
421
			awbNumberCell = new PdfPCell(new Paragraph("*"+fedexPackageBarcode+"*", barCodeFont));
420
			awbNumberCell.setPaddingBottom(5.0f);
422
			awbNumberCell.setPaddingBottom(5.0f);
421
		}
423
		}
422
		awbNumberCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
424
		awbNumberCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
423
		awbNumberCell.setBorder(Rectangle.NO_BORDER);
425
		awbNumberCell.setBorder(Rectangle.NO_BORDER);
424
 
426
 
Line 426... Line 428...
426
		if(formIdCell != null){
428
		if(formIdCell != null){
427
			providerInfoTable.addCell(formIdCell);
429
			providerInfoTable.addCell(formIdCell);
428
		}
430
		}
429
		//End:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
431
		//End:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
430
		providerInfoTable.addCell(awbNumberCell);
432
		providerInfoTable.addCell(awbNumberCell);
431
		if(order.getLogistics_provider_id()==7L && fedexPackageBarcode!=null ){
-
 
432
			Barcode128 code128 = new Barcode128();
-
 
433
			code128.setGenerateChecksum(true);
-
 
434
			code128.setCode("*"+fedexPackageBarcode+"*"); 
-
 
435
			providerInfoTable.addCell(new Phrase(code128.getCode(),new Font(code128.getFont())));
-
 
436
		}
-
 
437
		
433
		
438
		Warehouse warehouse = null;
434
		Warehouse warehouse = null;
439
		try{
435
		try{
440
    		InventoryClient isc = new InventoryClient();
436
    		InventoryClient isc = new InventoryClient();
441
    		warehouse = isc.getClient().getWarehouse(order.getWarehouse_id());
437
    		warehouse = isc.getClient().getWarehouse(order.getWarehouse_id());