4 years ago · ad82cfcef3
18 changed files with 510 additions and 468 deletions
--- a/Database/Sp/proc_jme_agent_system_account.sql
+++ b/Database/Sp/proc_jme_agent_system_account.sql
@ -40,7 +40,9 @@ BEGIN
   @_email      VARCHAR(150) =  NULL,  
   @_referralType    VARCHAR(150) =  NULL,  
   @_errorMessage    VARCHAR(MAX) =  NULL,  
-   @_invalidPwdCount   TINYINT   =  NULL  
+   @_invalidPwdCount   TINYINT   =  NULL,
+   @_androidDeviceIMEI VARCHAR(50) = NULL,
+   @LOG_ID INT = NULL
    
 CREATE TABLE #TEMP_ERROR_CODE (ERROR_CODE VARCHAR(20), MSG VARCHAR(250), ID VARCHAR(20))  
   
@ -56,13 +58,31 @@ CREATE TABLE #TEMP_ERROR_CODE (ERROR_CODE VARCHAR(20), MSG VARCHAR(250), ID VARC
    @_pwdChangeDays     =   RAU.pwdChangeDays,     
    @_pwdChangeWarningDays   =   RAU.pwdChangeWarningDays,   
    @_lastLoginDate     =   RAU.lastLoginDate,  
-    @_invalidPwdCount    =   ISNULL(RAU.wrongPwdCount, 0)  
+    @_invalidPwdCount    =   ISNULL(RAU.wrongPwdCount, 0),
+	@_androidDeviceIMEI = androidDeviceIMEI
  FROM dbo.REFERRAL_APPLICATION_USER (NOLOCK) RAU   
  WHERE RAU.referalCode=@referralCode   
  AND RAU.pwd = dbo.fnaencryptstring(@password)  
    
+	--CREATE TABLE TBL_AGENT_LOGIN_ATTEMPT 
+	--(
+	--	ROW_ID INT NOT NULL IDENTITY(1, 1) PRIMARY KEY
+	--	,REFERRAL_CODE VARCHAR(30)
+	--	,REQUEST_IMEI VARCHAR(50)
+	--	,USER_IMEI VARCHAR(50)
+	--	,REQUEST_DATE DATETIME
+	--	,IS_SUCCESS BIT
+	--	,SUCCESS_MESSAGE VARCHAR(150) 
+	--)
+
+	--insert into log
+	INSERT INTO TBL_AGENT_LOGIN_ATTEMPT(REFERRAL_CODE ,REQUEST_IMEI,USER_IMEI,REQUEST_DATE,IS_SUCCESS,SUCCESS_MESSAGE)
+	SELECT @referralCode, @AgentUniqueId, @_androidDeviceIMEI, GETDATE(), 1, 'Success'
+	
+	SET @LOG_ID = @@IDENTITY
 	--alter table REFERRAL_APPLICATION_USER add agentPlatformId VARCHAR(50)
 	
+
  SET @_UserData ='User:' + ISNULL(@user,'') + ', ReferralCode:' + CAST(@referralCode AS VARCHAR(20)) + ', Ip Address:' + CAST(@IpAddress AS VARCHAR(20))  
  
  IF EXISTS(SELECT 1 FROM REFERRAL_APPLICATION_USER (NOLOCK) WHERE referalCode = @referralCode AND (wrongPwdCount >= 4 OR isLocked = 1))  
--- a/JMEAgentSystem/Account.Master
+++ b/JMEAgentSystem/Account.Master
@ -6,7 +6,8 @@
 <head runat="server">
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title><%: Page.Title %> - JME Agent System</title>
+    <%--<title><%: Page.Title %> - JME Agent System</title>--%>
+    <title>JME - Tablet</title>

    <asp:PlaceHolder runat="server">
        <%: Styles.Render("~/bundles/plugincss") %>
