diff --git a/Back/GetUserInfo.sql b/Back/GetUserInfo.sql new file mode 100644 index 0000000..0fd2379 Binary files /dev/null and b/Back/GetUserInfo.sql differ diff --git a/Back/PROC_TP_TXN_PUSH.sql b/Back/PROC_TP_TXN_PUSH.sql new file mode 100644 index 0000000..49c4f32 Binary files /dev/null and b/Back/PROC_TP_TXN_PUSH.sql differ diff --git a/Back/PROC_TRANSACTION_REPORT.sql b/Back/PROC_TRANSACTION_REPORT.sql index aa69189..5e92d94 100644 Binary files a/Back/PROC_TRANSACTION_REPORT.sql and b/Back/PROC_TRANSACTION_REPORT.sql differ diff --git a/Back/ProcMobileConfig.sql b/Back/ProcMobileConfig.sql new file mode 100644 index 0000000..92af832 Binary files /dev/null and b/Back/ProcMobileConfig.sql differ diff --git a/Back/mobile_proc_customerMaster_V2.sql b/Back/mobile_proc_customerMaster_V2.sql new file mode 100644 index 0000000..b2c29ee Binary files /dev/null and b/Back/mobile_proc_customerMaster_V2.sql differ diff --git a/Back/mobile_proc_userLogin.sql b/Back/mobile_proc_userLogin.sql index 65c6ee2..f3d6391 100644 --- a/Back/mobile_proc_userLogin.sql +++ b/Back/mobile_proc_userLogin.sql @@ -1,15 +1,12 @@ USE [FastMoneyPro_Remit] GO - -/****** Object: StoredProcedure [dbo].[mobile_proc_userLogin] Script Date: 12/11/2023 2:04:40 PM ******/ +/****** Object: StoredProcedure [dbo].[mobile_proc_userLogin] Script Date: 12/18/2023 11:01:32 PM ******/ SET ANSI_NULLS ON GO - SET QUOTED_IDENTIFIER ON GO - ALTER PROCEDURE [dbo].[mobile_proc_userLogin] @flag VARCHAR(30) ,@userName VARCHAR(100) = NULL ,@Password VARCHAR(100) = NULL @@ -159,22 +156,29 @@ BEGIN TRY SET @UserData = 'User: ' + @username + ' ,Password: ' + @Password + ' ,User Type:Mobile User' + ' ,Device Info: ' + @imei + ' ,IsBiometricLogin: ' + @isBiometricLogin + ' ,BiometricTypeLogin: ' + @biometricLoginType + ' ,DeviceType: ' + @deviceType + ' ,AccessCode: ' + ISNULL(@accessCode, '') + ' ,AccessToken: ' + ISNULL(@accessToken, '') - DECLARE @isReferred BIT = 0 + DECLARE @isReferred BIT = 0,@existingCustomer INT,@createdFrom VARCHAR(50) - IF EXISTS ( - SELECT TOP 1 'x' - FROM referralmaster(NOLOCK) - WHERE email = @userName - OR mobile = @userName - ) - SET @isReferred = 1 + --IF EXISTS ( + -- SELECT TOP 1 'x' + -- FROM referralmaster(NOLOCK) + -- WHERE email = @userName + -- OR mobile = @userName + -- ) + -- SET @isReferred = 1 + --SELECT * FROM customerMaster WHERE email = @userName SELECT @_lastLoggedInDevice = lastLoggedInDevice ,@_accessCodeExpiry = accessCodeExpiry ,@_accessCode = accessCode FROM dbo.mobile_userRegistration(NOLOCK) WHERE username = @userName - + + SELECT + @existingCustomer= ISNULL(isexistingcustomer,0), + @customerPwd=customerPassword + ,@createdFrom=createdFrom + FROM customerMaster WITH (NOLOCK) + WHERE ISNULL(username,email)=@userName --and ISNULL(onlineUser, 'N')='Y' --IF @_lastLoggedInDevice = @Imei AND @_accessCodeExpiry > GETDATE() --BEGIN -- SET @accessCode=@_accessCode @@ -222,6 +226,26 @@ BEGIN TRY DECLARE @redirectTo VARCHAR(100) = 'EYKC'; + IF( @existingCustomer=1 and (@customerPwd IS NULL OR @customerPwd='')) + + BEGIN + SELECT '1' ErrorCode + ,'Login Failed. Please click forgot Password to set new password.' Msg + ,NULL + + RETURN + END + + IF( @createdFrom='C' and (@customerPwd IS NULL OR @customerPwd='')) + + BEGIN + SELECT '1' ErrorCode + ,'Login Failed. Please click forgot Password to set new password.' Msg + ,NULL + + RETURN + END + IF EXISTS ( SELECT TOP 1 'X' FROM customerMasterTemp cm(NOLOCK) @@ -425,7 +449,7 @@ BEGIN TRY IF @isMobileLoginEnabled = 'N' BEGIN SELECT '20' errorCode - ,'Your JME account is disabled. Contact JME support.' msg + ,'Your IME account is disabled. Contact JME support.' msg ,@username id SET @UserInfoDetail = 'Reason = Login fails, Your mobile login is disabled. Please, contact your administrator.' @@ -909,5 +933,3 @@ BEGIN CATCH ,NULL ID END CATCH -GO - diff --git a/Back/proc_ApproveHoldedTXN.sql b/Back/proc_ApproveHoldedTXN.sql new file mode 100644 index 0000000..cc2eeb8 Binary files /dev/null and b/Back/proc_ApproveHoldedTXN.sql differ diff --git a/Back/proc_InsertRewardPoints.sql b/Back/proc_InsertRewardPoints.sql new file mode 100644 index 0000000..4612550 Binary files /dev/null and b/Back/proc_InsertRewardPoints.sql differ diff --git a/Back/proc_approveOFACCompliance.sql b/Back/proc_approveOFACCompliance.sql new file mode 100644 index 0000000..fcd49ba Binary files /dev/null and b/Back/proc_approveOFACCompliance.sql differ diff --git a/Back/proc_cancelTran.sql b/Back/proc_cancelTran.sql new file mode 100644 index 0000000..75baa2a Binary files /dev/null and b/Back/proc_cancelTran.sql differ diff --git a/Back/proc_customerInfoWithPinNo.sql b/Back/proc_customerInfoWithPinNo.sql new file mode 100644 index 0000000..04a2e91 Binary files /dev/null and b/Back/proc_customerInfoWithPinNo.sql differ diff --git a/Back/proc_customerRegistrationStatus.sql b/Back/proc_customerRegistrationStatus.sql new file mode 100644 index 0000000..dbcbc7a Binary files /dev/null and b/Back/proc_customerRegistrationStatus.sql differ diff --git a/Back/proc_modifyTXN.sql b/Back/proc_modifyTXN.sql index 325ab2d..8256efd 100644 Binary files a/Back/proc_modifyTXN.sql and b/Back/proc_modifyTXN.sql differ diff --git a/Back/proc_online_approve_Customer.sql b/Back/proc_online_approve_Customer.sql new file mode 100644 index 0000000..52d52e7 Binary files /dev/null and b/Back/proc_online_approve_Customer.sql differ diff --git a/Back/proc_online_core_customerSetup.sql b/Back/proc_online_core_customerSetup.sql index 2dfdc0b..63243e7 100644 Binary files a/Back/proc_online_core_customerSetup.sql and b/Back/proc_online_core_customerSetup.sql differ diff --git a/Back/proc_sendIntlReceipt.sql b/Back/proc_sendIntlReceipt.sql new file mode 100644 index 0000000..e21bac8 Binary files /dev/null and b/Back/proc_sendIntlReceipt.sql differ diff --git a/StoredProc/PROC_TP_TXN_PUSH.sql b/StoredProc/PROC_TP_TXN_PUSH.sql index 56e7932..5e8020a 100644 Binary files a/StoredProc/PROC_TP_TXN_PUSH.sql and b/StoredProc/PROC_TP_TXN_PUSH.sql differ diff --git a/StoredProc/ProcMobileConfig.sql b/StoredProc/ProcMobileConfig.sql index 27a6c93..8a349a0 100644 Binary files a/StoredProc/ProcMobileConfig.sql and b/StoredProc/ProcMobileConfig.sql differ diff --git a/StoredProc/proc_ApproveHoldedTXN.sql b/StoredProc/proc_ApproveHoldedTXN.sql index d857935..251d595 100644 Binary files a/StoredProc/proc_ApproveHoldedTXN.sql and b/StoredProc/proc_ApproveHoldedTXN.sql differ diff --git a/StoredProc/proc_modifyTXN.sql b/StoredProc/proc_modifyTXN.sql index ed14cdb..d4c7ac8 100644 Binary files a/StoredProc/proc_modifyTXN.sql and b/StoredProc/proc_modifyTXN.sql differ diff --git a/StoredProc/proc_online_approve_Customer.sql b/StoredProc/proc_online_approve_Customer.sql index 270ce98..e7a34f5 100644 Binary files a/StoredProc/proc_online_approve_Customer.sql and b/StoredProc/proc_online_approve_Customer.sql differ diff --git a/rewards.sql b/rewards.sql index 655a482..849b63b 100644 --- a/rewards.sql +++ b/rewards.sql @@ -41,4 +41,10 @@ UPDATE customermaster set bonusPoint=0 FROM Customer_Promotion (NOLOCK) WHERE destinationCustomerId = 77 and codeTYPE = 'REGISTRATION' and rewardType='REFER_EARN'; - \ No newline at end of file + + + EXEC proc_InsertRewardPoints @Flag = 'TRANSACTION', @CustomerId = 24358, @TranId = 10001419 +EXEC PROC_TP_TXN_PUSH @FLAG = 'INSTANT-PAID_V2', @TRAN_ID='10001419' +select * from customerMaster where membershipId='MOB000135' + +select * FROM Customer_Promotion where sourceCustomerId='24358' \ No newline at end of file