Revision 2:eedf3cf23b6f

View differences:

src/com/ib/ibss/enterprise/services/ss105_content/ContentSharedServices.java
65 65
 * checker usage.
66 66
 */
67 67
public class ContentSharedServices extends GenericMkSharedServices {
68
//	public boolean determineMakerChecker(IBSSSessionObjects sessionObjects) {
69
//		if (sessionObjects.getSessionUser().getGroupId() == new Long(1)) {
70
//			return false;
71
//		} else {
72
//			if (IBSSSessionObjects.CONTENT_DUAL_CONTROL) {
73
//				return true;
74
//			} else {
75
//				return false;
76
//			}
77
//		}
78
//	}
68
	// public boolean determineMakerChecker(IBSSSessionObjects sessionObjects) {
69
	// if (sessionObjects.getSessionUser().getGroupId() == new Long(1)) {
70
	// return false;
71
	// } else {
72
	// if (IBSSSessionObjects.CONTENT_DUAL_CONTROL) {
73
	// return true;
74
	// } else {
75
	// return false;
76
	// }
77
	// }
78
	// }
79 79

  
80 80
	public IbBancnetList populateInterbankContent(long categoryID,
81 81
			String bankCode, Date creationDate, Date lastModDate, long contentStatus,
......
84 84
			String ibftMemberId, String fundTransferLength,
85 85
			String loanConventionalLength, String loanIslamicLength,
86 86
			String creditCardLength, String hirePurchaseLength,
87
			String amexLength,String custom1Length,String custom2Length,
88
			long fieldfundTransferLength, long fieldLoanConventionalLength,long fieldLoanIslamicLength,
87
			String amexLength, String custom1Length, String custom2Length,
88
			long fieldfundTransferLength, long fieldLoanConventionalLength, long fieldLoanIslamicLength,
89 89
			long fieldCreditCardLength, long fieldHirePurchaseLength, long fieldAmexLength,
90
			long fieldCustom1Length,long fieldCustom2Length
90
			long fieldCustom1Length, long fieldCustom2Length
91 91
			)
92
			throws Exception {
92
					throws Exception {
93 93
		IbBancnetList bancnet = new IbBancnetList();
94 94
		IbContentCategory category = new IbContentCategory();
95 95
		category.setOid(categoryID);
......
100 100
		bancnet.setStatus(String.valueOf(contentStatus));
101 101
		bancnet.setDeleted(String.valueOf(deleted));
102 102
		bancnet.setRentasInd(String.valueOf(fieldRentas));
103
		bancnet.setRentasMemberId(!DataValidator.isEmptyString(rentasMemberId)?String.valueOf(rentasMemberId):"");
103
		bancnet.setRentasMemberId(!DataValidator.isEmptyString(rentasMemberId) ? String.valueOf(rentasMemberId) : "");
104 104
		bancnet.setIbgInd(String.valueOf(fieldIbg));
105
		bancnet.setIbgMemberId(!DataValidator.isEmptyString(ibgMemberId)?String.valueOf(ibgMemberId):"");
105
		bancnet.setIbgMemberId(!DataValidator.isEmptyString(ibgMemberId) ? String.valueOf(ibgMemberId) : "");
106 106
		bancnet.setIbftInd(String.valueOf(fieldIbft));
107 107
		bancnet.setFundTransferLength(Integer.valueOf(fundTransferLength));
108 108
		bancnet.setLoanConventionalLength(Integer.valueOf(loanConventionalLength));
109
		bancnet.setIbftMemberId(!DataValidator.isEmptyString(ibgMemberId)?String.valueOf(ibgMemberId):"");
109
		bancnet.setIbftMemberId(!DataValidator.isEmptyString(ibgMemberId) ? String.valueOf(ibgMemberId) : "");
110 110
		bancnet.setLoanIslamicLength(Integer.valueOf(creditCardLength));
111 111
		bancnet.setHirePurchaseLength(Integer.valueOf(hirePurchaseLength));
112 112
		bancnet.setAmexLength(Integer.valueOf(amexLength));
......
126 126

  
127 127
	public IbBancnetListML populateInterbankContentML(String bankName, String bankDisplayName,
128 128
			String fundTransferTypeDisplayName, String loanConventionalTypeDisplayName,
129
			String loanIslamicTypeDisplayName, String creditCardTypeDisplayName, 
129
			String loanIslamicTypeDisplayName, String creditCardTypeDisplayName,
130 130
			String hirePurchaseTypeDisplayName, String amexTypeDisplayName,
131 131
			String custom1TypeDisplayName, String custom2TypeDisplayName, String locale)
132
			throws Exception { 
132
			throws Exception {
133 133
		IbBancnetListML bancnet = new IbBancnetListML();
134 134
		bancnet.setBankName(bankName);
135 135
		bancnet.setBankDisplayName(bankDisplayName);
136
		bancnet.setFundTransferTypeDisplayName(!DataValidator.isEmptyString(fundTransferTypeDisplayName)?String.valueOf(fundTransferTypeDisplayName):"");
137
		bancnet.setLoanConventionalTypeDisplayName(!DataValidator.isEmptyString(loanConventionalTypeDisplayName) ?String.valueOf(loanConventionalTypeDisplayName):"");
138
		bancnet.setLoanIslamicTypeDisplayName(!DataValidator.isEmptyString(loanIslamicTypeDisplayName) ?String.valueOf(loanIslamicTypeDisplayName):"");
139
		bancnet.setCreditCardTypeDisplayName(!DataValidator.isEmptyString(creditCardTypeDisplayName) ?String.valueOf(creditCardTypeDisplayName):"");
140
		bancnet.setHirePurchaseTypeDisplayName(!DataValidator.isEmptyString(hirePurchaseTypeDisplayName) ?String.valueOf(hirePurchaseTypeDisplayName):"");
141
		bancnet.setAmexTypeDisplayName(!DataValidator.isEmptyString(amexTypeDisplayName) ?String.valueOf(amexTypeDisplayName):"");
142
		bancnet.setCustom1TypeDisplayName(!DataValidator.isEmptyString(custom1TypeDisplayName) ?String.valueOf(custom1TypeDisplayName):"");
143
		bancnet.setCustom2TypeDisplayName(!DataValidator.isEmptyString(custom2TypeDisplayName) ?String.valueOf(custom2TypeDisplayName):"");
136
		bancnet.setFundTransferTypeDisplayName(!DataValidator.isEmptyString(fundTransferTypeDisplayName) ? String
137
				.valueOf(fundTransferTypeDisplayName) : "");
138
		bancnet.setLoanConventionalTypeDisplayName(!DataValidator.isEmptyString(loanConventionalTypeDisplayName) ? String
139
				.valueOf(loanConventionalTypeDisplayName)
140
				: "");
141
		bancnet.setLoanIslamicTypeDisplayName(!DataValidator.isEmptyString(loanIslamicTypeDisplayName) ? String
142
				.valueOf(loanIslamicTypeDisplayName) : "");
143
		bancnet.setCreditCardTypeDisplayName(!DataValidator.isEmptyString(creditCardTypeDisplayName) ? String
144
				.valueOf(creditCardTypeDisplayName) : "");
145
		bancnet.setHirePurchaseTypeDisplayName(!DataValidator.isEmptyString(hirePurchaseTypeDisplayName) ? String
146
				.valueOf(hirePurchaseTypeDisplayName) : "");
147
		bancnet.setAmexTypeDisplayName(!DataValidator.isEmptyString(amexTypeDisplayName) ? String
148
				.valueOf(amexTypeDisplayName) : "");
149
		bancnet.setCustom1TypeDisplayName(!DataValidator.isEmptyString(custom1TypeDisplayName) ? String
150
				.valueOf(custom1TypeDisplayName) : "");
151
		bancnet.setCustom2TypeDisplayName(!DataValidator.isEmptyString(custom2TypeDisplayName) ? String
152
				.valueOf(custom2TypeDisplayName) : "");
144 153
		bancnet.setLocale(locale);
145 154

  
146 155
		return bancnet;
......
150 159
			String branchAddr1, String branchAddr2,
151 160
			String branchAddr3, String branchAddr4, String branchAddr5,
152 161
			String branchPostCode, String branchContact, String branchFax,
153
			String branchAreaCode, long contentStatus, String startAccountNumberFD, 
162
			String branchAreaCode, long contentStatus, String startAccountNumberFD,
154 163
			Date newDate, long deleted) {
155 164
		IbBankBranch branch = new IbBankBranch();
156 165
		IbContentCategory category = new IbContentCategory();
......
174 183
		branch.setStartRollingNumberFD(startAccountNumberFD);
175 184
		return branch;
176 185
	}
177
	
186

  
178 187
	public IbBankBranchML populateBankBranchML(String branchName, String locale) {
179 188
		IbBankBranchML branch = new IbBankBranchML();
180 189
		branch.setBranchName(branchName);
......
184 193

  
185 194
	public IbCurrencyCode populateCurrencyCode(String currencyCD,
186 195
			Long categoryID, int baseUnit, byte[] imageFile,
187
//			String imageURL,//Not using image URL
196
			// String imageURL,//Not using image URL
188 197
			String displayOrder, long contentStatus, Date newDate, long deleted) {
189 198
		IbCurrencyCode currency = new IbCurrencyCode();
190 199
		IbContentCategory category = new IbContentCategory();
191 200

  
192 201
		currency.setCurrencyCode(currencyCD);
193 202
		currency.setBaseUnit(String.valueOf(baseUnit));
194
//		currency.setImageURL(imageURL); //Not using imageURL
203
		// currency.setImageURL(imageURL); //Not using imageURL
195 204
		currency.setImageFile(imageFile);
196 205
		currency.setDisplayOrder(Long.valueOf(displayOrder));
197 206
		currency.setCreationDate(newDate);
......
227 236
		return notice;
228 237
	}
229 238

  
230
	public IbNoticeInfoML populateNoticeML(String noticeAbstract, String noticeDescription, 
239
	public IbNoticeInfoML populateNoticeML(String noticeAbstract, String noticeDescription,
231 240
			String locale) {
232 241
		IbNoticeInfoML notice = new IbNoticeInfoML();
233 242

  
......
237 246

  
238 247
		return notice;
239 248
	}
249

  
240 250
	public IbPayee populatePayee(String payeeCode,
241 251
			String checkDigitForBillAcctNoReq, String checkDigitForBillRef1Req,
242 252
			String checkDigitForBillRef2Req, String payeeProductCode,
243 253
			Long categoryID, String onlinePayment, String billAccountReq,
244 254
			String accountDispNameReq, String billAccDispNamePattern, String imageReq, byte[] imageFilePayee,
245
//			String imageURL, // Not using imageURL.
246
			
255
			// String imageURL, // Not using imageURL.
256

  
247 257
			String favRegIndi,
248 258
			String effectiveDate, String minPayment, String minPaymentAmount,
249 259
			String maxPayment, String maxPaymentAmount, String paymentType,
250
			String refNoReq, String refNoMandatory ,String refNoNameReq, String refNoNamePattern, 
260
			String refNoReq, String refNoMandatory, String refNoNameReq, String refNoNamePattern,
251 261
			String merchant, String mercAuthCode, String mercAuthSubCode,
252 262
			String rechargeCodeIndi, String serialNoIndi, String billPymtAllow,
253 263
			String debitEngineAllow, String programLinked, String paymentDesc,
......
258 268
			String billRef2Type, String billRef2Mandatory, String billRef2HostField, String billRef2DispNamePattern,
259 269
			String imageRef2Req, String imageRef2Url, String payeeAccNo,
260 270
			String chargeAccNo, String chargeAmt, long contentStatus,
261
			Date newDate, long deleted,String savingTrancode, String currentTrancode, 
271
			Date newDate, long deleted, String savingTrancode, String currentTrancode,
262 272
			String savingTranscodeBIB, String currentTranscodeBIB,
263 273
			String payeeType, String chargeZakatPercent) {
264 274
		IbPayee payee = new IbPayee();
......
273 283
				accountDispNameReq, 1, 0, 1));
274 284
		payee.setBillAccDispNamePattern(billAccDispNamePattern);
275 285
		payee.setImageReq(DataValidator.getValidOptionValue(imageReq, 1, 0, 1));
276
//		payee.setImageUrl(imageURL);// Not using the imageUrl. Use directly from image file upload.
286
		// payee.setImageUrl(imageURL);// Not using the imageUrl. Use directly from image file upload.
277 287
		payee.setImageFilePayee(imageFilePayee);
278 288
		payee.setFavRegisterIndi(DataValidator.getValidOptionValue(favRegIndi, 1, 0, 1));
279 289
		payee.setEffectiveDate(DataValidator.getValidOptionValue(effectiveDate, 1, 0, 1));
......
284 294
		payee.setRefNoNameReq(DataValidator.getValidOptionValue(refNoNameReq, 1, 0, 1));
285 295
		payee.setRefNoNamePattern(refNoNamePattern);
286 296
		payee.setPaymentType(paymentType);
287
		payee.setMinPaymentAmount(!DataValidator.isCurrency(minPaymentAmount) ? BigDecimal.ZERO : new BigDecimal(minPaymentAmount));
297
		payee.setMinPaymentAmount(!DataValidator.isCurrency(minPaymentAmount) ? BigDecimal.ZERO : new BigDecimal(
298
				minPaymentAmount));
288 299
		payee.setMaxPayment(DataValidator.getValidOptionValue(maxPayment, 1, 0, 1));
289
		payee.setMaxPaymentAmount(!DataValidator.isCurrency(maxPaymentAmount) ? BigDecimal.ZERO : new BigDecimal(maxPaymentAmount));
300
		payee.setMaxPaymentAmount(!DataValidator.isCurrency(maxPaymentAmount) ? BigDecimal.ZERO : new BigDecimal(
301
				maxPaymentAmount));
290 302
		payee.setCreationDate(newDate);
291 303
		payee.setLastModDate(newDate);
292 304
		payee.setStatus(String.valueOf(contentStatus));
......
321 333
		payee.setBillRef2HostField(billRef2HostField);
322 334
		payee.setBillRef1DispNamePattern(billRef1DispNamePattern);
323 335
		payee.setBillRef2DispNamePattern(billRef2DispNamePattern);
324
		
325
		payee.setSavingTrancode (savingTrancode);
326
		payee.setCurrentTrancode (currentTrancode);
336

  
337
		payee.setSavingTrancode(savingTrancode);
338
		payee.setCurrentTrancode(currentTrancode);
327 339
		payee.setSavingTrancodeBIB(savingTranscodeBIB);
328 340
		payee.setCurrentTrancodeBIB(currentTranscodeBIB);
329
		payee.setPayeeType (payeeType);
330
		payee.setChargeZakatPercent(!DataValidator.isCurrency(chargeZakatPercent) ? BigDecimal.ZERO : new BigDecimal(chargeZakatPercent));
341
		payee.setPayeeType(payeeType);
342
		payee.setChargeZakatPercent(!DataValidator.isCurrency(chargeZakatPercent) ? BigDecimal.ZERO : new BigDecimal(
343
				chargeZakatPercent));
331 344
		/*
332 345
		 * Check Digit Requirement inside Payee
333 346
		 */
......
340 353
	}
341 354

  
342 355
	public IbPayeeML populatePayeeML(String fullName, String shortName,
343
		 String billAccountDispName,
344
		 String note1, String note2, String note3, String refNoNameDisplay,
356
			String billAccountDispName,
357
			String note1, String note2, String note3, String refNoNameDisplay,
345 358
			String rechargeCodeName,
346 359
			String serialNoName, String billRef1DispName,
347
	
348
			String billRef2DispName, String locale ) {
360

  
361
			String billRef2DispName, String locale) {
349 362
		IbPayeeML payee = new IbPayeeML();
350 363

  
351 364
		payee.setFullName(fullName);
......
362 375
		payee.setLocale(locale);
363 376
		return payee;
364 377
	}
365
	public IbSecQues populateSecurityQuestion(String quesCode, Long categoryID, 
378

  
379
	public IbSecQues populateSecurityQuestion(String quesCode, Long categoryID,
366 380
			int contentStatus, Date newDate) {
367 381
		IbSecQues question = new IbSecQues();
368 382
		question.setQuesCode(quesCode);
......
374 388
		question.setContentCategoryId(categoryID);
375 389
		return question;
376 390
	}
377
	
391

  
378 392
	public IbSecQuesML populateSecurityQuestionML(
379 393
			String quesDesc, String locale) {
380 394
		IbSecQuesML question = new IbSecQuesML();
......
382 396
		question.setLocale(locale);
383 397
		return question;
384 398
	}
385
	
386
	
399

  
387 400
	public IbOccupation populateOccupation(String occupationCode, Long categoryID,
388 401
			int contentStatus, Date newDate) {
389 402
		IbOccupation occupation = new IbOccupation();
......
396 409
		occupation.setContentCategoryId(categoryID);
397 410
		return occupation;
398 411
	}
399
	
412

  
400 413
	public IbOccupationML populateOccupationML(String occupationDesc, String locale) {
401 414
		IbOccupationML occupation = new IbOccupationML();
402 415
		occupation.setOccupationDesc(occupationDesc);
403 416
		occupation.setLocale(locale);
404 417
		return occupation;
405 418
	}
406
	
407
	public IbIncomeRange populateIncomeRange (String incomeRangeCode, Long categoryID,
419

  
420
	public IbIncomeRange populateIncomeRange(String incomeRangeCode, Long categoryID,
408 421
			int contentStatus, Date newDate) {
409 422
		IbIncomeRange incomeRange = new IbIncomeRange();
410 423
		incomeRange.setIncomeRangeCode(incomeRangeCode);
......
416 429
		incomeRange.setContentCategoryId(categoryID);
417 430
		return incomeRange;
418 431
	}
419
	
420
	public IbIncomeRangeML populateIncomeRangeML (String incomeRangeDesc, String locale) {
432

  
433
	public IbIncomeRangeML populateIncomeRangeML(String incomeRangeDesc, String locale) {
421 434
		IbIncomeRangeML incomeRange = new IbIncomeRangeML();
422 435
		incomeRange.setIncomeRangeDesc(incomeRangeDesc);
423 436
		incomeRange.setLocale(locale);
424 437
		return incomeRange;
425 438
	}
426
	
427
	public IbEduLevel populateEduLevel (String eduLevelCode, Long categoryID,
439

  
440
	public IbEduLevel populateEduLevel(String eduLevelCode, Long categoryID,
428 441
			int contentStatus, Date newDate) {
429 442
		IbEduLevel eduLevel = new IbEduLevel();
430 443
		eduLevel.setEduLevelCode(eduLevelCode);
......
437 450
		eduLevel.setContentCategoryId(categoryID);
438 451
		return eduLevel;
439 452
	}
440
	public IbEduLevelML populateEduLevelML (String eduLevelDesc, String locale) {
453

  
454
	public IbEduLevelML populateEduLevelML(String eduLevelDesc, String locale) {
441 455
		IbEduLevelML eduLevel = new IbEduLevelML();
442 456
		eduLevel.setEduLevelDesc(eduLevelDesc);
443 457
		eduLevel.setLocale(locale);
......
446 460

  
447 461
	public IbServiceInfo populateServiceNote(String serviceCode,
448 462
			Long categoryID, String serviceName, String minLimit, String maxLimit,
449
			String denominator,	Integer futureTrnxFlag, String charges, Integer tacRequired,
463
			String denominator, Integer futureTrnxFlag, String charges, Integer tacRequired,
450 464
			Integer smsServiceBit, String smsCharges, String minSmsAmount,
451 465
			String smsNote5, String tableLimit, Integer beneSmsServiceBit,
452 466
			String beneSmsCharges, long contentStatus, Date newDate,
453 467
			long deleted, String defaultCharges1, Integer tierChargesReq1, String chargeCode1,
454
			String defaultCharges2, Integer tierChargesReq2, String chargeCode2, 
455
			String defaultCharges3, Integer tierChargesReq3, String chargeCode3, 
456
			String defaultCharges4, Integer tierChargesReq4, String chargeCode4, 
468
			String defaultCharges2, Integer tierChargesReq2, String chargeCode2,
469
			String defaultCharges3, Integer tierChargesReq3, String chargeCode3,
470
			String defaultCharges4, Integer tierChargesReq4, String chargeCode4,
457 471
			String defaultCharges5, Integer tierChargesReq5, String chargeCode5, Integer operationHourFlag,
458 472
			String operationStartTime, String operationEndTime, Integer weekend, Integer expireDay) {
459
		
473

  
460 474
		IbServiceInfo service = new IbServiceInfo();
461 475
		IbContentCategory category = new IbContentCategory();
462 476

  
......
478 492
		service.setCharges(charges);
479 493
		service.setTacRequired(tacRequired);
480 494
		service.setSmsServiceBit(smsServiceBit);
481
		service.setSmsCharges(DataValidator.isEmptyString(smsCharges) ? "0":smsCharges);
482
		service.setMinimumSmsAmount(DataValidator.isEmptyString(minSmsAmount) ? 0
483
				: Long.parseLong(minSmsAmount));
495
		service.setSmsCharges(DataValidator.isEmptyString(smsCharges) ? "0" : smsCharges);
496
		service.setMinimumSmsAmount(String.valueOf(
497
				DataValidator.isEmptyString(minSmsAmount) ? "0" : minSmsAmount));
484 498
		service.setSmsNote5(smsNote5);
485
		service.setTableLimit(DataValidator.isEmptyString(tableLimit) ? 0
486
				: Long.parseLong(tableLimit));
499
		service.setTableLimit(
500
				DataValidator.isEmptyString(tableLimit) ? 0 : Long.parseLong(tableLimit));
487 501
		service.setBeneSmsServiceBit(beneSmsServiceBit);
488
		service.setBeneSmsCharges(DataValidator.isEmptyString(beneSmsCharges) ? 0
489
				: Long.parseLong(beneSmsCharges));
490
		
502
		service.setBeneSmsCharges(String.valueOf(
503
				DataValidator.isEmptyString(beneSmsCharges) ? "0" : beneSmsCharges));
504

  
491 505
		service.setChargeCode1(chargeCode1);
492 506
		service.setChargeCode2(chargeCode2);
493 507
		service.setChargeCode3(chargeCode3);
494 508
		service.setChargeCode4(chargeCode4);
495 509
		service.setChargeCode5(chargeCode5);
496
		
510

  
497 511
		service.setDefaultCharges1(defaultCharges1);
498 512
		service.setDefaultCharges2(defaultCharges2);
499 513
		service.setDefaultCharges3(defaultCharges3);
500 514
		service.setDefaultCharges4(defaultCharges4);
501 515
		service.setDefaultCharges5(defaultCharges5);
502
		
516

  
503 517
		service.setTierChargesReq1(tierChargesReq1);
504 518
		service.setTierChargesReq2(tierChargesReq2);
505 519
		service.setTierChargesReq3(tierChargesReq3);
506 520
		service.setTierChargesReq4(tierChargesReq4);
507 521
		service.setTierChargesReq5(tierChargesReq5);
508
		
522

  
509 523
		service.setOperationHourFlag(operationHourFlag);
510 524
		service.setOperationStartTime(operationStartTime);
511 525
		service.setOperationEndTime(operationEndTime);
512 526
		service.setWeekend(weekend);
513 527
		service.setExpireDay(expireDay);
514
		
528

  
515 529
		return service;
516 530
	}
517
	
531

  
518 532
	public IbServiceInfoML populateServiceNoteML(
519 533
			Long categoryID, String serviceName, String mainNote1, String mainNote2,
520 534
			String mainNote3, String mainNote4, String mainNote5,
521 535
			String mainNote6, String smsNote1, String smsNote2, String smsNote3, String smsNote4,
522
		    String offlineMessage, String locale) {
536
			String offlineMessage, String locale) {
523 537
		IbServiceInfoML service = new IbServiceInfoML();
524
		
538

  
525 539
		service.setServiceName(serviceName);
526 540
		service.setMainNote1(mainNote1);
527 541
		service.setMainNote2(mainNote2);
......
529 543
		service.setMainNote4(mainNote4);
530 544
		service.setMainNote5(mainNote5);
531 545
		service.setMainNote6(mainNote6);
532
	
546

  
533 547
		service.setSmsNote1(smsNote1);
534 548
		service.setSmsNote2(smsNote2);
535 549
		service.setSmsNote3(smsNote3);
536 550
		service.setSmsNote4(smsNote4);
537 551
		service.setOfflineMessage(offlineMessage);
538
		
552

  
539 553
		service.setLocale(locale);
540
		
554

  
541 555
		return service;
542 556
	}
543
	
544 557

  
545 558
	public IbProductType populateProductType(String productCode,
546 559
			Long categoryID, String accountType, String[] maturityInstruction,
547 560
			String[] interestMode, String currencyCode, String minAmount,
548
			long contentStatus, Date newDate, long deleted, String profitSharingRatio, String collectionAccount[], Long collectionAccountNo, String commissionAccount[], Long commissionAccountNo) {
561
			long contentStatus, Date newDate, long deleted, String profitSharingRatio, String collectionAccount[],
562
			Long collectionAccountNo, String commissionAccount[], Long commissionAccountNo) {
549 563
		IbProductType product = new IbProductType();
550 564
		IbContentCategory category = new IbContentCategory();
551 565
		category.setOid(categoryID);
......
567 581
		product.setCollectionAccountNo(collectionAccountNo);
568 582
		product.setCommissionAccount(ContentUtils.formatArrayToPipeDelimited(commissionAccount));
569 583
		product.setCommissionAccountNo(commissionAccountNo);
570
		
571 584

  
572 585
		return product;
573 586
	}
574 587

  
575
	public IbProductTypeML populateProductTypeML (String displayName, String longName, 
588
	public IbProductTypeML populateProductTypeML(String displayName, String longName,
576 589
			String shortName, String locale) {
577 590
		IbProductTypeML product = new IbProductTypeML();
578 591
		product.setDisplayName(displayName);
......
582 595

  
583 596
		return product;
584 597
	}
598

  
585 599
	public IbTdTerm populateTdTerm(String termProductCode, String depositTerm,
586
			String depositTermCode, String interestTerm, String interestTermCode, String payFreq, IbProductType productType) {
600
			String depositTermCode, String interestTerm, String interestTermCode, String payFreq,
601
			IbProductType productType) {
587 602
		IbTdTerm term = new IbTdTerm();
588 603

  
589 604
		term.setDepositTerm(depositTerm);
......
595 610
		term.setPaymentFreq(payFreq);
596 611
		return term;
597 612
	}
598
	
599
	 public IbITerm populateITerm(String itermProductCode, String iterm, 
600
			 String itermCode, String itermAmount, String itermCommission, String itermCommissionAmount,String itermPlan,IbProductType productType)
601
	 {
602
	IbITerm insterm = new IbITerm();
603
	BigDecimal CommissionamountDecimal = null;
604
	
605
	insterm.setInsuranceProductCode(itermProductCode);
606
	insterm.setInsuranceTerm(iterm);
607
	insterm.setInsuranceTermCode(itermCode);
608
	BigDecimal amountDecimal = new BigDecimal(itermAmount);
609
	insterm.setInsuranceAmount(amountDecimal);
610
	insterm.setInsuranceCommission(itermCommission);
611
	if (!DataValidator.isEmptyString(itermCommissionAmount)){
612
		CommissionamountDecimal = new BigDecimal(itermCommissionAmount);
613
	}else{
614
		CommissionamountDecimal = new BigDecimal("0");
613

  
614
	public IbITerm populateITerm(String itermProductCode, String iterm,
615
			String itermCode, String itermAmount, String itermCommission, String itermCommissionAmount,
616
			String itermPlan, IbProductType productType)
617
	{
618
		IbITerm insterm = new IbITerm();
619
		BigDecimal CommissionamountDecimal = null;
620

  
621
		insterm.setInsuranceProductCode(itermProductCode);
622
		insterm.setInsuranceTerm(iterm);
623
		insterm.setInsuranceTermCode(itermCode);
624
		BigDecimal amountDecimal = new BigDecimal(itermAmount);
625
		insterm.setInsuranceAmount(amountDecimal);
626
		insterm.setInsuranceCommission(itermCommission);
627
		if (!DataValidator.isEmptyString(itermCommissionAmount)) {
628
			CommissionamountDecimal = new BigDecimal(itermCommissionAmount);
629
		} else {
630
			CommissionamountDecimal = new BigDecimal("0");
631
		}
632

  
633
		insterm.setInsuranceCommissionAmount(CommissionamountDecimal);
634
		insterm.setInsurancePlan(itermPlan);
635
		insterm.setIbProductType(productType);
636

  
637
		return insterm;
615 638
	}
616
	
617
	insterm.setInsuranceCommissionAmount(CommissionamountDecimal);
618
	insterm.setInsurancePlan(itermPlan);
619
	insterm.setIbProductType(productType);
620
		 
621
	return insterm;
622
	 }
623
	 
624
	
625 639

  
626
	public Map<String, String> populateSecurityQuestionAuditLogMap (IbSecQues secQues)
640
	public Map<String, String> populateSecurityQuestionAuditLogMap(IbSecQues secQues)
627 641
	{
628
		Map<String, String> editedMap = new LinkedHashMap<String, String> ();
629
		
630
		if(secQues != null)
642
		Map<String, String> editedMap = new LinkedHashMap<String, String>();
643

  
644
		if (secQues != null)
631 645
		{
632 646
			IbSecQuesML each;
633
			
634
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_security_ques_code"), 
635
					secQues.getQuesCode ());
636
			
637
			for(Iterator<IbSecQuesML> it = secQues.getSecurityQuestionMLs ().iterator (); it.hasNext ();)
647

  
648
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_security_ques_code"),
649
					secQues.getQuesCode());
650

  
651
			for (Iterator<IbSecQuesML> it = secQues.getSecurityQuestionMLs().iterator(); it.hasNext();)
638 652
			{
639
				each = it.next ();
640
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_security_ques_desc_general") + " " + each.getLocale (), 
641
						each.getQuesDesc ());
642
			}
643
		}
644
		return editedMap;
645
	}
646
	
647
	public Map<String, String> populateCheckDigitAuditLogMap (IbCheckDigit checkDigit)
648
	{
649
		Map<String, String> editedMap = new LinkedHashMap<String, String> ();
650
		
651
		if(checkDigit != null)
652
		{
653
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.accountLength"), 
654
					String.valueOf (checkDigit.getAccountLength ()));
655
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.checkDigitPosition"), 
656
					checkDigit.getCheckDigitPosition ());
657
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.baseNumberPosition"), 
658
					checkDigit.getBaseNumberPosition ());
659
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.bwOperator"), 
660
					checkDigit.getBwOperator ());
661
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.weightValue"), 
662
					checkDigit.getWeightValue ());
663
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.bwOperatorResult"), 
664
					checkDigit.getBwOperatorResult ());
665
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.totalSumDigit"), 
666
					TRUEFALSE.isTrue (checkDigit.getTotalSumDigit ()) ? 
667
							ResourcesUtils.getApplicationResourceMessage ("general.yes") :
668
								ResourcesUtils.getApplicationResourceMessage ("general.no"));
669
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.cdOperator"), 
670
					checkDigit.getCdOperator ());
671
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.denominatorValue"), 
672
					String.valueOf (checkDigit.getDenominatorValue ()));
673
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.rule1.flag"), 
674
					TRUEFALSE.isTrue (checkDigit.getRule1Flag ()) ? 
675
							ResourcesUtils.getApplicationResourceMessage ("general.yes") :
676
								ResourcesUtils.getApplicationResourceMessage ("general.no"));
677
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.rule1"), 
678
					"If remainder " + checkDigit.getRuleOperator1a () + 
679
					" " + checkDigit.getRuleValue1a () +
680
					" check digit = " + checkDigit.getRuleValue1b () + 
681
					" " + checkDigit.getRuleOperator1b () +
682
					" remainder");