--- a/JMEAgentSystem/Content/style.css
+++ b/JMEAgentSystem/Content/style.css
@ -3561,7 +3561,7 @@ File: Menu
    .topbar .topbar-left {
        background-color: #ffffff;
        float: left;
-        height: 70px;
+        height: 90px;
        position: relative;
        width: 240px;
        z-index: 1;
--- a/JMEAgentSystem/JMEAgentSystem.csproj
+++ b/JMEAgentSystem/JMEAgentSystem.csproj
@ -338,6 +338,7 @@
    <Content Include="Scripts\app.js" />
    <Content Include="Scripts\bootstrap.js" />
    <Content Include="Scripts\bootstrap.min.js" />
+    <Content Include="Scripts\Calculator\Calculator.js" />
    <Content Include="Scripts\Customer\CustomerRegistration.js" />
    <Content Include="Scripts\Customer\Document.js" />
    <Content Include="Scripts\detect.js" />
@ -441,6 +442,7 @@
    <Content Include="WebPages\AddIdPicture\Manage.aspx" />
    <Content Include="WebPages\BenificiaryRegistration\Manage.aspx" />
    <Content Include="WebPages\BenificiaryRegistration\PrintBeneficiaryDetails.aspx" />
+    <Content Include="WebPages\Calculator\Calculator.aspx" />
    <Content Include="WebPages\Receipt\ViewReceipt.aspx" />
    <Content Include="WebPages\SendTxn\PrintSendMoneyRequestDetails.aspx" />
    <Content Include="WebPages\SendTxn\SendTxnRequest.aspx" />
@ -594,6 +596,13 @@
    <Compile Include="WebPages\BenificiaryRegistration\PrintBeneficiaryDetails.aspx.designer.cs">
      <DependentUpon>PrintBeneficiaryDetails.aspx</DependentUpon>
    </Compile>
+    <Compile Include="WebPages\Calculator\Calculator.aspx.cs">
+      <DependentUpon>Calculator.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebPages\Calculator\Calculator.aspx.designer.cs">
+      <DependentUpon>Calculator.aspx</DependentUpon>
+    </Compile>
    <Compile Include="WebPages\Contact.aspx.cs">
      <DependentUpon>Contact.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
--- a/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user
--- a/JMEAgentSystem/Site.Master
+++ b/JMEAgentSystem/Site.Master
@ -6,7 +6,8 @@
 <head runat="server">
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title><%: string.IsNullOrEmpty(Page.Title)?"JME":Page.Title %> - JME Agent System</title>
+    <%--<title><%: string.IsNullOrEmpty(Page.Title)?"JME":Page.Title %> - JME Agent System</title>--%>
+    <title>JME - Tablet</title>

    <asp:PlaceHolder runat="server">
        <%: Styles.Render("~/bundles/plugincss") %>
@ -44,7 +45,7 @@
 </head>
 <body class="fixed-left">
    <form runat="server">
-        
+

        <script type="text/javascript">
            function SetMessageBox(msg, id) {
@ -211,7 +212,16 @@
            // Animate loader off screen
            $(".se-pre-con").fadeOut("slow");;
        });
+        var winwidth = $(document).width();
+
+        if (winwidth <= 767) {
+            $('#wrapper').removeClass('forced');
+            $('#wrapper').addClass('enlarged');

+            $('.open-left').on('click', function (e) {
+                $('#wrapper').addClass('forced');
+            });
+        }

    </script>
 </body>
--- a/JMEAgentSystem/WebPages/About.aspx
+++ b/JMEAgentSystem/WebPages/About.aspx
@ -1,4 +1,4 @@
-<%@ Page Title="About" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="JMEAgentSystem.About" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="JMEAgentSystem.About" %>

 <asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
    <div class="row">
--- a/JMEAgentSystem/WebPages/Account/Login.aspx
+++ b/JMEAgentSystem/WebPages/Account/Login.aspx
@ -17,7 +17,7 @@
                        <asp:TextBox TextMode="Password" ID="password" name="password" runat="server" CssClass="form-control" placeholder="PASSWORD"></asp:TextBox>
                    </div>
                </div>
