arjun 4 years ago
parent
commit
14477f3c01
  1. 33
      Database/Sp/proc_sendRequest.sql
  2. 95
      JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js
  3. 78
      JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx
  4. 16
      Repository/DAO/SendTxnIRHDao/SendTxnIRHDao.cs
  5. 1
      Repository/Model/SendTransactionModel.cs

33
Database/Sp/proc_sendRequest.sql

@ -11,6 +11,7 @@ ALTER PROC proc_sendRequest
,@pModeId BIGINT = NULL
,@pagentId BIGINT = NULL
,@branchId BIGINT = NULL
,@branchManual VARCHAR(100) = NULL
,@accountNumber varchar(50) = NULL
,@cAmt MONEY = NULL
,@tamt MONEY = NULL
@ -20,6 +21,7 @@ ALTER PROC proc_sendRequest
,@relationShipId BIGINT = NULL
,@otherRelation VARCHAR(100) = NULL
,@referralName VARCHAR(50) = NULL
,@benefeciaryId BIGINT = NULL
AS
SET NOCOUNT ON ;
SET XACT_ABORT ON;
@ -38,16 +40,16 @@ BEGIN
-- SELECT '1' ERROR_CODE, 'Receiver with name '''+@receiverFullName+''' does not exist of customer with membershipId '''+@membershipId+'''' Msg,@membershipId id
-- RETURN
--END
--ALTER TABLE send_money_request ADD BranchManual VARCHAR(50)
INSERT INTO send_money_request(IdNumber,MembershipId,ReceiverFullName,Receiveraddress
,ReceiverMobileNumber,purposeOfRemittance,otherPurpose,relationShip,otherRelation,referralName
,PCountryId,PmodeId,PagentId,BranchId,AccountNumber,CAmt,Tamt,ServiceCharge,createdby,createddate
,PCountryId,PmodeId,PagentId,BranchId,AccountNumber,CAmt,Tamt,ServiceCharge,createdby,createddate,BranchManual
)
values
(
@idNumber,@membershipId,@receiverFullName ,@receiveraddress
,@receiverMobileNumber,@purposeOfRemittanceId,@otherPurposeOfRemittance,@relationShipId,@otherRelation,@referralName
,@pCountryId ,@pModeId,@pagentId ,@branchId ,@accountNumber ,@cAmt ,@tamt ,@serviceCharge,@user,Getdate()
,@pCountryId ,@pModeId,@pagentId ,@branchId ,@accountNumber ,@cAmt ,@tamt ,@serviceCharge,@user,Getdate(),@branchManual
)
SET @rowId = @@IDENTITY
@ -56,18 +58,27 @@ BEGIN
END
IF @flag = 'validateData'
BEGIN
IF NOT EXISTS (select 1 from customermaster where idNumber = @idNumber)
SELECT @CUSTOMERID = CUSTOMERID
FROM CUSTOMERMASTER (NOLOCK)
WHERE idNumber = @idNumber
AND ISNULL(ISACTIVE, 'Y') = 'Y'
AND ISNULL(ISDELETED, 'N') = 'N'
IF @CUSTOMERID IS NULL
BEGIN
SELECT '1' ERROR_CODE, 'Customer with idNumber '''+@idNumber+''' does not exixts' Msg,@idNumber id
SELECT '1' errorCode, 'Customer with idNumber '''+ISNULL(@idNumber, '')+''' does not exixts' Msg,@idNumber id
RETURN
END
select @CUSTOMERID = CUSTOMERID FROM CUSTOMERMASTER WHERE idNumber = @idNumber AND ISNULL(ISACTIVE, 'Y') = 'Y'
IF NOT EXISTS (SELECT 1 from receiverinformation where fullname = LTRIM(RTRIM(@receiverFullName)) and customerid = @CUSTOMERID)
BEGIN
SELECT '1' ERROR_CODE, 'Receiver with name '''+@receiverFullName+''' does not exist of customer with idNumber '''+@idNumber+'''' Msg,@idNumber id
RETURN
SELECT FULLNAME, RECEIVERID, errorCode = 0
FROM RECEIVERINFORMATION (NOLOCK)
WHERE CUSTOMERID = @CUSTOMERID
END
SELECT '0' ERROR_CODE, 'Customer and receiver exixts' Msg,@idNumber id
IF @flag = 'receiver-data'
BEGIN
SELECT FULLNAME, address, mobile, country, paymentMode, bankLocation, payOutPartner, city
, homePhone, idType, idNumber, placeOfIssue, purposeOfRemit, relationship, relationOther, purposeOther, errorCode = 0
FROM RECEIVERINFORMATION (NOLOCK)
WHERE receiverId = @benefeciaryId
END
END

95
JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js

@ -1,16 +1,6 @@

$(document).ready(function () {
//$("#" +mId + "regUp").hide();
$(document).on("change", "#" + mId + "ddlSearchBy", function () {
$("#ContentPlaceHolder1_txtSearchData_aText").val("");
ClearAllInputFields();
$("#" + mId + "regUp").hide();
});
$("#MainContent_BenificiaryAgreement").click(function () {
debugger
if ($("#MainContent_BenificiaryAgreement").is(":checked")) {
$("#" + mId + "register").removeAttr("disabled");
@ -19,7 +9,6 @@ $(document).ready(function () {
}
});
$("#" + mId + "ddlPurposeOfRemitance").on("change", function () {
debugger
let purposeValue = $("#" + mId + "ddlPurposeOfRemitance option:selected").val();
if (purposeValue == '11347') {
$("#purposeOtherDiv").show();
@ -84,13 +73,79 @@ $(document).ready(function () {
$("#" + mId + "txtIdValue").removeAttr("style");
}
});
$(document).on("change", "#ContentPlaceHolder1_txtSearchData_aSearch", function () {
searchValue = $(this).val();
if (searchValue === null || searchValue === "") {
$("#ContentPlaceHolder1_txtSearchData_aText").val("");
ClearAllInputFields();
$("#" + mId + "regUp").hide();
$("#" + mId + "search").click(function () {
var dataObject = {
MethodName: 'GetCustomerAndReceiver',
CustomerId: $('#' + mId + 'customerId').val()
};
url = '';
$.post(url, dataObject, function (data) {
debugger
var table = $('#receiverTbl');
let response = JSON.parse(data);
var dataAvalilabe = 'Table' in response;
if (!dataAvalilabe) {
$("#loadingDiv").LoadingOverlay("hide", true);
table.DataTable().clear().draw();
return;
}
var customerFound = 'Table1' in response;
if (customerFound) {
$("#infoDiv").show();
var arrayData = [];
var result = response.Table1;
var count = 1;
$.each(result, function (i, d) {
arrayData.push({
"SNo": count,
"Name": d['fullname'],
"Address": d['address'],
"Mobile": d['mobile'],
"IdType": d['idType']
});
count++;
});
table.DataTable().destroy();
table.DataTable({
data: arrayData,
dom: 'Bfrtip',
lengthMenu: [
[10, 25, 50, -1],
['10', '25', '50', 'All']
],
responsive: true,
buttons: [
//'excelHtml5',
'pdfHtml5',
'print',
],
columns: [
{ "data": "SNo" },
{ "data": "Name" },
{ "data": "Address" },
{ "data": "Mobile" },
{ "data": "IdType" }
]
});
//$("#loadingDiv").LoadingOverlay("hide", true);
}
}).fail(function () {
//$("#loadingDiv").LoadingOverlay("hide", true);
swal(result.Msg, "Error Occured", "error");
});
});
$("#" + mId + "add").click(function () {
$("#" + mId + "regUp").show();
//$("#" + mId + "add").attr("disabled", "disabled");
});
});
@ -411,11 +466,3 @@ function PopulateLocation() {
alert("Something went wrong!!!");
});
}
function CallBackAutocomplete(id) {
ClearAllInputFields();
var d = [GetItem(mId + "txtSearchData")[0], GetItem(mId + "txtSearchData")[1].split('|')[0]];
$("#" + mId + "hideCustomerId").val(d[0]);
LoadCustomerInfo(d[0]);
$("#" + mId + "regUp").show();
}

78
JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx

@ -356,8 +356,9 @@
<script src="/Scripts/notify.js"></script>
<script src="/Scripts/Customer/Document.js"></script>
<script src="/Scripts/js/swift_autocomplete.js"></script>
<script src="../../js/singnature/signature_pad.umd.js"></script>
<script src="../../js/singnature/customerSignature.js"></script>
<script src="/js/singnature/signature_pad.umd.js"></script>
<script src="/js/singnature/customerSignature.js"></script>
<script src="/Plugins/datatables/jquery.dataTables.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.15/jquery.mask.min.js" type="text/javascript"></script>
@ -366,82 +367,9 @@
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@1.5.4/src/loadingoverlay.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@1.5.4/extras/loadingoverlay_progress/loadingoverlay_progress.min.js"></script>
<script src="/Scripts/Receiver/ReceiverRegistrationNew.js"></script>
<script src="../../Plugins/datatables/jquery.dataTables.min.js"></script>
<script type="text/javascript">
$(document).ready(function () {
$("#" + mId + "regUp").hide();
$("#" + mId + "search").click(function () {
var dataObject = {
MethodName: 'GetCustomerAndReceiver',
CustomerId: $('#' + mId + 'customerId').val()
};
url = '';
$.post(url, dataObject, function (data) {
debugger
var table = $('#receiverTbl');
let response = JSON.parse(data);
var dataAvalilabe = 'Table' in response;
if (!dataAvalilabe) {
$("#loadingDiv").LoadingOverlay("hide", true);
table.DataTable().clear().draw();
return;
}
var customerFound = 'Table1' in response;
if (customerFound) {
$("#infoDiv").show();
var arrayData = [];
var result = response.Table1;
var count = 1;
$.each(result, function (i, d) {
arrayData.push({
"SNo": count,
"Name": d['fullname'],
"Address": d['address'],
"Mobile": d['mobile'],
"IdType": d['idType']
});
count++;
});
table.DataTable().destroy();
table.DataTable({
data: arrayData,
dom: 'Bfrtip',
lengthMenu: [
[10, 25, 50, -1],
['10', '25', '50', 'All']
],
responsive: true,
buttons: [
//'excelHtml5',
'pdfHtml5',
'print',
],
columns: [
{ "data": "SNo" },
{ "data": "Name" },
{ "data": "Address" },
{ "data": "Mobile" },
{ "data": "IdType" }
]
});
//$("#loadingDiv").LoadingOverlay("hide", true);
}
}).fail(function () {
//$("#loadingDiv").LoadingOverlay("hide", true);
swal(result.Msg, "Error Occured", "error");
});
});
$("#" + mId + "add").click(function () {
$("#" + mId + "regUp").show();
//$("#" + mId + "add").attr("disabled", "disabled");
});
});
</script>
</asp:Content>

16
Repository/DAO/SendTxnIRHDao/SendTxnIRHDao.cs

@ -79,6 +79,7 @@ namespace Repository.DAO.SendTxnIRHDao
return ExecuteDataTable(sql);
}
public DataTable GetPayoutPartner(string user, string pCountry, string pMode)
{
string sql = "EXEC PROC_API_ROUTE_PARTNERS @flag='payout-partner'";
@ -188,17 +189,26 @@ namespace Repository.DAO.SendTxnIRHDao
sql += ", @relationShipId = " + FilterString(sendTxn.RelationShip);
sql += ", @otherRelation = " + FilterString(sendTxn.OtherRelationShip);
sql += ", @referralName = " + FilterString(sendTxn.ReferralName);
sql += ", @branchManual = " + FilterString(sendTxn.BranchManual);
DbResult dr = ParseDbResult(sql);
return dr;
}
public DataTable ValidateData(string user, string membershipId, string receiverFullname )
public DataTable ValidateData(string user, string customerIdNumber)
{
var sql = "EXEC proc_sendRequest @flag = 'validateData'";
sql += ", @user = " + FilterString(user);
sql += ", @membershipId = " + FilterString(membershipId);
sql += ", @receiverFullName = " + FilterString(receiverFullname);
sql += ", @idNumber = " + FilterString(customerIdNumber);
DataTable dr = ExecuteDataTable(sql);
return dr;
}
public DataTable GetBenefeciaryDetails(string user, string benefeciaryId)
{
var sql = "EXEC proc_sendPageLoadData @flag = 'receiverDataBySender'";
sql += ", @user = " + FilterString(user);
sql += ", @RECEIVERID = " + FilterString(benefeciaryId);
DataTable dr = ExecuteDataTable(sql);
return dr;

1
Repository/Model/SendTransactionModel.cs

@ -16,6 +16,7 @@ namespace Repository.Model
public string PmodeId { get; set; }
public string PagentId { get; set; }
public string BranchId { get; set; }
public string BranchManual { get; set; }
public string AccountNumber { get; set; }
public string CAmt { get; set; }
public string Tamt { get; set; }

Loading…
Cancel
Save