683
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.rule2.flag"), 
684
					TRUEFALSE.isTrue (checkDigit.getRule2Flag ()) ? 
685
							ResourcesUtils.getApplicationResourceMessage ("general.yes") :
686
								ResourcesUtils.getApplicationResourceMessage ("general.no"));
687
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.rule2"), 
688
					"If remainder " + checkDigit.getRuleOperator2a () +
689
					" " + checkDigit.getRuleValue2a () +
690
					" check digit = " + checkDigit.getRuleValue2b () +
691
					" " + checkDigit.getRuleOperator2b () +
692
					" remainder");
693
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.rule3.flag"), 
694
					TRUEFALSE.isTrue (checkDigit.getRule3Flag ()) ? 
695
							ResourcesUtils.getApplicationResourceMessage ("general.yes") :
696
								ResourcesUtils.getApplicationResourceMessage ("general.no"));
697
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.rule3"), 
698
					"Check digit = " + checkDigit.getRuleValue3a () + 
699
					" " + checkDigit.getRuleOperator3a () + " remainder");
700
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.rule4.flag"), 
701
					TRUEFALSE.isTrue (checkDigit.getRule4Flag ()) ? 
702
							ResourcesUtils.getApplicationResourceMessage ("general.yes") :
703
								ResourcesUtils.getApplicationResourceMessage ("general.no"));