-                <div class="form-group">
+                <div class="form-group" style="display:none;">
                    <div class="col-xs-12">
                        <div class="checkbox checkbox-primary">
                            <input runat="server" id="checkbox_signup" type="checkbox">
--- a/JMEAgentSystem/WebPages/Account/Login.aspx.cs
+++ b/JMEAgentSystem/WebPages/Account/Login.aspx.cs
@ -2,11 +2,9 @@
 using Business.Configuration;
 using Common.Helper;
 using Common.Model.Account;
-using Common.Utility;
 using Newtonsoft.Json;
 using System;
 using System.Data;
-using System.Web;


 namespace JMEAgentSystem.WebPages.Account
@ -24,7 +22,7 @@ namespace JMEAgentSystem.WebPages.Account
            {
                Logout();
            }
-            CheckRememberMe();
+            //CheckRememberMe();
        }

        private void CheckRememberMe()
--- a/JMEAgentSystem/WebPages/AddIdPicture/Manage.aspx
+++ b/JMEAgentSystem/WebPages/AddIdPicture/Manage.aspx
@ -33,7 +33,7 @@
                                                    </div>
                                                </div>
                                                <div class="file-upload" id="front">
-                                                    <asp:FileUpload ID="reg_front_id" type="file" runat="server" class="uploadbutton" accept="image/*" meta:resourcekey="reg_front_idResource1" />
+                                                    <asp:FileUpload ID="reg_front_id" type="file" runat="server" class="uploadbutton" accept="image/capture" capture="camera"/>
                                                    <%--<input type="file" name="reg-front-id" id="reg-front-id" required="required" class="uploadbutton" accept="image/*" />--%>
                                                    <span>
                                                        <asp:Localize runat="server" meta:resourcekey="Register_042" Text="Drag and drop your file here or "></asp:Localize><span class="primary-c"><asp:Localize runat="server" meta:resourcekey="Register_043" Text="Browse"></asp:Localize></span>
@ -58,7 +58,7 @@
                                                    </div>
                                                </div>
                                                <div class="file-upload" id="back">
-                                                    <asp:FileUpload ID="reg_back_id" type="file" runat="server" class="uploadbutton" accept="image/*" meta:resourcekey="reg_back_idResource1" />
+                                                    <asp:FileUpload ID="reg_back_id" type="file" runat="server" class="uploadbutton" accept="image/capture" capture="camera"/>
                                                    <%--<input type="file" name="reg-back-id" id="reg-back-id" required="required" class="uploadbutton" accept="image/*" />--%>
                                                    <span>
                                                        <asp:Localize runat="server" meta:resourcekey="Register_042" Text="Drag and drop your file here or "></asp:Localize><span class="primary-c"><asp:Localize runat="server" meta:resourcekey="Register_043" Text="Browse"></asp:Localize></span><asp:Localize runat="server" meta:resourcekey="Register_044" Text=" for a document to upload"></asp:Localize></span>
--- a/JMEAgentSystem/WebPages/Contact.aspx
+++ b/JMEAgentSystem/WebPages/Contact.aspx
@ -1,4 +1,4 @@
-<%@ Page Title="Contact" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Contact.aspx.cs" Inherits="JMEAgentSystem.Contact" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Contact.aspx.cs" Inherits="JMEAgentSystem.Contact" %>

 <asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
    <div class="">
--- a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx
+++ b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx
@ -503,7 +503,7 @@
                                                    </div>
                                                </div>
                                                <div class="file-upload" id="front">
-                                                    <asp:FileUpload ID="reg_front_id" type="file" runat="server" class="uploadbutton" accept="image/*" meta:resourcekey="reg_front_idResource1" />
+                                                    <asp:FileUpload ID="reg_front_id" type="file" runat="server" class="uploadbutton" accept="image/capture" capture="camera"/>
                                                    <%--<input type="file" name="reg-front-id" id="reg-front-id" required="required" class="uploadbutton" accept="image/*" />--%>
                                                    <span>
                                                        <asp:Localize runat="server" meta:resourcekey="Register_042" Text="Drag and drop your file here or "></asp:Localize><span class="primary-c"><asp:Localize runat="server" meta:resourcekey="Register_043" Text="Browse"></asp:Localize></span>
