Subversion Repositories SmartDukaan

Rev

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

Rev 18693 Rev 18769
Line 585... Line 585...
585
						}
585
						}
586
						
586
						
587
						document.add(new DottedLineSeparator());
587
						document.add(new DottedLineSeparator());
588
						document.add(orderItemsDetailTable);
588
						document.add(orderItemsDetailTable);
589
					}
589
					}
-
 
590
					PdfPTable billingAddressTable = getCustomerAddressTable(order, null, true, helvetica8, true, false);
-
 
591
					if(billingAddress!=null){
-
 
592
						billingAddressTable.setWidthPercentage(90.0f);
-
 
593
						billingAddressTable.setSpacingBefore(5.0f);
-
 
594
						billingAddressTable.addCell(new Phrase("Billing Address :", helveticaBold8));
-
 
595
						billingAddressTable.addCell(new Phrase(billingAddress.getName() +" "+billingAddress.getLine1()
-
 
596
								+billingAddress.getLine2() +" "+billingAddress.getCity() + "," + billingAddress.getState()
-
 
597
								+" -"+billingAddress.getPin(), helvetica8));
-
 
598
						document.add(billingAddressTable);
-
 
599
					}
-
 
600
					
590
					document.newPage();
601
					document.newPage();
591
				}
602
				}
592
			}
603
			}
593
			
604
			
594
 
605
 
Line 1057... Line 1068...
1057
		Paragraph sorlAddress = new Paragraph(ourAddress + "\n Contact No.- +91-9811247808" + "\nTIN NO. " + tinNo, new Font(FontFamily.TIMES_ROMAN, 8f, Element.ALIGN_CENTER));
1068
		Paragraph sorlAddress = new Paragraph(ourAddress + "\n Contact No.- +91-9811247808" + "\nTIN NO. " + tinNo, new Font(FontFamily.TIMES_ROMAN, 8f, Element.ALIGN_CENTER));
1058
		PdfPCell sorlAddressCell = new PdfPCell(sorlAddress);
1069
		PdfPCell sorlAddressCell = new PdfPCell(sorlAddress);
1059
		sorlAddressCell.addElement(sorlAddress);
1070
		sorlAddressCell.addElement(sorlAddress);
1060
		sorlAddressCell.setHorizontalAlignment(Element.ALIGN_LEFT);
1071
		sorlAddressCell.setHorizontalAlignment(Element.ALIGN_LEFT);
1061
 
1072
 
1062
		PdfPTable customerAddress = getCustomerAddressTable(order, null, true, helvetica8, true, true);
1073
		PdfPTable customerAddress = getCustomerAddressTable(order, null, true, helvetica8, true, false);
