Subversion Repositories SmartDukaan

Rev

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

Rev 28597 Rev 28781
Line 186... Line 186...
186
				ManualPaymentType paymentType = manualPaymentRequestRepository
186
				ManualPaymentType paymentType = manualPaymentRequestRepository
187
						.selectByReferenceType(walletHistoryModel.getWalletReferenceType());
187
						.selectByReferenceType(walletHistoryModel.getWalletReferenceType());
188
				if (paymentType == null) {
188
				if (paymentType == null) {
189
					paymentType = new ManualPaymentType();
189
					paymentType = new ManualPaymentType();
190
					paymentType.setReferenceType(walletHistoryModel.getWalletReferenceType());
190
					paymentType.setReferenceType(walletHistoryModel.getWalletReferenceType());
-
 
191
					manualPaymentRequestRepository.persist(paymentType);
191
				}
192
				}
192
				paymentType.setCounter(paymentType.getCounter() + 1);
193
				paymentType.setCounter(paymentType.getCounter() + 1);
193
				manualPaymentRequestRepository.persist(paymentType);
-
 
194
				int reference = paymentType.getCounter();
194
				int reference = paymentType.getCounter();
195
				walletService.addAmountToWallet(walletHistoryModel.getFofoId(), reference,
195
				walletService.addAmountToWallet(walletHistoryModel.getFofoId(), reference,
196
						walletHistoryModel.getWalletReferenceType(), walletHistoryModel.getDescription(),
196
						walletHistoryModel.getWalletReferenceType(), walletHistoryModel.getDescription(),
197
						(float) walletHistoryModel.getAmount(), walletHistoryModel.getBusinessDate());
197
						(float) walletHistoryModel.getAmount(), walletHistoryModel.getBusinessDate());
198
			} else {
198
			} else {
Line 769... Line 769...
769
			if (walletEntry.getAmount() > 0) {
769
			if (walletEntry.getAmount() > 0) {
770
				sheet.getRow(row).createCell(2).setCellValue(0);
770
				sheet.getRow(row).createCell(2).setCellValue(0);
771
				sheet.getRow(row).createCell(3).setCellValue(walletEntry.getAmount());
771
				sheet.getRow(row).createCell(3).setCellValue(walletEntry.getAmount());
772
				grandTotalCredit += walletEntry.getAmount();
772
				grandTotalCredit += walletEntry.getAmount();
773
			} else {
773
			} else {
774
				sheet.getRow(row).createCell(2).setCellValue(walletEntry.getAmount());
774
				sheet.getRow(row).createCell(2).setCellValue(-walletEntry.getAmount());
775
				sheet.getRow(row).createCell(3).setCellValue(0);
775
				sheet.getRow(row).createCell(3).setCellValue(0);
776
				grandTotalDebit += walletEntry.getAmount();
776
				grandTotalDebit += walletEntry.getAmount();
777
			}
777
			}
778
			sheet.getRow(row).createCell(4).setCellValue(walletEntry.getDescription());
778
			sheet.getRow(row).createCell(4).setCellValue(walletEntry.getDescription());
779
			sheet.getRow(row).createCell(5).setCellValue(walletEntry.getReference());
779
			sheet.getRow(row).createCell(5).setCellValue(walletEntry.getReference());