arjun 4 years ago
parent
commit
ad851339e4
  1. 2
      .vs/config/applicationhost.config
  2. 26
      Database/Sp/PROC_AGENT_RECEIVER_SETUP.sql
  3. 49
      Database/Sp/proc_customerInfo.sql
  4. 19
      JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx
  5. 1
      JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs
  6. 9
      JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.designer.cs
  7. 19
      JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx
  8. 1
      JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.cs
  9. 9
      JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.designer.cs

2
.vs/config/applicationhost.config

@ -162,7 +162,7 @@
</site>
<site name="JMEAgentSystem" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="H:\JME\JME_Remit_Live\JMEAgentSystem\JMEAgentSystem" />
<virtualDirectory path="/" physicalPath="E:\C# Projects\UAT\JME_JAPAN\JME_Remit_Live\JMEAgentSystem\JMEAgentSystem" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:63438:localhost" />

26
Database/Sp/PROC_AGENT_RECEIVER_SETUP.sql

@ -98,5 +98,31 @@ BEGIN
SELECT '0' errorCode ,'Receiver Successfully added.' msg ,id = @receiverId,extra = cast(@customerIdNew as varchar) + '|' + cast(@membershipId as varchar);
RETURN;
END;
IF @flag = 'i-new-tab'
BEGIN
IF NOT EXISTS(SELECT 'X' FROM CUSTOMERMASTER WITH(NOLOCK) WHERE customerId = @customerId)
BEGIN
SELECT '1' errorCode,''''+cast(@customerId as varchar) + ''' customerId does not exists.' msg,null id
RETURN
END
SELECT @membershipId = membershipId from CUSTOMERMASTER WITH(NOLOCK) WHERE customerId = @customerId
INSERT INTO receiverInformation
(fullname
,membershipId ,customerId ,firstName ,middleName ,lastName1 ,lastName2 ,country ,NativeCountry,[address] ,[state] ,zipCode ,city ,email ,
homePhone ,workPhone ,mobile ,relationship ,receiverType ,idType ,idNumber ,placeOfIssue ,paymentMode ,bankLocation ,payOutPartner ,
bankName ,receiverAccountNo ,remarks ,purposeOfRemit ,createdBy ,createdDate,otherRelationDesc,agentId, relationOther, purposeOther, isCDDIUpdated,
bankBranchName
)
SELECT ISNULL(@firstName,'') + ISNULL(' ' + @middleName,'') +ISNULL(' ' + @lastName1,''),
@membershipId ,@customerId ,@firstName ,@middleName ,@lastName1 ,@lastName2 ,@country ,@nativeCountry,@address ,@state ,@zipCode ,@city ,@email ,
@homePhone ,@workPhone ,@mobile ,@RELATION ,@receiverType ,@idType ,@idNumber ,@placeOfIssue ,@paymentMode ,@bankLocation ,@payOutPartner ,
@bankName ,@receiverAccountNo ,@remarks ,@PURPOSEID ,@user ,GETDATE(),@otherRelationDesc,@loginBranchId, @RelationshipOther, @PurposeOfRemitanceOther, 1 ,
@branchManual
SET @receiverId=SCOPE_IDENTITY();
SELECT '0' errorCode ,'Receiver Successfully added.' msg ,id = @receiverId,extra = cast(@customerId as varchar) + '|' + cast(@membershipId as varchar);
RETURN;
END;
END

49
Database/Sp/proc_customerInfo.sql