@ -528,7 +528,7 @@
                                                    </div>
                                                </div>
                                                <div class="file-upload" id="back">
-                                                    <asp:FileUpload ID="reg_back_id" type="file" runat="server" class="uploadbutton" accept="image/*" meta:resourcekey="reg_back_idResource1" />
+                                                    <asp:FileUpload ID="reg_back_id" type="file" runat="server" class="uploadbutton" accept="image/capture" capture="camera"/>
                                                    <%--<input type="file" name="reg-back-id" id="reg-back-id" required="required" class="uploadbutton" accept="image/*" />--%>
                                                    <span>
                                                        <asp:Localize runat="server" meta:resourcekey="Register_042" Text="Drag and drop your file here or "></asp:Localize><span class="primary-c"><asp:Localize runat="server" meta:resourcekey="Register_043" Text="Browse"></asp:Localize></span><asp:Localize runat="server" meta:resourcekey="Register_044" Text=" for a document to upload"></asp:Localize></span>
--- a/JMEAgentSystem/WebPages/Default.aspx
+++ b/JMEAgentSystem/WebPages/Default.aspx
@ -1,4 +1,4 @@
-<%@ Page Title="Home Page" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="JMEAgentSystem._Default" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="JMEAgentSystem._Default" %>

 <asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
    <div class="content">
--- a/JMEAgentSystem/obj/Release/Package/PackageTmp/Account.Master
+++ b/JMEAgentSystem/obj/Release/Package/PackageTmp/Account.Master
@ -6,7 +6,8 @@
 <head runat="server">
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title><%: Page.Title %> - JME Agent System</title>
+    <%--<title><%: Page.Title %> - JME Agent System</title>--%>
+    <title>JME - Tablet</title>

    <asp:PlaceHolder runat="server">
        <%: Styles.Render("~/bundles/plugincss") %>
--- a/JMEAgentSystem/obj/Release/Package/PackageTmp/Content/style.css
+++ b/JMEAgentSystem/obj/Release/Package/PackageTmp/Content/style.css
@ -3561,7 +3561,7 @@ File: Menu
    .topbar .topbar-left {
        background-color: #ffffff;
        float: left;
-        height: 70px;
+        height: 90px;
        position: relative;
        width: 240px;
        z-index: 1;
--- a/JMEAgentSystem/obj/Release/Package/PackageTmp/WebPages/About.aspx
+++ b/JMEAgentSystem/obj/Release/Package/PackageTmp/WebPages/About.aspx
@ -1,4 +1,4 @@
-<%@ Page Title="About" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="JMEAgentSystem.About" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="JMEAgentSystem.About" %>

 <asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
    <div class="row">
--- a/JMEAgentSystem/obj/Release/Package/PackageTmp/WebPages/Contact.aspx
+++ b/JMEAgentSystem/obj/Release/Package/PackageTmp/WebPages/Contact.aspx
@ -1,4 +1,4 @@
-<%@ Page Title="Contact" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Contact.aspx.cs" Inherits="JMEAgentSystem.Contact" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Contact.aspx.cs" Inherits="JMEAgentSystem.Contact" %>

 <asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
    <div class="">
--- a/JMEAgentSystem/obj/Release/TransformWebConfig/original/Web.config
+++ b/JMEAgentSystem/obj/Release/TransformWebConfig/original/Web.config
@ -74,7 +74,7 @@
        <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" />
      </providers>
    </sessionState>
-      <customErrors mode="Off" defaultRedirect="mycustompage.htm"/>
+      <customErrors mode="Off" defaultRedirect="mycustompage.htm" />
  </system.web>
  <appSettings>
    <add key="virtualDirName" value="" />