Database/Sp/PROC_AGENT_RECEIVER_SETUP.sql

@@ -70,30 +70,16 @@ BEGIN
 	IF @flag = 'i-new'
     BEGIN
 		DECLARE @customerIdNew BIGINT
-		IF LEN(@customerId) > 7
-		BEGIN
-			IF NOT EXISTS(SELECT 'X' FROM CUSTOMERMASTER  WITH(NOLOCK) WHERE cast(MEMBERSHIPID as varchar) = @customerId)
+		IF NOT EXISTS(SELECT 'X' FROM CUSTOMERMASTER  WITH(NOLOCK) WHERE idnumber = @customerId)
 		BEGIN
 			SELECT '1' errorCode,''''+cast(@customerId as varchar) +  '''  customerId does not exists.' msg,null id
 			RETURN
 		END
 		ELSE
 		BEGIN
-				SELECT 	@customerIdNew = customerId from customerMaster where MEMBERSHIPID = @customerId
-			END
-		END
-		ELSE
-		BEGIN
-			IF NOT EXISTS(SELECT 'X' FROM CUSTOMERMASTER  WITH(NOLOCK) WHERE cast(POSTALCODE as varchar) = @customerId)
-			BEGIN
-				SELECT '1' errorCode,''''+cast(@customerId as varchar) +  '''  customerId does not exists.' msg,null id
-				RETURN
-			END
-			ELSE
-			BEGIN
-				SELECT 	@customerIdNew = customerId from customerMaster where postalCode = @customerId
-			END
+			SELECT 	@customerIdNew = customerId from customerMaster where idnumber = @customerId
 		END