704
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.rule4"), 
705
					"If remainder " + checkDigit.getRuleOperator4a () + 
706
					" " + checkDigit.getRuleValue4a () + ", check digit = remainder ");
707
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.rule5.flag"), 
708
					TRUEFALSE.isTrue (checkDigit.getRule5Flag ()) ? 
709
							ResourcesUtils.getApplicationResourceMessage ("general.yes") :
710
								ResourcesUtils.getApplicationResourceMessage ("general.no"));
711
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.payee.rule5"), 
712
					"If remainder = " + checkDigit.getRuleValue5a () + 
713
					", check digit = " + checkDigit.getRuleValue5b ());
714
		}
715
		return editedMap;
716
	}
717
	
718
	public Map<String, String> populateServiceInfoAuditLogMap (IbServiceInfo service)
719
	{
720
		Map<String, String> editedMap = new LinkedHashMap<String, String> ();
721
		
722
		if(service != null)
723
		{
724
			IbServiceInfoML each;
725
			
726
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_code"), 
727
					service.getServiceCode ());
728
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_name"), 
729
					service.getServiceName ());
730
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_status"), 
731
					service.isOnline () ? ResourcesUtils.getApplicationResourceMessage ("general.online") : 
732
					ResourcesUtils.getApplicationResourceMessage ("general.offline"));
