Subversion Repositories SmartDukaan

Rev

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

Rev 8011 Rev 8013
Line 378... Line 378...
378
			PdfPCell deliveryTypeCell = new PdfPCell(new Phrase("COD   ", helvetica28));
378
			PdfPCell deliveryTypeCell = new PdfPCell(new Phrase("COD   ", helvetica28));
379
			deliveryTypeCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
379
			deliveryTypeCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
380
			deliveryTypeCell.setBorder(Rectangle.NO_BORDER);
380
			deliveryTypeCell.setBorder(Rectangle.NO_BORDER);
381
			providerInfoTable.addCell(deliveryTypeCell);
381
			providerInfoTable.addCell(deliveryTypeCell);
382
		}
382
		}
383
		//Start:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
-
 
384
		in.shop2020.model.v1.order.TransactionService.Client tclient = tsc.getClient();
-
 
385
		String fedexPackageBarcode = "";
-
 
386
		try {
-
 
387
			fedexPackageBarcode = tclient.getOrderAttributeValue(order.getId(), "FedEx_Package_BarCode");
-
 
388
		} catch (TException e1) {
-
 
389
			logger.error("Error while getting the provider information.", e1);
-
 
390
		}
-
 
391
		//End:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
-
 
392
		
-
 
393
		
-
 
394
		
383
		
395
		PdfPCell providerNameCell = new PdfPCell(new Phrase(provider.getName(), helveticaBold12));
384
		PdfPCell providerNameCell = new PdfPCell(new Phrase(provider.getName(), helveticaBold12));
396
		providerNameCell.setHorizontalAlignment(Element.ALIGN_LEFT);
385
		providerNameCell.setHorizontalAlignment(Element.ALIGN_LEFT);
397
		providerNameCell.setBorder(Rectangle.NO_BORDER);
386
		providerNameCell.setBorder(Rectangle.NO_BORDER);
398
		//Start:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
-
 
399
		PdfPCell formIdCell= null;
387
		PdfPCell formIdCell= null;
400
		if(order.getLogistics_provider_id()==7L){
388
		if(order.getLogistics_provider_id()==7L){
401
			if(order.isCod()){
389
			if(order.isCod()){
402
				formIdCell = new PdfPCell(new Paragraph("Form id-0305", helvetica6));
390
				formIdCell = new PdfPCell(new Paragraph("Form id-0305", helvetica6));
403
			}
391
			}
Line 412... Line 400...
412
		PdfPCell awbNumberCell= null;
400
		PdfPCell awbNumberCell= null;
413
		if(order.getLogistics_provider_id()!=7L){
401
		if(order.getLogistics_provider_id()!=7L){
414
			awbNumberCell = new PdfPCell(new Paragraph("*" + order.getAirwaybill_no() + "*", barCodeFont));
402
			awbNumberCell = new PdfPCell(new Paragraph("*" + order.getAirwaybill_no() + "*", barCodeFont));
415
		}
403
		}
416
		else{
404
		else{
-
 
405
			in.shop2020.model.v1.order.TransactionService.Client tclient = tsc.getClient();
-
 
406
			String fedexPackageBarcode = "";
-
 
407
			try {
-
 
408
				fedexPackageBarcode = tclient.getOrderAttributeValue(order.getId(), "FedEx_Package_BarCode");
-
 
409
			} catch (TException e1) {
-
 
410
				logger.error("Error while getting the provider information.", e1);
-
 
411
			}
417
			awbNumberCell = new PdfPCell(new Paragraph("*" + fedexPackageBarcode + "*", barCodeFont));
412
			awbNumberCell = new PdfPCell(new Paragraph("*" + fedexPackageBarcode + "*", barCodeFont));
418
		}
413
		}
419
		awbNumberCell.setPaddingBottom(5.0f);
414
		awbNumberCell.setPaddingBottom(5.0f);
420
		awbNumberCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
415
		awbNumberCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
421
		awbNumberCell.setBorder(Rectangle.NO_BORDER);
416
		awbNumberCell.setBorder(Rectangle.NO_BORDER);