WebSVN – SmartDukaan – Diff – /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java

 		packagingTable.addCell(new Phrase(grandTotalPieces+"", helveticaBold8));
 		finalTable.addCell(customerAddresTable);
 		finalTable.addCell(packagingTable);
 		return finalTable;
+	}
+	private double getTotalAmountToCollect(List<Order> orderList){
+		Order order = orderList.get(0);
+		double totalAmount = 0.0;
+		if(order.isSetNet_payable_amount()){
+			for (Order o: orderList){
+				totalAmount = totalAmount + o.getNet_payable_amount();
+			}
+		}
+		else{
+			for (Order o: orderList){
+				totalAmount = totalAmount + o.getTotal_amount() +o.getShippingCost()-o.getGvAmount()-o.getAdvanceAmount() -o.getWallet_amount();
+			}
+		}
+		return totalAmount;
+	}
+	private boolean isCod(List<Order> orderList){
+		Order order = orderList.get(0);
+		double totalAmount = 0.0;
+		if (order.isCod()){
+			if(order.isSetNet_payable_amount()){
+				for (Order o: orderList){
+					totalAmount = totalAmount + o.getNet_payable_amount();
+				}
+				if (totalAmount == 0){
+					return false;
+				}
+			}
+			return true;
+		}
+		else{
+			return false;
+		}
+	}
 	private PdfPTable getDispatchAdviceTable(List<Order> orderList, Provider provider, float barcodeFontSize, String destCode, boolean withBill, String invoiceFormat) throws TException{
 		Order order = orderList.get(0);
 		Font barCodeFont = getBarCodeFont(provider, barcodeFontSize);
-		double totalAmount = 0.0;
+		double totalAmount = getTotalAmountToCollect(orderList);
 		double totalWeight = 0.0;
+		boolean cashOnDelivery = isCod(orderList);
 		for (Order o: orderList){
-			totalAmount = totalAmount + o.getTotal_amount() +o.getShippingCost()-o.getGvAmount()-o.getAdvanceAmount();
 			totalWeight = totalWeight + o.getTotal_weight();
+		}
 		PdfPTable table = new PdfPTable(1);
 		table.setSplitLate(false);
 		PdfPTable logoTable = new PdfPTable(2);
 		addLogoTable(logoTable,order);
 		PdfPCell titleCell = getTitleCell();
 		PdfPTable customerTable = getCustomerAddressTable(order, destCode, false, helvetica12, false, false);
-		PdfPTable providerInfoTable = getProviderTable(order, provider, barCodeFont, totalWeight);
+		PdfPTable providerInfoTable = getProviderTable(order, provider, barCodeFont, totalWeight, cashOnDelivery);
 		PdfPTable dispatchTable = new PdfPTable(new float[]{0.5f, 0.1f, 0.4f});
 		dispatchTable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
 		dispatchTable.addCell(customerTable);
 		dispatchTable.addCell(new Phrase(" "));
 				" - " + addressInfo.getPin() + "\nContact No.- +91-"+addressInfo.getContact_number() + "\n\n");
 		PdfPTable chargesTable = new PdfPTable(1);
 		chargesTable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
 		chargesTable.getDefaultCell().setHorizontalAlignment(Element.ALIGN_CENTER);