1063
		if (order.getOrderType().equals(OrderType.B2B)) {
1074
		if (order.getOrderType().equals(OrderType.B2B)) {
1064
			if(billingAddress!=null){
1075
			if(billingAddress!=null){
1065
				if(order.getCustomer_state().trim().equalsIgnoreCase(billingAddress.getState())){
1076
				if(order.getCustomer_state().trim().equalsIgnoreCase(billingAddress.getState())){
1066
					phrase = new Phrase("TAX INVOICE", helveticaBold12);
1077
					phrase = new Phrase("TAX INVOICE", helveticaBold12);
1067
				}else{
1078
				}else{
Line 1220... Line 1231...
1220
		billingAddress = userClient.getBillingAddressForUser(userId);
1231
		billingAddress = userClient.getBillingAddressForUser(userId);
1221
	}
1232
	}
1222
 
1233
 
1223
	private PdfPTable getCustomerAddressTable(Order order, String destCode, boolean showPaymentMode, Font font, boolean forInvoce, boolean billingAdd){
1234
	private PdfPTable getCustomerAddressTable(Order order, String destCode, boolean showPaymentMode, Font font, boolean forInvoce, boolean billingAdd){
1224
		PdfPTable customerTable = new PdfPTable(1);
1235
		PdfPTable customerTable = new PdfPTable(1);
1225
		customerTable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
-
 
1226
		if(forInvoce || order.getPickupStoreId() == 0){
1236
		if(forInvoce || order.getPickupStoreId() == 0){
1227
			in.shop2020.model.v1.user.UserContextService.Client userClient = usc.getClient();
1237
			in.shop2020.model.v1.user.UserContextService.Client userClient = usc.getClient();
1228
			try {
1238
			try {
1229
				if(billingAdd && userClient.isPrivateDealUser(order.getCustomer_id())){
1239
				if(billingAdd && userClient.isPrivateDealUser(order.getCustomer_id())){
1230
					setBillingAddress(order.getCustomer_id(), userClient);
1240
					setBillingAddress(order.getCustomer_id(), userClient);
1231
					if(billingAddress!=null){
1241
					if(billingAddress!=null){
-
 
1242
						return customerTable;
-
 
1243
						/*
1232
						customerTable.addCell(new Phrase(billingAddress.getName(), font));
1244
						customerTable.addCell(new Phrase(billingAddress.getName(), font));
1233
						customerTable.addCell(new Phrase(billingAddress.getLine1(), font));
1245
						customerTable.addCell(new Phrase(billingAddress.getLine1(), font));
1234
						customerTable.addCell(new Phrase(billingAddress.getLine2(), font));
1246
						customerTable.addCell(new Phrase(billingAddress.getLine2(), font));
1235
						customerTable.addCell(new Phrase(billingAddress.getCity() + "," + billingAddress.getState(), font));
1247
						customerTable.addCell(new Phrase(billingAddress.getCity() + "," + billingAddress.getState(), font));
1236
						customerTable.addCell(new Phrase(billingAddress.getPin(), font));
1248
						customerTable.addCell(new Phrase(billingAddress.getPin(), font));
1237
						customerTable.addCell(new Phrase("Phone : " + (billingAddress.getPhone()== null ? "" : billingAddress.getPhone()), font));
1249
						customerTable.addCell(new Phrase("Phone : " + (billingAddress.getPhone()== null ? "" : billingAddress.getPhone()), font));
-
 
1250
						*/
1238
					}else{
1251
					}else{
1239
						customerTable.addCell(new Phrase(order.getCustomer_name(), font));
1252
						customerTable.addCell(new Phrase(order.getCustomer_name(), font));
1240
						if(order.getSource() == OrderSource.HOMESHOP18.getValue()){
1253
						if(order.getSource() == OrderSource.HOMESHOP18.getValue()){
1241
							HsOrder hsOrder = null;
1254
							HsOrder hsOrder = null;
1242
							try {
1255
							try {
Line 1273... Line 1286...
1273
						if(order.getCustomer_mobilenumber()!=null && !order.getCustomer_mobilenumber().isEmpty()) {
1286
						if(order.getCustomer_mobilenumber()!=null && !order.getCustomer_mobilenumber().isEmpty()) {
1274
							customerTable.addCell(new Phrase("Phone : " + (order.getCustomer_mobilenumber()== null ? "" : order.getCustomer_mobilenumber()), font));
1287
							customerTable.addCell(new Phrase("Phone : " + (order.getCustomer_mobilenumber()== null ? "" : order.getCustomer_mobilenumber()), font));
1275
						}
1288
						}
1276
					}
1289
					}
1277
				}else{
1290
				}else{
-
 
1291
					customerTable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
1278
					customerTable.addCell(new Phrase(order.getCustomer_name(), font));
1292
					customerTable.addCell(new Phrase(order.getCustomer_name(), font));
1279
					if(order.getSource() == OrderSource.HOMESHOP18.getValue()){
1293
					if(order.getSource() == OrderSource.HOMESHOP18.getValue()){
1280
						HsOrder hsOrder = null;
1294
						HsOrder hsOrder = null;
1281
						try {
1295
						try {
1282
							hsOrder = tsc.getClient().getHomeShopOrder(order.getId(), null, null).get(0);
1296
							hsOrder = tsc.getClient().getHomeShopOrder(order.getId(), null, null).get(0);
Line 1316... Line 1330...
1316
			} catch (TException e2) {
1330
			} catch (TException e2) {
1317
				e2.printStackTrace();
1331
				e2.printStackTrace();
1318
			}
1332
			}
1319
			
1333
			
1320
		}else{
1334
		}else{
-
 
1335
			customerTable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
1321
			try {
1336
			try {
1322
				in.shop2020.logistics.LogisticsService.Client lclient = (new LogisticsClient()).getClient();
1337
				in.shop2020.logistics.LogisticsService.Client lclient = (new LogisticsClient()).getClient();
1323
				PickupStore store = lclient.getPickupStore(order.getPickupStoreId());
1338
				PickupStore store = lclient.getPickupStore(order.getPickupStoreId());
1324
				customerTable.addCell(new Phrase(order.getCustomer_name() + " \nc/o " + store.getName(), font));
1339
				customerTable.addCell(new Phrase(order.getCustomer_name() + " \nc/o " + store.getName(), font));
1325
				customerTable.addCell(new Phrase(store.getLine1(), font));
1340
				customerTable.addCell(new Phrase(store.getLine1(), font));