From 47627c4abaa89dc3576bea1457467a550406d3a9 Mon Sep 17 00:00:00 2001
From: Leeza Baidar <leeza.baidar@gmeremit.com.np>
Date: Fri, 2 Aug 2024 14:42:51 +0545
Subject: [PATCH] #33778 verify inward remittance

---
 .../Transaction/ApproveTransactionDao.cs      |   4 +-
 .../VerifyInwardTransaction.aspx              | 161 +-----------------
 .../VerifyInwardTransaction.aspx.cs           |   2 -
 .../Remit/UserControl/UcTransaction.ascx      |   2 +-
 Swift.web/Swift.web.csproj                    |   3 +
 5 files changed, 7 insertions(+), 165 deletions(-)

diff --git a/Swift.DAL/Remittance/Transaction/ApproveTransactionDao.cs b/Swift.DAL/Remittance/Transaction/ApproveTransactionDao.cs
index 81cfb67..66c97ff 100644
--- a/Swift.DAL/Remittance/Transaction/ApproveTransactionDao.cs
+++ b/Swift.DAL/Remittance/Transaction/ApproveTransactionDao.cs
@@ -263,7 +263,7 @@ namespace Swift.DAL.BL.Remit.Transaction
 
         public DbResult ApproveHoldedTXN(string user, string id)
         {
-            var sql = "EXEC proc_ApproveHoldedTXN @flag = 'approve'";
+            var sql = "EXEC proc_ApproveInwardHoldedTXN @flag = 'approve'";
             sql += ", @user = " + FilterString(user);
             sql += ", @id = " + FilterString(id);
             var drDb = ParseDbResult(sql);
@@ -862,7 +862,7 @@ namespace Swift.DAL.BL.Remit.Transaction
             var sql = "EXEC PROC_TP_TXN_PUSH @flag =  'INSTANT-PAID_V2'";
             sql += ", @user = " + FilterString(user);
             sql += ", @TRAN_ID = " + FilterString(id);
-            var drDb = ParseDbResult(sql);
+             var drDb = ParseDbResult(sql);
             return drDb;
         }
     }
diff --git a/Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyInwardTransaction.aspx b/Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyInwardTransaction.aspx
index 1b3d28e..3ba091e 100644
--- a/Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyInwardTransaction.aspx
+++ b/Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyInwardTransaction.aspx
@@ -218,166 +218,7 @@
                     </div>
                 </div>
             </div>