-		if(order.isLogisticsCod()){
+		if(cashOnDelivery){
 			chargesTable.addCell(new Phrase("AMOUNT TO BE COLLECTED : Rs " + (totalAmount), helveticaBold12));
 			//chargesTable.addCell(new Phrase("RTO ADDRESS:DEL/HPW/111116"));
 			//Start:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
 			if(order.getLogistics_provider_id()==7L || order.getLogistics_provider_id()==46L){
 				in.shop2020.model.v1.order.TransactionService.Client tclient = tsc.getClient();
 		titleCell.setHorizontalAlignment(Element.ALIGN_CENTER);
 		titleCell.setBorder(Rectangle.NO_BORDER);
 		return titleCell;
+	}
-	private PdfPTable getProviderTable(Order order, Provider provider, Font barCodeFont, double totalWeight) throws TException {
+	private PdfPTable getProviderTable(Order order, Provider provider, Font barCodeFont, double totalWeight, boolean cashOnDelivery) throws TException {
 		PdfPTable providerInfoTable = new PdfPTable(1);
 		providerInfoTable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
 		if (provider.getId() ==1L){
 			PdfPCell spnCell = new PdfPCell(new Phrase("SPN : 09650099008S", helvetica12));
 			spnCell.setHorizontalAlignment(Element.ALIGN_LEFT);
 			spnCell.setBorder(Rectangle.NO_BORDER);
 			providerInfoTable.addCell(spnCell);
+		}
-		if(order.isLogisticsCod()){
+		if(cashOnDelivery){
 			PdfPCell deliveryTypeCell = new PdfPCell(new Phrase("COD   ", helvetica22));
 			deliveryTypeCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
 			deliveryTypeCell.setBorder(Rectangle.NO_BORDER);
 			providerInfoTable.addCell(deliveryTypeCell);
+		}
 		PdfPCell providerNameCell = new PdfPCell(new Phrase(provider.getName(), helveticaBold12));
 		providerNameCell.setHorizontalAlignment(Element.ALIGN_LEFT);
 		providerNameCell.setBorder(Rectangle.NO_BORDER);
 		PdfPCell formIdCell= null;
 		if(order.getLogistics_provider_id()==7L || order.getLogistics_provider_id()==46L){
-			if(order.isCod()){
+			if(cashOnDelivery){
 				formIdCell = new PdfPCell(new Paragraph(order.getAirwaybill_no()+" Form id-0305", helvetica6));
+			}
 			else{
 				formIdCell = new PdfPCell(new Paragraph(order.getAirwaybill_no()+" Form id-0467", helvetica6));
+			}
 		} catch(Exception e) {
 		    logger.error("Unable to get warehouse for id : " + order.getWarehouse_id(), e);
 		    //TODO throw e;
+		}
 		DeliveryType dt =  DeliveryType.PREPAID;
-        if (order.isLogisticsCod()) {
+        if (cashOnDelivery) {
             dt = DeliveryType.COD;
+        }
         //Start:-Added By Manish Sharma for FedEx Integration - Shipment Creation on 21-Aug-2013
         if(order.getLogistics_provider_id()!=7L && order.getLogistics_provider_id()!=46L){
 	        for (ProviderDetails detail : provider.getDetails()) {
 		if("Bulk".equalsIgnoreCase(invoiceFormat)){
 			invoiceTable.addCell(new Phrase("Sr No", helvetica8));
 		}else{
 			invoiceTable.addCell(new Phrase("Order No", helvetica8));
+		}
-		invoiceTable.addCell(new Phrase("Paymode", helvetica8));
+		//invoiceTable.addCell(new Phrase("Paymode", helvetica8));
 		invoiceTable.addCell(new Phrase("Product Name", helvetica8));
 		invoiceTable.addCell(new Phrase("Quantity", helvetica8));
 		invoiceTable.addCell(new Phrase("Rate", helvetica8));
 		invoiceTable.addCell(new Phrase("Amount", helvetica8));
 		invoiceTable.setHeaderRows(2);
 		double totalAmount = 0.0;
 		double totalShippingCost = 0.0;
 		double insuranceAmount = 0.0;
 		double advanceAmount = 0.0;
 		double totalGvAmount = 0.0;
+		double totalWalletAmount = 0.0;
 		if("Bulk".equalsIgnoreCase(invoiceFormat)){
 			Map<Long, String> itemNamesMap= new HashMap<Long, String>();
 			Map<Long, Double> itemQuantityMap = new HashMap<Long, Double>();
 			Map<Long, Double> itemRateMap = new HashMap<Long, Double>();
 			Map<Long, Double> itemTotalAmtMap = new HashMap<Long, Double>();
-			String paymentMode = "";
 			for(Order order : orderList){
 				LineItem lineitem = order.getLineitems().get(0);
-				totalAmount = totalAmount + order.getTotal_amount()-order.getAdvanceAmount()-order.getGvAmount();
+				totalAmount = totalAmount + order.getTotal_amount()-order.getAdvanceAmount()-order.getGvAmount()-order.getWallet_amount();
 				totalShippingCost = totalShippingCost + order.getShippingCost();
 				totalGvAmount = totalGvAmount + order.getGvAmount();
+				totalWalletAmount = totalWalletAmount + order.getWallet_amount();
 				if(order.getInsurer() > 0) {
 					insuranceAmount =insuranceAmount + order.getInsuranceAmount();
+				}
 				if(order.getSource() == OrderSource.STORE.getValue()) {
 					advanceAmount = advanceAmount + order.getAdvanceAmount();
 					double totalItemAmount = itemTotalAmtMap.get(lineitem.getItem_id()) + (order.getTotal_amount()-order.getAdvanceAmount()-order.getInsuranceAmount());
 					itemTotalAmtMap.put(lineitem.getItem_id(), totalItemAmount);
 				}else{
 					itemTotalAmtMap.put(lineitem.getItem_id(), (order.getTotal_amount()-order.getAdvanceAmount()-order.getInsuranceAmount()));
+				}
-				if(paymentMode==null || paymentMode.isEmpty()){
+//				if(paymentMode==null || paymentMode.isEmpty()){
-					if(order.getPickupStoreId() > 0 && order.isCod() == true)
+//					if(order.getPickupStoreId() > 0 && order.isCod() == true)
-						paymentMode = "In-Store";
+//						paymentMode = "In-Store";
-					else if (order.isCod())
+//					else if (order.isCod())
-						paymentMode = "COD";
+//						paymentMode = "COD";
-					else
+//					else
-						paymentMode = "Prepaid";
+//						paymentMode = "Prepaid";
-				}
+//				}
+			}
 			int serialNo = 0;
 			for(Long itemId : itemNamesMap.keySet()){
 				serialNo ++;
 				invoiceTable.addCell(new Phrase(serialNo+ "", helvetica8));
-				invoiceTable.addCell(new Phrase(paymentMode, helvetica8));
+				//invoiceTable.addCell(new Phrase(paymentMode, helvetica8));
 				invoiceTable.addCell(new Phrase(itemNamesMap.get(itemId), helvetica8));
 				invoiceTable.addCell(new Phrase(itemQuantityMap.get(itemId)+"", helvetica8));
 				invoiceTable.addCell(new Phrase(itemRateMap.get(itemId)+"", helvetica8));
 				invoiceTable.addCell(new Phrase(itemTotalAmtMap.get(itemId)+"", helvetica8));
+			}
 					insuranceAmount =insuranceAmount + order.getInsuranceAmount();
+				}
 				if(order.getSource() == OrderSource.STORE.getValue()) {
 					advanceAmount = advanceAmount + order.getAdvanceAmount();
+				}
-				totalAmount = totalAmount + order.getTotal_amount()-order.getAdvanceAmount()-order.getGvAmount();
+				totalAmount = totalAmount + order.getTotal_amount()-order.getAdvanceAmount()-order.getGvAmount()-order.getWallet_amount();
 				totalShippingCost = totalShippingCost + order.getShippingCost();
 				totalGvAmount = totalGvAmount + order.getGvAmount();
+				totalWalletAmount = totalWalletAmount + order.getWallet_amount();
+			}
+		}
 		if(insuranceAmount>0){
 			invoiceTable.addCell(getInsuranceCell(4));
 			invoiceTable.addCell(getPriceCell(insuranceAmount));
 			totalGvAmount = 0-totalGvAmount;
 			invoiceTable.addCell(getGvAmountCell(4));
 			invoiceTable.addCell(getRupeesCell(false));
 			invoiceTable.addCell(getPriceCell(totalGvAmount));
+		}
+		if(totalWalletAmount>0){
+			totalWalletAmount = 0-totalWalletAmount;
+			invoiceTable.addCell(getGvAmountCell(4));
+			invoiceTable.addCell(getRupeesCell(false));
+			invoiceTable.addCell(getPriceCell(totalWalletAmount));
+		}
 		invoiceTable.addCell(getTotalCell(4));
 		invoiceTable.addCell(getRupeesCell(true));
 		invoiceTable.addCell(getTotalAmountCell(totalAmount+totalShippingCost));
 	private void populateTopInvoiceTable(Order order, PdfPTable invoiceTable) {
 		List<LineItem> lineitems = order.getLineitems();
 		for (LineItem lineitem : lineitems) {
 			invoiceTable.addCell(new Phrase(order.getId() + "", helvetica8));
-			if(order.getPickupStoreId() > 0 && order.isCod() == true)
+//			if(order.getPickupStoreId() > 0 && order.isCod() == true)
-				invoiceTable.addCell(new Phrase("In-Store", helvetica8));
+//				invoiceTable.addCell(new Phrase("In-Store", helvetica8));
-			else if (order.isCod())
+//			else if (order.isCod())
-				invoiceTable.addCell(new Phrase("COD", helvetica8));
+//				invoiceTable.addCell(new Phrase("COD", helvetica8));
-			else
+//			else
-				invoiceTable.addCell(new Phrase("Prepaid", helvetica8));
+//				invoiceTable.addCell(new Phrase("Prepaid", helvetica8));
 			invoiceTable.addCell(getProductNameCell(lineitem, false, order.getFreebieItemId()));
 			invoiceTable.addCell(new Phrase(lineitem.getQuantity() + "", helvetica8));

Subversion Repositories SmartDukaan

(root)/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java – Rev 20818 → 20943