733
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_min_limit"), 
734
					String.valueOf (service.getMinLimit ()));
735
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_max_limit"), 
736
					String.valueOf (service.getMaxLimit ()));
737
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_denominator"), 
738
					String.valueOf (service.getDenominator ()));
739
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_table_limit"), 
740
					String.valueOf (service.getTableLimit ()));
741
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_future_trnx_flag"), 
742
					service.getFutureTransactionFlag () != null ? String.valueOf (service.getFutureTransactionFlag ()) : null);
743
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_def_charges_1"), 
744
					service.getDefaultCharges1 ());
745
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_tier_charges_req_1"), 
746
					service.isTierCharges1Required () ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
747
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
748
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_tier_charges_1"), 
749
					service.getChargeCode1 ());
750
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_def_charges_2"), 
751
					service.getDefaultCharges2 ());
752
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_tier_charges_req_2"), 
753
					service.isTierCharges2Required () ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
754
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
755
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_tier_charges_2"), 
756
					service.getChargeCode2 ());
757
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_def_charges_3"), 
758
					service.getDefaultCharges3 ());
759
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_tier_charges_req_3"), 
760
					service.isTierCharges3Required () ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
761
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
762
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_tier_charges_3"), 
763
					service.getChargeCode3 ());
764
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_def_charges_4"), 
765
					service.getDefaultCharges4 ());
766
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_tier_charges_req_4"), 
767
					service.isTierCharges4Required () ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
768
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
769
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_tier_charges_4"), 
770
					service.getChargeCode4 ());
771
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_def_charges_5"), 
772
					service.getDefaultCharges5 ());
773
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_tier_charges_req_5"), 
774
					service.isTierCharges5Required () ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
775
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
776
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_tier_charges_5"), 
777
					service.getChargeCode5 ());
778
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_tac_required"), 
779
					service.isTacRequirement() ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
780
						ResourcesUtils.getApplicationResourceMessage ("general.no"));
781
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_sms_service_bit"), 
782
					service.isSMSSenderRequired () ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
783
						ResourcesUtils.getApplicationResourceMessage ("general.no"));
784
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_min_sms_amount"), 
785
					String.valueOf(service.getMinimumSmsAmount()));
786
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_bene_sms_service_bit"), 
787
					service.isSMSBeneficiaryAllowed () ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
788
						ResourcesUtils.getApplicationResourceMessage ("general.no"));
789
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_bene_sms_charges"), 
790
					String.valueOf(service.getBeneSmsCharges()));
791
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_sms_note5"), 
792
					service.getSmsNote5 ());
793
			for(Iterator<IbServiceInfoML> it = service.getServiceInfoMLs ().iterator (); it.hasNext ();)
794
			{
795
				each = it.next ();
796
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_main_note_1") 
797
						+ " " + each.getLocale (), each.getMainNote1 ());
798
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_main_note_2") 
799
						+ " " + each.getLocale (), each.getMainNote2 ());
800
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_main_note_3") 
801
						+ " " + each.getLocale (), each.getMainNote3 ());
802
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_main_note_4") 
803
						+ " " + each.getLocale (), each.getMainNote4 ());
804
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_main_note_5") 
805
						+ " " + each.getLocale (), each.getMainNote5 ());
806
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_main_note_6") 
807
						+ " " + each.getLocale (), each.getMainNote6 ());
808
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_offline_message") 
809
						+ " " + each.getLocale (), each.getOfflineMessage ());
810
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_sms_note1") 
811
						+ " " + each.getLocale (), each.getSmsNote1 ());
812
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_sms_note2") 
813
						+ " " + each.getLocale (), each.getSmsNote2 ());
814
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_sms_note3") 
815
						+ " " + each.getLocale (), each.getSmsNote3 ());
816
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_sms_note4") 
817
						+ " " + each.getLocale (), each.getSmsNote4 ());
818
			
653
				each = it.next();
654
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_security_ques_desc_general") + " "
655
						+ each.getLocale(),