@ -66,6 +66,55 @@ BEGIN
LEFT JOIN API_BANK_BRANCH_LIST A(NOLOCK) ON cast(A.BRANCH_ID as varchar) = RI.BANKLOCATION
WHERE RI.CUSTOMERID = @customerIdNew
END
IF @flag = 'getCustomer-tablet'
BEGIN
SELECT fullname,membershipId FROM customerMaster WHERE CUSTOMERID = @customerId
--get bank and branch details
SELECT * INTO #receiverId1
from
(
SELECT receiverId from receiverinformation
WHERE customerid = @customerId
)x
SELECT * INTO #transactionDetails1
from
(
SELECT ROW_NUMBER() OVER( PARTITION BY REC.CUSTOMERID ORDER BY REC.id desc) rowId
,CASE WHEN R.PCOUNTRY IN ('Nepal', 'Vietnam') THEN pBankBranchName
ELSE CAST(A.BRANCH_ID AS VARCHAR) + '|' + A.BRANCH_NAME + ' - ' + A.BRANCH_CODE1 END pBranchName
,R.pBankName
,R.paymentMethod
,R.accountno
,REC.customerid receiverId
FROM REMITTRAN R(NOLOCK)
INNER JOIN TRANRECEIVERS REC(NOLOCK) ON REC.TRANID = R.ID
LEFT JOIN API_BANK_BRANCH_LIST A(NOLOCK) ON A.BRANCH_ID = R.PBANKBRANCH
LEFT JOIN PAYER_BANK_DETAILS AP(NOLOCK) ON AP.PAYER_ID = R.PayerId
WHERE 1=1
--AND R.PCOUNTRY = 'INDIA'
AND REC.CUSTOMERID in (select receiverId from #receiverId1)
)x
where rowId = 1
select ROW_NUMBER() OVER(ORDER BY RI.RECEIVERID) SN,
isnull(firstname,'') + isnull(' '+middleName,'') + isnull(' ' + lastname1,'') [fullname],
isnull(address,'-') address,
isnull(mobile,'-') mobile,
ISNULL(TD.paymentMethod,case when ri.paymentMode = '1' then 'Cash Payment'
when ri.paymentMode = '2' then 'Bank Deposit'
else 'Mobile Wallet' END) PaymentMethod,
ISNULL(TD.pBankName,ISNULL(ABL.BANK_NAME,'-')) bankName,
ISNULL(TD.pBranchName,CASE WHEN RI.COUNTRY IN ('Nepal', 'Vietnam') THEN bankBranchName
ELSE CAST(A.BRANCH_ID AS VARCHAR) + '|' + A.BRANCH_NAME + ' - ' + A.BRANCH_CODE1 END) branchName,
ISNULL(TD.accountNo,ISNULL(RI.receiverAccountNo,'-')) accountNo
from receiverinformation ri(nolock)
LEFT JOIN #transactionDetails1 TD ON TD.RECEIVERID = RI.RECEIVERID
LEFT JOIN API_BANK_LIST ABL (NOLOCK) ON ABL.BANK_ID = RI.payOutPartner
LEFT JOIN API_BANK_BRANCH_LIST A(NOLOCK) ON cast(A.BRANCH_ID as varchar) = RI.BANKLOCATION
WHERE RI.CUSTOMERID = @customerId
END
IF @flag = 'details-fromMembershipId'
BEGIN
SELECT @customerId = CUSTOMERID FROM CUSTOMERMASTER WHERE MEMBERSHIPID = @membershipId

19
JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx

@ -217,7 +217,7 @@
<div class="form-group">
<div class="col-md-12">
<label>Date :</label>
<label id="todaysDate"></label>
<label id="todaysDate" runat="server"></label>
</div>
</div>
</div>
@ -250,23 +250,6 @@
<script src="/Scripts/js/swift_calendar.js"></script>
<script src="/Scripts/SendTxnJs/CustomerSignature.js" type="text/javascript"></script>
<script src="/Scripts/jquery.validate.js"></script>
<script type="text/javascript">
$(document).ready(function () {
var today = new Date();
var dd = today.getDate();
var mm = today.getMonth() + 1; //January is 0!
var yyyy = today.getFullYear();
if (dd < 10) {
dd = '0' + dd;
}
if (mm < 10) {
mm = "0" + mm;
}
today = dd + '-' + mm + '-' + yyyy;
$("#todaysDate").text(today);
});
</script>
<script type="text/javascript">
function PrintDiv() {
var divToPrint = document.getElementById('mainDiv');

1
JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs

@ -18,6 +18,7 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration
{
GetStatic.PrintMessage(this.Page);
LoadCustomerDetails();
todaysDate.InnerText = DateTime.Now.ToString("dd-MM-yyyy");
SavePDF();
}

9
JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.designer.cs

@ -471,6 +471,15 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl dateDiv;
/// <summary>
/// todaysDate control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl todaysDate;
/// <summary>
/// hdnCustomerId control.
/// </summary>

19
JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx

@ -120,7 +120,7 @@
<div class="form-group">
<div class="col-md-12">
<label>Date :</label>
<label id="todaysDate"></label>
<label id="todaysDate" runat="server"></label>
</div>
</div>
</div>
@ -169,23 +169,6 @@
setTimeout(function () { newWin.close(); }, 10);
}
</script>
<script type="text/javascript">
$(document).ready(function () {
var today = new Date();
var dd = today.getDate();
var mm = today.getMonth() + 1; //January is 0!
var yyyy = today.getFullYear();
if (dd < 10) {
dd = '0' + dd;
}
if (mm < 10) {
mm = "0" + mm;
}
today = dd + '-' + mm + '-' + yyyy;
$("#todaysDate").text(today);
});
</script>
<style type="text/css">
.tg {
border-collapse: collapse;

1
JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.cs

@ -23,6 +23,7 @@ namespace JMEAgentSystem.WebPages.SendTxn
{
GetStatic.PrintMessage(this.Page);
LoadCustomerDetails();
todaysDate.InnerText = DateTime.Now.ToString("dd-MM-yyyy");
SavePDF();
}

9
JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.designer.cs

@ -246,6 +246,15 @@ namespace JMEAgentSystem.WebPages.SendTxn {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl dateDiv;
/// <summary>
/// todaysDate control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl todaysDate;
/// <summary>
/// hdnCustomerId control.
/// </summary>

Loading…
Cancel
Save