IME-LONDON
/
WEB_CORE
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'feature/Redmine-16525-Cosmetic_Changes' of http://202.166.220.79:3000/IME-LONDON/WEB_CORE into staging 

# Conflicts:
#	Swift.web/Swift.web.csproj
feature/Redmine-16525-Cosmetic_Changes
Leeza Baidar 2 months ago
parent
2a02ea6427 47627c4aba
commit
cb650fe5f9
5 changed files with 11 additions and 170 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Swift.DAL/Remittance/Transaction/ApproveTransactionDao.cs
  2. 161
      Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyInwardTransaction.aspx
  3. 2
      Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyInwardTransaction.aspx.cs
  4. 2
      Swift.web/Remit/UserControl/UcTransaction.ascx
  5. 12
      Swift.web/Swift.web.csproj

4
Swift.DAL/Remittance/Transaction/ApproveTransactionDao.cs
View File

@ -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;
}
}

161
Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyInwardTransaction.aspx
View File

@ -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>

2
Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyInwardTransaction.aspx.cs
View File

@ -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)

2
Swift.web/Remit/UserControl/UcTransaction.ascx
View File

@ -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>

12
Swift.web/Swift.web.csproj
View File

@ -1409,8 +1409,8 @@
<Content Include="Remit\Transaction\Reports\TransactionNew\TranReport.aspx" />
<Content Include="Remit\Transaction\TroubleTicket\Manage.aspx" />
<Content Include="Remit\Transaction\TroubleTicket\UnResolvedList.aspx" />
<Content Include="Remit\Transaction\VerifyMobileTransaction\VerifyDebitCardTxn.aspx" />
<Content Include="Remit\Transaction\VerifyMobileTransaction\VerifyInwardTransaction.aspx" />
<Content Include="Remit\Transaction\VerifyMobileTransaction\VerifyDebitCardTxn.aspx" />
<Content Include="Remit\Transaction\VerifyMobileTransaction\VerifyMobileTransaction.aspx" />
<Content Include="SwiftSystem\ReceivePageFieldSetup\FieldSetup.aspx" />
<Content Include="ui\index\images\ime-london.ico" />
@ -9725,20 +9725,22 @@
<Compile Include="Remit\Transaction\UpdateBranchCode\Manage.aspx.designer.cs">
<DependentUpon>Manage.aspx</DependentUpon>
</Compile>
<Compile Include="Remit\Transaction\VerifyMobileTransaction\VerifyDebitCardTxn.aspx.cs">
<DependentUpon>VerifyDebitCardTxn.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</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">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Remit\Transaction\VerifyMobileTransaction\VerifyDebitCardTxn.aspx.designer.cs">
<DependentUpon>VerifyDebitCardTxn.aspx</DependentUpon>
</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>
<Compile Include="Remit\Transaction\VerifyMobileTransaction\VerifyMobileTransaction.aspx.cs">
<DependentUpon>VerifyMobileTransaction.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

Write Preview
Loading…
Cancel
Save