656
						each.getQuesDesc());
819 657
			}
820 658
		}
821 659
		return editedMap;
822 660
	}
823 661

  
824
	
662
	public Map<String, String> populateCheckDigitAuditLogMap(IbCheckDigit checkDigit)
663
	{
664
		Map<String, String> editedMap = new LinkedHashMap<String, String>();
665

  
666
		if (checkDigit != null)
667
		{
668
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.accountLength"),
669
					String.valueOf(checkDigit.getAccountLength()));
670
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.checkDigitPosition"),
671
					checkDigit.getCheckDigitPosition());
672
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.baseNumberPosition"),
673
					checkDigit.getBaseNumberPosition());
674
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.bwOperator"),
675
					checkDigit.getBwOperator());
676
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.weightValue"),
677
					checkDigit.getWeightValue());
678
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.bwOperatorResult"),
679
					checkDigit.getBwOperatorResult());
680
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.totalSumDigit"),
681
					TRUEFALSE.isTrue(checkDigit.getTotalSumDigit()) ?
682
							ResourcesUtils.getApplicationResourceMessage("general.yes") :
683
							ResourcesUtils.getApplicationResourceMessage("general.no"));
684
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.cdOperator"),
685
					checkDigit.getCdOperator());
686
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.denominatorValue"),
687
					String.valueOf(checkDigit.getDenominatorValue()));
688
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.rule1.flag"),
689
					TRUEFALSE.isTrue(checkDigit.getRule1Flag()) ?
690
							ResourcesUtils.getApplicationResourceMessage("general.yes") :
691
							ResourcesUtils.getApplicationResourceMessage("general.no"));
692
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.rule1"),
693
					"If remainder " + checkDigit.getRuleOperator1a() +
694
							" " + checkDigit.getRuleValue1a() +
695
							" check digit = " + checkDigit.getRuleValue1b() +
696
							" " + checkDigit.getRuleOperator1b() +
697
							" remainder");
698
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.rule2.flag"),
699
					TRUEFALSE.isTrue(checkDigit.getRule2Flag()) ?
700
							ResourcesUtils.getApplicationResourceMessage("general.yes") :
701
							ResourcesUtils.getApplicationResourceMessage("general.no"));
702
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.rule2"),
703
					"If remainder " + checkDigit.getRuleOperator2a() +
704
							" " + checkDigit.getRuleValue2a() +
705
							" check digit = " + checkDigit.getRuleValue2b() +
706
							" " + checkDigit.getRuleOperator2b() +
707
							" remainder");
708
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.rule3.flag"),
709
					TRUEFALSE.isTrue(checkDigit.getRule3Flag()) ?
710
							ResourcesUtils.getApplicationResourceMessage("general.yes") :
711
							ResourcesUtils.getApplicationResourceMessage("general.no"));
712
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.rule3"),
713
					"Check digit = " + checkDigit.getRuleValue3a() +
714
							" " + checkDigit.getRuleOperator3a() + " remainder");
715
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.rule4.flag"),
716
					TRUEFALSE.isTrue(checkDigit.getRule4Flag()) ?
717
							ResourcesUtils.getApplicationResourceMessage("general.yes") :
718
							ResourcesUtils.getApplicationResourceMessage("general.no"));
719
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.rule4"),
720
					"If remainder " + checkDigit.getRuleOperator4a() +
721
							" " + checkDigit.getRuleValue4a() + ", check digit = remainder ");
722
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.rule5.flag"),
723
					TRUEFALSE.isTrue(checkDigit.getRule5Flag()) ?
724
							ResourcesUtils.getApplicationResourceMessage("general.yes") :
725
							ResourcesUtils.getApplicationResourceMessage("general.no"));
726
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.payee.rule5"),
727
					"If remainder = " + checkDigit.getRuleValue5a() +
728
							", check digit = " + checkDigit.getRuleValue5b());
729
		}
730
		return editedMap;
731
	}
732

  
733
	public Map<String, String> populateServiceInfoAuditLogMap(IbServiceInfo service)
734
	{
735
		Map<String, String> editedMap = new LinkedHashMap<String, String>();
736

  
737
		if (service != null)
738
		{
739
			IbServiceInfoML each;
740

  
741
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_code"),
742
					service.getServiceCode());
743
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_name"),
744
					service.getServiceName());
745
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_status"),
746
					service.isOnline() ? ResourcesUtils.getApplicationResourceMessage("general.online") :
747
							ResourcesUtils.getApplicationResourceMessage("general.offline"));
748
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_min_limit"),
749
					String.valueOf(service.getMinLimit()));
750
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_max_limit"),
751
					String.valueOf(service.getMaxLimit()));
752
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_denominator"),
753
					String.valueOf(service.getDenominator()));
754
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_table_limit"),
755
					String.valueOf(service.getTableLimit()));
756
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_future_trnx_flag"),
757
					service.getFutureTransactionFlag() != null ? String.valueOf(service.getFutureTransactionFlag())
758
							: null);
759
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_def_charges_1"),
760
					service.getDefaultCharges1());
761
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_tier_charges_req_1"),
762
					service.isTierCharges1Required() ? ResourcesUtils.getApplicationResourceMessage("general.yes") :
763
							ResourcesUtils.getApplicationResourceMessage("general.no"));
764
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_tier_charges_1"),
765
					service.getChargeCode1());
766
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_def_charges_2"),
767
					service.getDefaultCharges2());
768
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_tier_charges_req_2"),
769
					service.isTierCharges2Required() ? ResourcesUtils.getApplicationResourceMessage("general.yes") :
770
							ResourcesUtils.getApplicationResourceMessage("general.no"));
771
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_tier_charges_2"),
772
					service.getChargeCode2());
773
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_def_charges_3"),
774
					service.getDefaultCharges3());
775
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_tier_charges_req_3"),
776
					service.isTierCharges3Required() ? ResourcesUtils.getApplicationResourceMessage("general.yes") :
777
							ResourcesUtils.getApplicationResourceMessage("general.no"));
778
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_tier_charges_3"),
779
					service.getChargeCode3());
780
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_def_charges_4"),
781
					service.getDefaultCharges4());
782
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_tier_charges_req_4"),
783
					service.isTierCharges4Required() ? ResourcesUtils.getApplicationResourceMessage("general.yes") :
784
							ResourcesUtils.getApplicationResourceMessage("general.no"));
785
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_tier_charges_4"),
786
					service.getChargeCode4());
787
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_def_charges_5"),
788
					service.getDefaultCharges5());
789
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_tier_charges_req_5"),
790
					service.isTierCharges5Required() ? ResourcesUtils.getApplicationResourceMessage("general.yes") :
791
							ResourcesUtils.getApplicationResourceMessage("general.no"));
792
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_tier_charges_5"),
793
					service.getChargeCode5());
794
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_tac_required"),
795
					service.isTacRequirement() ? ResourcesUtils.getApplicationResourceMessage("general.yes") :
796
							ResourcesUtils.getApplicationResourceMessage("general.no"));
797
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_sms_service_bit"),
798
					service.isSMSSenderRequired() ? ResourcesUtils.getApplicationResourceMessage("general.yes") :
799
							ResourcesUtils.getApplicationResourceMessage("general.no"));
800
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_min_sms_amount"),
801
					String.valueOf(service.getMinimumSmsAmount()));
802
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_bene_sms_service_bit"),
803
					service.isSMSBeneficiaryAllowed() ? ResourcesUtils.getApplicationResourceMessage("general.yes") :
804
							ResourcesUtils.getApplicationResourceMessage("general.no"));
805
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_bene_sms_charges"),
806
					String.valueOf(service.getBeneSmsCharges()));
807
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_sms_note5"),
808
					service.getSmsNote5());
809
			for (Iterator<IbServiceInfoML> it = service.getServiceInfoMLs().iterator(); it.hasNext();)
810
			{
811
				each = it.next();
812
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_main_note_1")
813
						+ " " + each.getLocale(), each.getMainNote1());
814
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_main_note_2")
815
						+ " " + each.getLocale(), each.getMainNote2());
816
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_main_note_3")
817
						+ " " + each.getLocale(), each.getMainNote3());
818
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_main_note_4")
819
						+ " " + each.getLocale(), each.getMainNote4());
820
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_main_note_5")
821
						+ " " + each.getLocale(), each.getMainNote5());
822
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_main_note_6")
823
						+ " " + each.getLocale(), each.getMainNote6());
824
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_offline_message")
825
						+ " " + each.getLocale(), each.getOfflineMessage());
826
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_sms_note1")
827
						+ " " + each.getLocale(), each.getSmsNote1());
828
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_sms_note2")
829
						+ " " + each.getLocale(), each.getSmsNote2());
830
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_sms_note3")
831
						+ " " + each.getLocale(), each.getSmsNote3());
832
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_sms_note4")
833
						+ " " + each.getLocale(), each.getSmsNote4());
834

  
835
			}
836
		}
837
		return editedMap;
838
	}
839

  
825 840
	public Map<String, String> populateInterbankAuditLogMap(
826 841
			IbBancnetList interbank) {
827 842
		Map<String, String> editedMap = new LinkedHashMap<String, String>();
......
832 847
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_bancnet_list_code"),
833 848
					interbank.getBankCode());
834 849

  
835
			for(Iterator<IbBancnetListML> it = interbank.getBancnetListMLs().iterator(); it.hasNext();)
850
			for (Iterator<IbBancnetListML> it = interbank.getBancnetListMLs().iterator(); it.hasNext();)
836 851
			{
837 852
				each = it.next();
838
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_bancnet_list_name") + " " + each.getLocale(),
853
				editedMap.put(
854
						ResourcesUtils.getApplicationResourceMessage("content_bancnet_list_name") + " "
855
								+ each.getLocale(),
839 856
						each.getBankName());
840 857
			}