-            <%--<div class="container-fluid">
-                <div class="row">
-                    <div class="col-md-12">
-                        <div class="modal fade" id="myModal2" style="margin-top: 100px;" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                            <div class="modal-dialog modal-md" role="document">
-                                <div class="modal-content">
-                                    <div class="modal-header" id="modelUserForSave1">
-                                        <center>
-                                            <h2 class="modal-title">Customer Deposit Mapping
-                                                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button></h2>
-                                        </center>
-                                    </div>
-                                    <div style="margin: 10px" role="tabpanel">
-                                        <!-- Nav tabs -->
-                                        <ul class="nav nav-tabs" role="tablist">
-                                            <li role="presentation" class="active"><a href="#unMappedTab" aria-controls="uploadTab" role="tab" data-toggle="tab">Unmapped Deposit List</a>
-
-                                            </li>
-                                            <li role="presentation"><a href="#unApprovedTab" aria-controls="browseTab" role="tab" data-toggle="tab">Unapproved Deposit List</a>
-
-                                            </li>
-                                        </ul>
-                                        <!-- Tab panes -->
-                                        <div class="tab-content">
-                                            <div role="tabpanel" class="tab-pane active" id="unMappedTab">
-                                                <div class="row">
-                                                    <div class="form-group col-md-4">
-                                                        <label class="">Tran Date:</label>
-                                                        <div class="form-inline">
-                                                            <div class="input-group input-append date">
-                                                                <asp:TextBox runat="server" ID="tranDate" onchange="return DateValidation('tranDate','i')" MaxLength="10" AutoComplete="off" placeholder="YYYY/MM/DD" CssClass="form-control datepicker date-field required"></asp:TextBox>
-                                                                <div class="input-group-addon "><i class="fa fa-calendar"></i></div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="form-group col-md-4">
-                                                        <label>Particulars</label>
-                                                        <asp:TextBox ID="particulars" runat="server" CssClass="form-control"></asp:TextBox>
-                                                    </div>
-                                                    <div class="form-group col-md-4">
-                                                        <label>Amount</label>
-                                                        <asp:TextBox ID="amount" runat="server" CssClass="form-control"></asp:TextBox>
-                                                    </div>
-                                                    <div class="form-group col-md-12">
-                                                        <input type="button" id="filterBtn" value="Filter" class="btn btn-primary" />
-                                                        <input type="button" id="clearBtn" value="Clear" class="btn btn-primary" />
-                                                    </div>
-                                                </div>
-                                                <div class="row form-group" style="max-height: 350px; overflow-y: scroll;">
-                                                    <div class="col-md-12 table-responsive">
-                                                        <table class="table table-responsive table-bordered">
-                                                            <thead>
-                                                                <tr>
-                                                                    <th width="5%"><i class="fa fa-check check"></i><i class="fa fa-times uncheck" style="display: none;"></i></th>
-                                                                    <th width="50%">Particulars</th>
-                                                                    <th width="15%">Deposit Date</th>
-                                                                    <th width="15%">Deposit Amount</th>
-                                                                    <th width="15%">Withdraw Amount</th>
-                                                                </tr>
-                                                            </thead>
-                                                            <tbody id="UnmappedDepositMapping" runat="server">
-                                                                <tr>
-                                                                    <td colspan="5" align="center">No Data To Display </td>
-                                                                </tr>
-                                                            </tbody>
-                                                        </table>
-                                                    </div>
-                                                </div>
-                                                <div class="row">
-                                                    <div class="form-group col-md-12">
-                                                        <asp:Button ID="btnConfirmSave" runat="server" OnClientClick="return ConfirmSave();" CssClass="btn btn-primary" Text="Confirm Save" />
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div role="tabpanel" class="tab-pane" id="unApprovedTab">
-                                                <div class="row form-group">
-                                                    <div class="col-md-12 table-responsive">
-                                                        <table class="table table-responsive table-bordered">
-                                                            <thead>
-                                                                <tr>
-                                                                    <th width="5%"><i class="fa fa-check check"></i><i class="fa fa-times uncheck" style="display: none;"></i></th>
-                                                                    <th width="50%">Particulars</th>
-                                                                    <th width="15%">Deposit Date</th>
-                                                                    <th width="15%">Deposit Amount</th>
-                                                                    <th width="15%">Withdraw Amount</th>
-                                                                </tr>
-                                                            </thead>
-                                                            <tbody id="UnApprovedDepositMapping" runat="server">
-                                                                <tr>
-                                                                    <td colspan="5" align="center">No Data To Display </td>
-                                                                </tr>
-                                                            </tbody>
-                                                        </table>
-                                                    </div>
-                                                </div>
-                                                <div class="row form-group">
-                                                    <div class="form-group col-md-12">
-                                                        <input type="button" id="btnRelease" onclick="return UnmapTxn();" class="btn btn-primary" value="Unmap Data" />
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>--%>
-            <%--<div class="container-fluid">
-                <div class="row">
-                    <div class="col-md-12">
-                        <div class="modal fade" id="collectCashModel" style="margin-top: 100px; overflow: hidden;" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-                            <div class="modal-dialog modal-md" role="document">
-                                <div class="modal-content">
-                                    <div class="modal-header" id="modelUserForSave2">
-                                        <center>
-                                            <h2 class="modal-title">Cash Collect
-                                                <button type="button" class="close" data-dismiss="modal" aria-label="Close" onclick="return Cancel();"><span aria-hidden="true">&times;</span></button></h2>
-                                        </center>
-                                    </div>
-                                    <div style="margin: 10px" role="tabpanel">
-                                        <div class="tab-content">
-                                            <div role="tabpanel" class="tab-pane active" id="cashCollectTab">
-                                                <div class="row">
-                                                    <div class="col-md-6 form-group">
-                                                        <div class="row">
-                                                            <label>
-                                                                Collected By
-                                                            </label>
-                                                        </div>
-                                                        <div class="row">
-
-                                                            <asp:DropDownList ID="collectedByDDl" runat="server" CssClass="form-control"></asp:DropDownList>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-6 form-group">
-                                                        <label class="">Collect Amout:</label>
-                                                        <div class="form-inline">
-                                                            <div class="input-group input-append date">
-                                                                <asp:TextBox ID="collectAmountByStaff" runat="server" CssClass="form-control"></asp:TextBox>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="row">
-                                                    <div class="form-group col-md-12">
-                                                        <input type="button" class="btn btn-primary" onclick="return ConfirmSaveCashCollect('i');" value="Save" />
-                                                        <input type="button" class="btn btn-danger" onclick="return Cancel();" value="Cancel" />
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>--%>
+            
         </div>
     </form>
     <script>
