Subversion Repositories SmartDukaan

Rev

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

Rev 13319 Rev 13320
Line 301... Line 301...
301
301
302 
					dispatchAdviceTable.setSpacingAfter(10.0f);
 302 
					dispatchAdviceTable.setSpacingAfter(10.0f);
303 
					dispatchAdviceTable.setWidthPercentage(90.0f);
 303 
					dispatchAdviceTable.setWidthPercentage(90.0f);
304 
					document.add(dispatchAdviceTable);
 304 
					document.add(dispatchAdviceTable);
305 
					if("Bulk".equalsIgnoreCase(invoiceFormat)){
 305 
					if("Bulk".equalsIgnoreCase(invoiceFormat)){
- 
 
 306 
						if(ordersList.size()>3 || order.getLogistics_provider_id()==7){
306 
						document.newPage();
 307 
							document.newPage();
- 
 
 308 
						}
307 
					}
 309 
					}
308
310
309 
					if ((new Long(order.getSource()).intValue() == OrderSource.EBAY.getValue()) && (order.getLogistics_provider_id()>7) &&(ordersList.size()==1)) {
 311 
					if ((new Long(order.getSource()).intValue() == OrderSource.EBAY.getValue()) && (order.getLogistics_provider_id()>7) &&(ordersList.size()==1)) {
310 
						if (order.getAirwaybill_no()== null || order.getAirwaybill_no().equals("null") || order.getAirwaybill_no().isEmpty()
312 
						if (order.getAirwaybill_no()== null || order.getAirwaybill_no().equals("null") || order.getAirwaybill_no().isEmpty()
311 
								|| order.getWarehouse_id() == 7 || order.getWarehouse_id() == 5 || order.getWarehouse_id() == 9) {
 313 
								|| order.getWarehouse_id() == 7 || order.getWarehouse_id() == 5 || order.getWarehouse_id() == 9) {
Line 473... Line 475...
473
475
474 
					dispatchAdviceTable.setSpacingAfter(10.0f);
 476 
					dispatchAdviceTable.setSpacingAfter(10.0f);
475 
					dispatchAdviceTable.setWidthPercentage(90.0f);
 477 
					dispatchAdviceTable.setWidthPercentage(90.0f);
476 
					document.add(dispatchAdviceTable);
 478 
					document.add(dispatchAdviceTable);
477 
					if("Bulk".equalsIgnoreCase(invoiceFormat)){
 479 
					if("Bulk".equalsIgnoreCase(invoiceFormat)){
- 
 
 480 
						if(ordersList.size()>1){
478 
						document.newPage();
 481 
							document.newPage();
- 
 
 482 
						}
479 
					}
 483 
					}
480
484
481 
					if ((new Long(order.getSource()).intValue() == OrderSource.EBAY.getValue()) && (order.getLogistics_provider_id()>7) &&(ordersList.size()==1)) {
 485 
					if ((new Long(order.getSource()).intValue() == OrderSource.EBAY.getValue()) && (order.getLogistics_provider_id()>7) &&(ordersList.size()==1)) {
482 
						if (order.getAirwaybill_no()== null || order.getAirwaybill_no().equals("null") || order.getAirwaybill_no().isEmpty()
486 
						if (order.getAirwaybill_no()== null || order.getAirwaybill_no().equals("null") || order.getAirwaybill_no().isEmpty()
483 
								|| order.getWarehouse_id() == 7 || order.getWarehouse_id() == 5 || order.getWarehouse_id() == 9) {
 487 
								|| order.getWarehouse_id() == 7 || order.getWarehouse_id() == 5 || order.getWarehouse_id() == 9) {
Line 916... Line 920...
916 
				}else{
 920 
				}else{
917 
					itemQuantityMap.put(lineitem.getItem_id(), lineitem.getQuantity());
 921 
					itemQuantityMap.put(lineitem.getItem_id(), lineitem.getQuantity());
918 
				}
 922 
				}
919
923
920 
				if(itemTotalAmtMap.containsKey(lineitem.getItem_id())){
 924 
				if(itemTotalAmtMap.containsKey(lineitem.getItem_id())){
921 
					double totalItemAmount = itemTotalAmtMap.get(lineitem.getItem_id()) + (order.getTotal_amount()-order.getGvAmount()-order.getAdvanceAmount());
 925 
					double totalItemAmount = itemTotalAmtMap.get(lineitem.getItem_id()) + (order.getTotal_amount()-order.getGvAmount()-order.getAdvanceAmount()-order.getInsuranceAmount());
922 
					itemTotalAmtMap.put(lineitem.getItem_id(), totalItemAmount);
 926 
					itemTotalAmtMap.put(lineitem.getItem_id(), totalItemAmount);
923 
				}else{
 927 
				}else{
924 
					itemTotalAmtMap.put(lineitem.getItem_id(), (order.getTotal_amount()-order.getGvAmount()-order.getAdvanceAmount()));
 928 
					itemTotalAmtMap.put(lineitem.getItem_id(), (order.getTotal_amount()-order.getGvAmount()-order.getAdvanceAmount()-order.getInsuranceAmount()));
925 
				}
 929 
				}
926 
				if(paymentMode==null || paymentMode.isEmpty()){
 930 
				if(paymentMode==null || paymentMode.isEmpty()){
927 
					if(order.getPickupStoreId() > 0 && order.isCod() == true)
 931 
					if(order.getPickupStoreId() > 0 && order.isCod() == true)
928 
						paymentMode = "In-Store";
 932 
						paymentMode = "In-Store";
929 
					else if (order.isCod())
 933 
					else if (order.isCod())
Line 1511... Line 1515...
1511 
	}
 1515 
	}
1512 
 
 1516 
 
1513 
	private PdfPCell getInvoiceTableHeader(int colspan, String masterOrderId) {
 1517 
	private PdfPCell getInvoiceTableHeader(int colspan, String masterOrderId) {
1514 
		PdfPTable invoiceHeaderTable = new PdfPTable(2);
 1518 
		PdfPTable invoiceHeaderTable = new PdfPTable(2);
1515 
		PdfPCell masterOrderIdCell = new PdfPCell(new Phrase("Master Order Id- "+masterOrderId, helvetica10));
 1519 
		PdfPCell masterOrderIdCell = new PdfPCell(new Phrase("Master Order Id- "+masterOrderId, helvetica10));
- 
 
 1520 
		if(masterOrderId!=null && !masterOrderId.isEmpty()){
1516 
		masterOrderIdCell.setBorder(Rectangle.NO_BORDER);
 1521 
			masterOrderIdCell.setBorder(Rectangle.NO_BORDER);
1517 
		masterOrderIdCell.setPaddingTop(1);
 1522 
			masterOrderIdCell.setPaddingTop(1);
- 
 
 1523 
		}
1518 
		PdfPCell invoiceTableHeader = new PdfPCell(new Phrase("Order Details:", helveticaBold12));
 1524 
		PdfPCell invoiceTableHeader = new PdfPCell(new Phrase("Order Details:", helveticaBold12));
1519 
		invoiceTableHeader.setBorder(Rectangle.NO_BORDER);
 1525 
		invoiceTableHeader.setBorder(Rectangle.NO_BORDER);
1520 
		invoiceTableHeader.setPaddingTop(1);
 1526 
		invoiceTableHeader.setPaddingTop(1);
1521 
		invoiceHeaderTable.addCell(invoiceTableHeader);
 1527 
		invoiceHeaderTable.addCell(invoiceTableHeader);
- 
 
 1528 
		if(masterOrderId!=null && !masterOrderId.isEmpty()){
1522 
		invoiceHeaderTable.addCell(masterOrderIdCell);
 1529 
			invoiceHeaderTable.addCell(masterOrderIdCell);
- 
 
 1530 
		}else{
- 
 
 1531 
			masterOrderIdCell = new PdfPCell(new Phrase(" ", helvetica10));
- 
 
 1532 
			invoiceHeaderTable.addCell(masterOrderIdCell);
- 
 
 1533 
		}
1523 
		PdfPCell headerCell = new PdfPCell(invoiceHeaderTable);
 1534 
		PdfPCell headerCell = new PdfPCell(invoiceHeaderTable);
1524 
		headerCell.setColspan(colspan);
 1535 
		headerCell.setColspan(colspan);
1525 
		return headerCell;
 1536 
		return headerCell;
1526 
	}
 1537 
	}
1527 
 
 1538 
 
Line 1664... Line 1675...
1664 
			itemName.append(lineitem.getModel_name() + " ");
 1675 
			itemName.append(lineitem.getModel_name() + " ");
1665 
		if(lineitem.getModel_number() != null )
 1676 
		if(lineitem.getModel_number() != null )
1666 
			itemName.append(lineitem.getModel_number() + " ");
 1677 
			itemName.append(lineitem.getModel_number() + " ");
1667 
		if(lineitem.getColor() != null && !lineitem.getColor().trim().equals("NA"))
 1678 
		if(lineitem.getColor() != null && !lineitem.getColor().trim().equals("NA"))
1668 
			itemName.append("("+lineitem.getColor()+")");
 1679 
			itemName.append("("+lineitem.getColor()+")");
1669 
		if(appendIMEI && lineitem.isSetSerial_number()){
 1680 
		if(appendIMEI && lineitem.isSetSerial_number() && !lineitem.getSerial_number().isEmpty()){
1670 
			itemName.append("\nIMEI No. " + lineitem.getSerial_number());
 1681 
			itemName.append("\nIMEI No. " + lineitem.getSerial_number());
1671 
		}
 1682 
		}
1672 
 
 1683 
 
1673 
		return itemName.toString();
 1684 
		return itemName.toString();
1674 
	}
 1685 
	}