841
		}		
858
		}
842 859
		return editedMap;
843 860
	}
844 861

  
......
847 864
		Map<String, String> editedMap = new LinkedHashMap<String, String>();
848 865
		if (product != null)
849 866
		{
850
		IbProductTypeML each;
851
		
852
		editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_product_code"),
853
				product.getProductCode ());
854
		editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_product_account_type"),
855
				product.getAccountType ());
856
		editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_product_currency_code"),
857
				product.getCurrencyCode ());
858
		editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_product_min_amount"),
859
				product.getMinAmount () != null ? product.getMinAmount ().toString () : "");
860
	
861
		for(Iterator<IbProductTypeML> it = product.getIbProductTypeMLs().iterator (); it.hasNext ();)
862
		{
863
			each = it.next ();
864
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_product_display_name_general") 
865
					+ " " + each.getLocale (), each.getDisplayName ());
866
		}
867
		
867
			IbProductTypeML each;
868

  
869
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_product_code"),
870
					product.getProductCode());
871
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_product_account_type"),
872
					product.getAccountType());
873
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_product_currency_code"),
874
					product.getCurrencyCode());
875
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_product_min_amount"),
876
					product.getMinAmount() != null ? product.getMinAmount().toString() : "");
877

  
878
			for (Iterator<IbProductTypeML> it = product.getIbProductTypeMLs().iterator(); it.hasNext();)
879
			{
880
				each = it.next();
881
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_product_display_name_general")
882
						+ " " + each.getLocale(), each.getDisplayName());
883
			}
884

  
868 885
		}
869 886
		return editedMap;
870
	}	
871
	
887
	}
888

  
872 889
	public Map<String, String> populateBankBranchAuditLogMap(
873 890
			IbBankBranch branch) {
874 891
		IbBankBranchML each;
875 892
		Map<String, String> editedMap = new LinkedHashMap<String, String>();
876
		
893

  
877 894
		editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_bank_branch_code"),
878 895
				branch.getBranchCode());
879 896
		editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_bank_branch_area_code"),
880
				branch.getAreaCode ());
881
		
882
		for(Iterator<IbBankBranchML> it = branch.getBankBranchMLs().iterator(); it.hasNext();)
897
				branch.getAreaCode());
898

  
899
		for (Iterator<IbBankBranchML> it = branch.getBankBranchMLs().iterator(); it.hasNext();)
883 900
		{
884 901
			each = it.next();
885
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_bank_branch_name_general") + " " + each.getLocale(),
902
			editedMap.put(
903
					ResourcesUtils.getApplicationResourceMessage("content_bank_branch_name_general") + " "
904
							+ each.getLocale(),
886 905
					each.getBranchName());
887 906
		}
888 907
		return editedMap;
889
	}	
890
	
908
	}
909

  
891 910
	public Map<String, String> populateTieredChargesContent(
892 911
			IbTierCharges tiercharges) {
893 912
		IbTierChargesLVL each;
894 913
		Map<String, String> editedMap = new LinkedHashMap<String, String>();
895
		
914

  
896 915
		editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_tier_charges_code"),
897 916
				tiercharges.getChargeCode());
898
		
899
		for(Iterator<IbTierChargesLVL> it = tiercharges.getTierChargesLVLs().iterator(); it.hasNext();)
917

  
918
		for (Iterator<IbTierChargesLVL> it = tiercharges.getTierChargesLVLs().iterator(); it.hasNext();)
900 919
		{
901 920
			each = it.next();
902
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_tier_charges_list_name") + " " + each.getOid(),
903
					each.getCharge_amount().toPlainString ());
921
			editedMap.put(
922
					ResourcesUtils.getApplicationResourceMessage("content_tier_charges_list_name") + " "
923
							+ each.getOid(),
924
					each.getCharge_amount().toPlainString());
904 925
		}
905 926
		return editedMap;
906 927
	}
907
	
908
	public Map<String, String> populatePayeeAuditLogMap (IbPayee payee, List<IbCheckDigit> checkDigits)
928

  
929
	public Map<String, String> populatePayeeAuditLogMap(IbPayee payee, List<IbCheckDigit> checkDigits)
909 930
	{
910
		Map<String, String> editedMap = new LinkedHashMap<String, String> ();
911
		Map<Integer, String> checkDigitMap = new HashMap<Integer, String> ();
912
		DecimalFormat df = new DecimalFormat ("##########0.00");
913
		
914
		if(payee != null)
931
		Map<String, String> editedMap = new LinkedHashMap<String, String>();
932
		Map<Integer, String> checkDigitMap = new HashMap<Integer, String>();
933
		DecimalFormat df = new DecimalFormat("##########0.00");
934

  
935
		if (payee != null)
915 936
		{
916
			if(!checkDigits.isEmpty ())
937
			if (!checkDigits.isEmpty())
917 938
			{
918 939
				IbCheckDigit each;
919
				
920
				for(Iterator<IbCheckDigit> it = checkDigits.iterator ();it.hasNext ();)
940

  
941
				for (Iterator<IbCheckDigit> it = checkDigits.iterator(); it.hasNext();)
921 942
				{
922
					each = it.next ();
923
					checkDigitMap.put (each.getCkOid (), each.getTotalSumDigit().toString());
943
					each = it.next();
944
					checkDigitMap.put(each.getCkOid(), each.getTotalSumDigit().toString());
924 945
				}
925 946
			}
926
			
947

  
927 948
			IbPayeeML each;
928
			
929
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_service_code"), 
930
					payee.getPayeeCode ());
931
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_service_code"), 
949

  
950
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_service_code"),
951
					payee.getPayeeCode());
952
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_service_code"),
932 953
					payee.getPayeeProductCode());
933
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_payee_acc_type"), 
954
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_payee_acc_type"),
934 955
					payee.getPayeeType());
935
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_status"), 
936
					TRUEFALSE.isTrue (payee.getStatus ()) ? ResourcesUtils.getApplicationResourceMessage ("general.online") : 
937
					ResourcesUtils.getApplicationResourceMessage ("general.offline"));
938
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_online_payment"), 
939
					TRUEFALSE.isTrue (payee.getOnlinePayment ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
940
						ResourcesUtils.getApplicationResourceMessage ("general.no"));
941
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_bill_ref_1_req"), 
942
					TRUEFALSE.isTrue (payee.getBillRef1Req ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
943
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
944
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_charge_amt"), 
945
					payee.getChargeAmt () != null ? df.format (payee.getChargeAmt ()) : null);
946
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_image_req"), 
947
					TRUEFALSE.isTrue (payee.getImageReq ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
948
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
949
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_image_url"), 
950
					payee.getImageUrl ());
951
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_favour_register_indi"), 
952
					TRUEFALSE.isTrue (payee.getFavRegisterIndi ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
953
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
954
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_effective_date"), 
955
					TRUEFALSE.isTrue (payee.getEffectiveDate ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
956
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
957
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_min_payment"), 
958
					TRUEFALSE.isTrue (payee.getMinPayment ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
959
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
960
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_min_payment_amount"), 
961
					payee.getMinPaymentAmount () != null ? df.format (payee.getMinPaymentAmount ()) : null);
962
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_max_payment"), 
963
					TRUEFALSE.isTrue (payee.getMaxPayment ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
964
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
965
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_max_payment_amount"), 
966
					payee.getMaxPaymentAmount () != null ? df.format (payee.getMaxPaymentAmount ()) : null);
967
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_payment_type"), 
968
					payee.getPaymentType () != null ? df.format (payee.getPaymentType ()) : null);
969
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_amount_type"), 
970
					payee.getAmountType () == 0 ? "Free Input" : "Fixed Amount");
971
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_fix_amount"), 
972
					payee.getFixAmount () != null ? df.format (payee.getFixAmount ()) : null);