diff --git a/Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyInwardTransaction.aspx.cs b/Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyInwardTransaction.aspx.cs
index a835d64..4087b33 100644
--- a/Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyInwardTransaction.aspx.cs
+++ b/Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyInwardTransaction.aspx.cs
@@ -104,7 +104,6 @@ namespace Swift.web.Remit.Transaction.VerifyMobileTransaction
                 sb.Append("<th>Control No.</th>");
                 sb.Append("<th>Txn Channel</th>");
                 sb.Append("<th>Sender</th>");
-                sb.Append("<th>MembershipId</th>");
                 sb.Append("<th>Country</th>");
                 sb.Append("<th>Sender Mobile</th>");
                 sb.Append("<th>Receiver</th>");
@@ -114,7 +113,6 @@ namespace Swift.web.Remit.Transaction.VerifyMobileTransaction
 
                 sb.Append("<th>Payment Method</th>");
                 sb.Append("<th nowrap='nowrap'>Tran Date</th>");
-                sb.Append("<th nowrap='nowrap'>Payment Option</th>");
                 //sb.Append("<th nowrap='nowrap'>Mapped Detail</th>");
 
                 if (allowVeirfy)
diff --git a/Swift.web/Remit/UserControl/UcTransaction.ascx b/Swift.web/Remit/UserControl/UcTransaction.ascx
index d5b4daf..0b71554 100644
--- a/Swift.web/Remit/UserControl/UcTransaction.ascx
+++ b/Swift.web/Remit/UserControl/UcTransaction.ascx
@@ -493,7 +493,7 @@
                             <td class="text" style="width: 150px">
                                 <asp:Label ID="nativeCountry" runat="server"></asp:Label>
                             </td>
-                            <td style="width: 60px;">Occuapation: </td>
+                            <td style="width: 60px;">Occupation: </td>
                             <td class="text" colspan="2">
                                 <asp:Label ID="occupation" runat="server"></asp:Label>
                             </td>
diff --git a/Swift.web/Swift.web.csproj b/Swift.web/Swift.web.csproj
index ac6dbe6..ab2820d 100644
--- a/Swift.web/Swift.web.csproj
+++ b/Swift.web/Swift.web.csproj
@@ -9727,12 +9727,15 @@
     </Compile>
     <Compile Include="Remit\Transaction\VerifyMobileTransaction\VerifyInwardTransaction.aspx.cs">
       <DependentUpon>VerifyInwardTransaction.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="Remit\Transaction\VerifyMobileTransaction\VerifyDebitCardTxn.aspx.cs">
       <DependentUpon>VerifyDebitCardTxn.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Remit\Transaction\VerifyMobileTransaction\VerifyInwardTransaction.aspx.designer.cs">
       <DependentUpon>VerifyInwardTransaction.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Remit\Transaction\VerifyMobileTransaction\VerifyDebitCardTxn.aspx.designer.cs">
       <DependentUpon>VerifyDebitCardTxn.aspx</DependentUpon>
     </Compile>