+
 		SELECT @membershipId = membershipId from  CUSTOMERMASTER  WITH(NOLOCK) WHERE customerId = @customerIdNew
         INSERT  INTO receiverInformation
                       (fullname

Database/Sp/proc_customerInfo.sql

@@ -12,62 +12,58 @@ BEGIN
 IF @flag = 'getCustomerAndReceiverInfo'
 BEGIN
 	DECLARE   @customerIdNew BIGINT
-	select @customerIdNew = CUSTOMERID FROM CUSTOMERMASTER WHERE MEMBERSHIPID =@customerId
-	
-	IF len(@customerId) > 7
-	BEGIN
-		select @customerIdNew = CUSTOMERID FROM CUSTOMERMASTER WHERE MEMBERSHIPID =@customerId
-	END
-	ELSE
-	BEGIN
-		SELECT @customerIdNew = CUSTOMERID FROM customerMaster WHERE postalCode = @CUSTOMERID
-	END
+	select @customerIdNew = CUSTOMERID FROM CUSTOMERMASTER WHERE idnumber =@customerId
 	IF cast(@customerIdNew  as varchar) IS NULL
 	BEGIN
-		SELECT '1' Error_Code,'Customer Doesnot Exists' Msg,@CUSTOMERID id
+		SELECT '1' Error_Code,'Customer Does not exists' Msg,@CUSTOMERID id
 		RETURN
 	END
 	SELECT fullname,membershipId FROM customerMaster WHERE CUSTOMERID = @customerIdNew
-
 	--get bank and branch details
-	DECLARE @BRANCHDETAILS VARCHAR(100), @BANKDETAILS VARCHAR(250),@paymentMethod VARCHAR(20)
-	SELECT @BRANCHDETAILS = CASE WHEN R.PCOUNTRY IN ('Nepal', 'Vietnam') THEN pBankBranchName
-									ELSE CAST(A.BRANCH_ID AS VARCHAR) + '|' + A.BRANCH_NAME + ' - ' + A.BRANCH_CODE1 END
-			,@BANKDETAILS =  R.PBANKNAME
-			,@paymentMethod = R.paymentMethod
+	SELECT * INTO #receiverId
+	from 
+	(
+	SELECT receiverId from receiverinformation
+	WHERE customerid = @customerIdNew
+	)x
+
+	
+	SELECT * INTO #transactionDetails
+	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 = @RECEIVERID
-	ORDER BY R.ID ASC
-	SELECT TOP 10 * FROM VWREMITTRAN ORDER BY ID DESC
-
+	AND REC.CUSTOMERID in (select receiverId from #receiverId)
+	)x
+	where rowId = 1
 
-	SELECT	ROW_NUMBER() OVER (ORDER BY RECEIVERID) SN,
+	select  ROW_NUMBER() OVER(ORDER BY RI.RECEIVERID) SN, 
 			isnull(firstname,'') + isnull(' '+middleName,'') + isnull(' ' + lastname1,'') [fullname],
 			isnull(address,'-') address,
 			isnull(mobile,'-') mobile,
-			isnull(@paymentMethod,case when ri.paymentMode = '1' then 'Cash Payment' 
+			ISNULL(TD.paymentMethod,case when ri.paymentMode = '1' then 'Cash Payment' 
 										when ri.paymentMode = '2' then 'Bank Deposit'
 										else 'Mobile Wallet' END) PaymentMethod,
-			ISNULL(@BANKDETAILS,RI) bankName,
-			ISNULL(@BRANCHDETAILS,CASE WHEN RI.PCOUNTRY IN ('Nepal', 'Vietnam') THEN bankBranchName
+			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,
-
-
-
-	 FROM receiverInformation RI(NOLOCK)
+			ISNULL(TD.accountNo,ISNULL(RI.receiverAccountNo,'-')) accountNo
+	 from receiverinformation ri(nolock)
+	LEFT JOIN #transactionDetails 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 A.BRANCH_ID = RI.BANKLOCATION
-
-	 select * from 
-
-	 SELECT TOP 10 collmode,paymentMethod,PCOUNTRY,pBankBranchName,bankBranchName,* FROM VWREMITTRAN ORDER BY ID DESC
-	 SELECT TOP 100 bankBranchName,* FROM RECEIVERINFORMATION ORDER BY RECEIVERID DESC
-	 SELECT TOP 10 * FROM VWTRANRECEIVERS  ORDER BY ID DESC
-	  WHERE customerId  = @customerIdNew 
+	WHERE RI.CUSTOMERID = @customerIdNew
 END
 IF @flag = 'details-fromMembershipId'  
 BEGIN  

JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js

@@ -277,7 +277,7 @@ function CheckFormValidation(e) {
     debugger
     $("#" + mId + "ddlIdType").removeAttr("style");
     $("#" + mId + "txtIdValue").removeAttr("style");
-    paymentMode = $("#" + mId + "ddlPaymentMode").val();
+
     var reqField = "customerId,ddlCountry,ddlBenificiaryType,txtReceiverFName,txtReceiverLName,txtReceiverAddress,ddlPaymentMode,ddlNativeCountry,";
     idTypeVal = $("#" + mId + "ddlIdType").val();
     if (idTypeVal !== null && idTypeVal !== "" && idTypeVal !== "0") {
@@ -292,6 +292,17 @@ function CheckFormValidation(e) {
     if (ValidRequiredField(reqField) === false) {
         return false;
     }
+    debugger
+    var pMode = $("#" + mId + "ddlPaymentMode").val();
+    var pAgent = $("#" + mId + "ddlPayoutPatner").val();
+    if (pMode == "2") {
+        if (pAgent == '' || pAgent == undefined || pAgent == null || pAgent == "null") {
+            $("#" + mId + "ddlPayoutPatner").css('background-color', '#FFCCD2');
+            swal('Required Field(s)\n _____________________________ \n The red fields are required!');
+            return false
+        }
+    }
+
     $("#" + mId + "register").attr("disabled", "disabled");
     return true;
 }

JMEAgentSystem/WebPages/Account/Login.aspx

@@ -9,7 +9,7 @@
             <div class="form-horizontal m-t-20">
                 <div class="form-group">
                     <div class="col-xs-12">
-                        <asp:TextBox ID="referralCode" name="referralCode" runat="server" CssClass="form-control" placeholder="REFERRALCODE"></asp:TextBox>
+                        <asp:TextBox ID="referralCode" name="referralCode" runat="server" CssClass="form-control" placeholder="REFERRAL CODE"></asp:TextBox>
                     </div>
                 </div>
                 <div class="form-group">

JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx

@@ -22,7 +22,7 @@
                                     <div class="row">
                                         <div class="col-md-3">
                                             <div class="form-group">
-                                                <label>Enter Customer Id:<span class="errormsg">*</span></label><br />
+                                                <label>Customer Id Number:<span class="errormsg">*</span></label><br />
                                                 <asp:TextBox ID="customerId" Width="200px" runat="server" CssClass="form-control"></asp:TextBox>
                                             </div>
                                         </div>