973
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_bill_ref_1_req"), 
974
					TRUEFALSE.isTrue (payee.getBillRef1Req ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
975
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
976
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_bill_ref_1_disp_name_req"), 
977
					TRUEFALSE.isTrue (payee.getBillRef1DispNameReq ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
978
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
979
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_bill_ref_1_disp_name_req"), 
980
					TRUEFALSE.isTrue (payee.getBillRef1Mandatory ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
981
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
982
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_bill_ref_1_host_field"), 
983
					payee.getBillRef1HostField ());
984
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_image_ref_1_req"), 
985
					TRUEFALSE.isTrue (payee.getImageRef1Req ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
986
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
987
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_image_ref_1_url"), 
988
					payee.getImageRef1Url ());
989
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_bill_ref_2_req"), 
990
					TRUEFALSE.isTrue (payee.getBillRef2Req ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
991
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
992
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_bill_ref_2_disp_name_req"), 
993
					TRUEFALSE.isTrue (payee.getBillRef2DispNameReq ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
994
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
995
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_bill_ref_2_disp_name_req"), 
996
					TRUEFALSE.isTrue (payee.getBillRef2Mandatory ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
997
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
998
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_bill_ref_2_host_field"), 
999
					payee.getBillRef2HostField ());
1000
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_bill_ref_2_req"), 
1001
					TRUEFALSE.isTrue (payee.getImageRef2Req ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
1002
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
1003
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_image_ref_2_url"), 
1004
					payee.getImageRef2Url ());
1005
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.required"), 
1006
					TRUEFALSE.isTrue (payee.getCheckDigitForBillRef1Req ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
1007
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
1008
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.name"), 
1009
					checkDigitMap.get (payee.getBillRef1CkOid ()));
1010
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.custom.rule.required"), 
1011
					TRUEFALSE.isTrue (payee.getCustomRuleForBillRef1Req ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
1012
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
1013
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.split.rule.required"), 
1014
					TRUEFALSE.isTrue (payee.getSplitRuleForBillRef1Req ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
1015
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
1016
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.split.rule.name"), 
1017
					checkDigitMap.get (payee.getBillRef1Ck2Oid ()));
1018
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.conditional.rule"), 
1019
					TRUEFALSE.isTrue (payee.getCheckDigitConditionalFunctionForBillRef1 ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
1020
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
1021
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.program.name"), 
1022
					checkDigitMap.get (payee.getProgramNameForBillRef1 ()));
1023
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.required"), 
1024
					TRUEFALSE.isTrue (payee.getCheckDigitForBillRef2Req ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
1025
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
1026
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.name"), 
1027
					checkDigitMap.get (payee.getBillRef2CkOid ()));
1028
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.custom.rule.required"), 
1029
					TRUEFALSE.isTrue (payee.getCustomRuleForBillRef2Req ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
1030
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
1031
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.split.rule.required"), 
1032
					TRUEFALSE.isTrue (payee.getSplitRuleForBillRef2Req ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
1033
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
1034
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.split.rule.name"), 
1035
					checkDigitMap.get (payee.getBillRef2Ck2Oid ()));
1036
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.conditional.rule"), 
1037
					TRUEFALSE.isTrue (payee.getCheckDigitConditionalFunctionForBillRef2 ()) ? ResourcesUtils.getApplicationResourceMessage ("general.yes") : 
1038
					ResourcesUtils.getApplicationResourceMessage ("general.no"));
1039
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content.check.digit.ref1.program.name"), 
1040
					checkDigitMap.get (payee.getProgramNameForBillRef2 ()));
1041
			
1042
			for(Iterator<IbPayeeML> it = payee.getPayeeMLs ().iterator (); it.hasNext ();)
956
			editedMap.put(
957
					ResourcesUtils.getApplicationResourceMessage("content_status"),
958
					TRUEFALSE.isTrue(payee.getStatus()) ? ResourcesUtils
959
							.getApplicationResourceMessage("general.online") :
960
							ResourcesUtils.getApplicationResourceMessage("general.offline"));
961
			editedMap.put(
962
					ResourcesUtils.getApplicationResourceMessage("content_payee_online_payment"),
963
					TRUEFALSE.isTrue(payee.getOnlinePayment()) ? ResourcesUtils
964
							.getApplicationResourceMessage("general.yes") :
965
							ResourcesUtils.getApplicationResourceMessage("general.no"));
966
			editedMap.put(
967
					ResourcesUtils.getApplicationResourceMessage("content_payee_bill_ref_1_req"),
968
					TRUEFALSE.isTrue(payee.getBillRef1Req()) ? ResourcesUtils
969
							.getApplicationResourceMessage("general.yes") :
970
							ResourcesUtils.getApplicationResourceMessage("general.no"));
971
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_charge_amt"),
972
					payee.getChargeAmt() != null ? df.format(payee.getChargeAmt()) : null);
973
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_image_req"),
974
					TRUEFALSE.isTrue(payee.getImageReq()) ? ResourcesUtils.getApplicationResourceMessage("general.yes")
975
							:
976
							ResourcesUtils.getApplicationResourceMessage("general.no"));
977
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_image_url"),
978
					payee.getImageUrl());
979
			editedMap.put(
980
					ResourcesUtils.getApplicationResourceMessage("content_payee_favour_register_indi"),
981
					TRUEFALSE.isTrue(payee.getFavRegisterIndi()) ? ResourcesUtils
982
							.getApplicationResourceMessage("general.yes") :
983
							ResourcesUtils.getApplicationResourceMessage("general.no"));
984
			editedMap.put(
985
					ResourcesUtils.getApplicationResourceMessage("content_payee_effective_date"),
986
					TRUEFALSE.isTrue(payee.getEffectiveDate()) ? ResourcesUtils
987
							.getApplicationResourceMessage("general.yes") :
988
							ResourcesUtils.getApplicationResourceMessage("general.no"));
989
			editedMap.put(
990
					ResourcesUtils.getApplicationResourceMessage("content_payee_min_payment"),
991
					TRUEFALSE.isTrue(payee.getMinPayment()) ? ResourcesUtils
992
							.getApplicationResourceMessage("general.yes") :
993
							ResourcesUtils.getApplicationResourceMessage("general.no"));
994
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_min_payment_amount"),
995
					payee.getMinPaymentAmount() != null ? df.format(payee.getMinPaymentAmount()) : null);
996
			editedMap.put(
997
					ResourcesUtils.getApplicationResourceMessage("content_payee_max_payment"),
998
					TRUEFALSE.isTrue(payee.getMaxPayment()) ? ResourcesUtils
999
							.getApplicationResourceMessage("general.yes") :
1000
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1001
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_max_payment_amount"),
1002
					payee.getMaxPaymentAmount() != null ? df.format(payee.getMaxPaymentAmount()) : null);
1003
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_payment_type"),
1004
					payee.getPaymentType() != null ? df.format(payee.getPaymentType()) : null);
1005
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_amount_type"),
1006
					payee.getAmountType() == 0 ? "Free Input" : "Fixed Amount");
1007
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_fix_amount"),
1008
					payee.getFixAmount() != null ? df.format(payee.getFixAmount()) : null);
1009
			editedMap.put(
1010
					ResourcesUtils.getApplicationResourceMessage("content_payee_bill_ref_1_req"),
1011
					TRUEFALSE.isTrue(payee.getBillRef1Req()) ? ResourcesUtils
1012
							.getApplicationResourceMessage("general.yes") :
1013
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1014
			editedMap.put(
1015
					ResourcesUtils.getApplicationResourceMessage("content_payee_bill_ref_1_disp_name_req"),
1016
					TRUEFALSE.isTrue(payee.getBillRef1DispNameReq()) ? ResourcesUtils
1017
							.getApplicationResourceMessage("general.yes") :
1018
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1019
			editedMap.put(
1020
					ResourcesUtils.getApplicationResourceMessage("content_payee_bill_ref_1_disp_name_req"),
1021
					TRUEFALSE.isTrue(payee.getBillRef1Mandatory()) ? ResourcesUtils
1022
							.getApplicationResourceMessage("general.yes") :
1023
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1024
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_bill_ref_1_host_field"),
1025
					payee.getBillRef1HostField());
1026
			editedMap.put(
1027
					ResourcesUtils.getApplicationResourceMessage("content_payee_image_ref_1_req"),
1028
					TRUEFALSE.isTrue(payee.getImageRef1Req()) ? ResourcesUtils
1029
							.getApplicationResourceMessage("general.yes") :
1030
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1031
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_image_ref_1_url"),
1032
					payee.getImageRef1Url());
1033
			editedMap.put(
1034
					ResourcesUtils.getApplicationResourceMessage("content_payee_bill_ref_2_req"),
1035
					TRUEFALSE.isTrue(payee.getBillRef2Req()) ? ResourcesUtils
1036
							.getApplicationResourceMessage("general.yes") :
1037
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1038
			editedMap.put(
1039
					ResourcesUtils.getApplicationResourceMessage("content_payee_bill_ref_2_disp_name_req"),
1040
					TRUEFALSE.isTrue(payee.getBillRef2DispNameReq()) ? ResourcesUtils
1041
							.getApplicationResourceMessage("general.yes") :
1042
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1043
			editedMap.put(
1044
					ResourcesUtils.getApplicationResourceMessage("content_payee_bill_ref_2_disp_name_req"),
1045
					TRUEFALSE.isTrue(payee.getBillRef2Mandatory()) ? ResourcesUtils
1046
							.getApplicationResourceMessage("general.yes") :
1047
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1048
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_bill_ref_2_host_field"),
1049
					payee.getBillRef2HostField());
1050
			editedMap.put(
1051
					ResourcesUtils.getApplicationResourceMessage("content_payee_bill_ref_2_req"),
1052
					TRUEFALSE.isTrue(payee.getImageRef2Req()) ? ResourcesUtils
1053
							.getApplicationResourceMessage("general.yes") :
1054
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1055
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_image_ref_2_url"),
1056
					payee.getImageRef2Url());
1057
			editedMap.put(
1058
					ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.required"),
1059
					TRUEFALSE.isTrue(payee.getCheckDigitForBillRef1Req()) ? ResourcesUtils
1060
							.getApplicationResourceMessage("general.yes") :
1061
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1062
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.name"),
1063
					checkDigitMap.get(payee.getBillRef1CkOid()));
1064
			editedMap.put(
1065
					ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.custom.rule.required"),
1066
					TRUEFALSE.isTrue(payee.getCustomRuleForBillRef1Req()) ? ResourcesUtils
1067
							.getApplicationResourceMessage("general.yes") :
1068
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1069
			editedMap.put(
1070
					ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.split.rule.required"),
1071
					TRUEFALSE.isTrue(payee.getSplitRuleForBillRef1Req()) ? ResourcesUtils
1072
							.getApplicationResourceMessage("general.yes") :
1073
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1074
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.split.rule.name"),
1075
					checkDigitMap.get(payee.getBillRef1Ck2Oid()));
1076
			editedMap.put(
1077
					ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.conditional.rule"),
1078
					TRUEFALSE.isTrue(payee.getCheckDigitConditionalFunctionForBillRef1()) ? ResourcesUtils
1079
							.getApplicationResourceMessage("general.yes") :
1080
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1081
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.program.name"),
1082
					checkDigitMap.get(payee.getProgramNameForBillRef1()));
1083
			editedMap.put(
1084
					ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.required"),
1085
					TRUEFALSE.isTrue(payee.getCheckDigitForBillRef2Req()) ? ResourcesUtils
1086
							.getApplicationResourceMessage("general.yes") :
1087
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1088
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.name"),
1089
					checkDigitMap.get(payee.getBillRef2CkOid()));
1090
			editedMap.put(
1091
					ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.custom.rule.required"),
1092
					TRUEFALSE.isTrue(payee.getCustomRuleForBillRef2Req()) ? ResourcesUtils
1093
							.getApplicationResourceMessage("general.yes") :
1094
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1095
			editedMap.put(
1096
					ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.split.rule.required"),
1097
					TRUEFALSE.isTrue(payee.getSplitRuleForBillRef2Req()) ? ResourcesUtils
1098
							.getApplicationResourceMessage("general.yes") :
1099
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1100
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.split.rule.name"),
1101
					checkDigitMap.get(payee.getBillRef2Ck2Oid()));
1102
			editedMap.put(
1103
					ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.conditional.rule"),
1104
					TRUEFALSE.isTrue(payee.getCheckDigitConditionalFunctionForBillRef2()) ? ResourcesUtils
1105
							.getApplicationResourceMessage("general.yes") :
1106
							ResourcesUtils.getApplicationResourceMessage("general.no"));
1107
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("content.check.digit.ref1.program.name"),
1108
					checkDigitMap.get(payee.getProgramNameForBillRef2()));
1109

  
1110
			for (Iterator<IbPayeeML> it = payee.getPayeeMLs().iterator(); it.hasNext();)
1043 1111
			{
1044
				each = it.next ();
1045
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_full_name_general") 
1046
						+ " " + each.getLocale (), each.getFullName());
1047
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_bill_account_display_name_general") 
1048
						+ " " + each.getLocale (), each.getBillAccDisplayName());
1049
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_bill_ref_1_disp_name_general") 
1050
						+ " " + each.getLocale (), each.getBillRef1DisplayName());
1051
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_bill_ref_2_disp_name_general") 
1052
						+ " " + each.getLocale (), each.getBillRef2DisplayName());
1053
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_note1") 
1054
						+ " " + each.getLocale (), each.getNote1 ());
1055
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_note2") 
1056
						+ " " + each.getLocale (), each.getNote2 ());
1057
				editedMap.put (ResourcesUtils.getApplicationResourceMessage ("content_payee_note3") 
1058
						+ " " + each.getLocale (), each.getNote3 ());
1112
				each = it.next();
1113
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_full_name_general")
1114
						+ " " + each.getLocale(), each.getFullName());
1115
				editedMap.put(
1116
						ResourcesUtils.getApplicationResourceMessage("content_payee_bill_account_display_name_general")
1117
								+ " " + each.getLocale(), each.getBillAccDisplayName());
1118
				editedMap.put(
1119
						ResourcesUtils.getApplicationResourceMessage("content_payee_bill_ref_1_disp_name_general")
1120
								+ " " + each.getLocale(), each.getBillRef1DisplayName());
1121
				editedMap.put(
1122
						ResourcesUtils.getApplicationResourceMessage("content_payee_bill_ref_2_disp_name_general")
1123
								+ " " + each.getLocale(), each.getBillRef2DisplayName());
1124
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_note1")
1125
						+ " " + each.getLocale(), each.getNote1());
1126
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_note2")
1127
						+ " " + each.getLocale(), each.getNote2());
1128
				editedMap.put(ResourcesUtils.getApplicationResourceMessage("content_payee_note3")
1129
						+ " " + each.getLocale(), each.getNote3());
1059 1130
			}
1060 1131
		}
1061 1132
		return editedMap;
......
1064 1135
	public Map<String, String> populateCompanyProfileAuditLogMap(
1065 1136
			BibCompany p_oCompany) {
1066 1137
		Map<String, String> editedMap = new LinkedHashMap<String, String>();
1067
		
1138

  
1068 1139
		editedMap.put(ResourcesUtils.getApplicationResourceMessage("company.enquiry.company.id"),
1069 1140
				String.valueOf(p_oCompany.getUserDefineCompanyId()));
1070
		
1141

  
1071 1142
		return editedMap;
1072 1143
	}
1073
	
1074
	public Map<String, String> populateCompanyAccountManagementAuditLogMap (
1144

  
1145
	public Map<String, String> populateCompanyAccountManagementAuditLogMap(
1075 1146
			String p_sCompanyId, String p_sUserId,
1076 1147
			Map<String, String> integrationErrorMap)
1077 1148
	{
1078 1149
		Map<String, String> editedMap = new LinkedHashMap<String, String>();
1079
		
1150

  
1080 1151
		editedMap.put(ResourcesUtils.getApplicationResourceMessage("company.enquiry.company.id"),
1081 1152
				p_sCompanyId);
1082 1153
		editedMap.put(ResourcesUtils.getApplicationResourceMessage("company.account.user.id"),
1083 1154
				p_sUserId);
1084
		
1085
		if(!integrationErrorMap.isEmpty ())
1155

  
1156
		if (!integrationErrorMap.isEmpty())
1086 1157
		{
1087
			int i=1;
1158
			int i = 1;
1088 1159
			String each;
1089 1160
			String accountLabel = ResourcesUtils.getApplicationResourceMessage("company.account.account.no");
1090
			for(Iterator<String> it = integrationErrorMap.keySet ().iterator (); it.hasNext ();)
1161
			for (Iterator<String> it = integrationErrorMap.keySet().iterator(); it.hasNext();)
1091 1162
			{
1092
				each = it.next ();
1093
				editedMap.put (accountLabel.concat (" ").concat (String.valueOf (i)), 
1094
						each.concat (" : ").concat (integrationErrorMap.get (each)));
1163
				each = it.next();
1164
				editedMap.put(accountLabel.concat(" ").concat(String.valueOf(i)),
1165
						each.concat(" : ").concat(integrationErrorMap.get(each)));
1095 1166
				i++;
1096 1167
			}
1097 1168
		}
1098
		
1169

  
1099 1170
		return editedMap;
1100 1171
	}
1101
	
1172

  
1102 1173
	public Map<String, String> populateCompanyUserProfileAuditLogMap(
1103 1174
			BibUser p_oBibUser) {
1104 1175
		Map<String, String> editedMap = new LinkedHashMap<String, String>();
1105
		
1176

  
1106 1177
		editedMap.put(ResourcesUtils.getApplicationResourceMessage("company.user.alias"),
1107 1178
				String.valueOf(p_oBibUser.getUserAlias()));
1108
		
1179

  
1109 1180
		return editedMap;
1110 1181
	}
1111
	
1182

  
1112 1183
	public Map<String, String> populateCompanyChargesAuditLogMap(
1113 1184
			String companyID) {
1114 1185
		Map<String, String> editedMap = new LinkedHashMap<String, String>();
1115
		
1186

  
1116 1187
		editedMap.put(ResourcesUtils.getApplicationResourceMessage("company.enquiry.company.id"),
1117 1188
				companyID);
1118
		
1189

  
1119 1190
		return editedMap;
1120 1191
	}
1121
	
1192

  
1122 1193
	public Map<String, String> populateCompanySecurePassAuditLogMap(
1123 1194
			String p_sCompanyId) {
1124 1195
		Map<String, String> editedMap = new LinkedHashMap<String, String>();
1125
		
1196

  
1126 1197
		editedMap.put(ResourcesUtils.getApplicationResourceMessage("company.enquiry.company.id"),
1127 1198
				p_sCompanyId);
1128
		
1199

  
1129 1200
		return editedMap;
1130 1201
	}
1131
	
1132
	public Map<String, Object> generateAuditLogMap (BibCompany m_oCompany,
1202

  
1203
	public Map<String, Object> generateAuditLogMap(BibCompany m_oCompany,
1133 1204
			Map<Long, String> m_mDisplayGroupMap,
1134 1205
			Map<String, String> m_mUStatusMap)
1135 1206
	{
1136
		Map<String, Object> editedMap = new LinkedHashMap<String, Object> ();
1137
		
1138
		if(m_oCompany != null)
1207
		Map<String, Object> editedMap = new LinkedHashMap<String, Object>();
1208

  
1209
		if (m_oCompany != null)
1139 1210
		{
1140
			editedMap.put(ResourcesUtils.getApplicationResourceMessage ("company.enquiry.company.address"),
1141
					m_oCompany.getAddress1()+" "+
1142
					m_oCompany.getAddress2()+" "+
1143
					m_oCompany.getAddress3()+" "+
1144
					m_oCompany.getAddress4());
1145
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("company.enquiry.company.tel.no"), m_oCompany.getOfficePhoneNo());
1146
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("company.enquiry.company.fax.no"), m_oCompany.getOtherPhoneNo());
1147
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("company.enquiry.company.email"), m_oCompany.getElectronicAddrDesc()); 
1148
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("company.enquiry.company.status"), STATUS.getStatusObject(m_oCompany.isStatus()));
1149
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("company.enquiry.payroll"), m_oCompany.getBulkPaymentPayrollCode());
1150
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("company.enquiry.direct.debit"), m_oCompany.getBulkPaymentDDCode());
1151
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("company.enquiry.direct.credit"), m_oCompany.getBulkPaymentDCCode());
1152
			editedMap.put (ResourcesUtils.getApplicationResourceMessage ("company.enquiry.general.bulk.payment"), m_oCompany.getBulkPaymentGeneralCode());
1211
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("company.enquiry.company.address"),
1212
					m_oCompany.getAddress1() + " " +
1213
							m_oCompany.getAddress2() + " " +
1214
							m_oCompany.getAddress3() + " " +
1215
							m_oCompany.getAddress4());
1216
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("company.enquiry.company.tel.no"),
1217
					m_oCompany.getOfficePhoneNo());
1218
			editedMap.put(ResourcesUtils.getApplicationResourceMessage("company.enquiry.company.fax.no"),
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff