diff --git a/Merchant Token Vault Management/backstage/Controllers/TokenVaultController .cs b/Merchant Token Vault Management/backstage/Controllers/TokenVaultController .cs
index 6489822d7a18cb4e403c36a17231eb98fe158ee7..d44070b19294013db837b6f4d3cbf1bb068d8148 100644
--- a/Merchant Token Vault Management/backstage/Controllers/TokenVaultController .cs
+++ b/Merchant Token Vault Management/backstage/Controllers/TokenVaultController .cs
@@ -1840,7 +1840,7 @@ namespace backstage.Controllers
permission = "Permission";
Fields = "Fields";
backup = "Backup";
- restitute = "Restitute";
+ restitute = "Restore";
break;
case "zh":
permission = "甈𢠃��";
diff --git a/Merchant Token Vault Management/backstage/Resources/Views/Key/ListKeys.zh.resx b/Merchant Token Vault Management/backstage/Resources/Views/Key/ListKeys.zh.resx
index d249321789a9d9b63a9a16acdddecda88ba33430..b00b15124e83245377475aab22ef09829c3543f9 100644
--- a/Merchant Token Vault Management/backstage/Resources/Views/Key/ListKeys.zh.resx
+++ b/Merchant Token Vault Management/backstage/Resources/Views/Key/ListKeys.zh.resx
@@ -210,10 +210,10 @@
<data name="Inactive" xml:space="preserve">
<value>�𧊋��毺鍂</value>
</data>
- <data name="Key part1" xml:space="preserve">
+ <data name="Key Part 1" xml:space="preserve">
<value>蝚砌�蝯�Key</value>
</data>
- <data name="Key part2" xml:space="preserve">
+ <data name="Key Part 2" xml:space="preserve">
<value>蝚砌�𣬚�Key</value>
</data>
<data name="Keys List" xml:space="preserve">
diff --git a/Merchant Token Vault Management/backstage/Resources/Views/TokenVault/List.zh.resx b/Merchant Token Vault Management/backstage/Resources/Views/TokenVault/List.zh.resx
index cb39335eda2dbf68d39d7d9d1f0ab54802ff00e9..c20a6668c43e36ee3c327542f6a585e9779529ac 100644
--- a/Merchant Token Vault Management/backstage/Resources/Views/TokenVault/List.zh.resx
+++ b/Merchant Token Vault Management/backstage/Resources/Views/TokenVault/List.zh.resx
@@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <data name="Backup" xml:space="preserve">
+ <value>�嗘遢</value>
+ </data>
<data name="Cancel" xml:space="preserve">
<value>��𡝗��</value>
</data>
@@ -150,6 +153,9 @@
<data name="Description" xml:space="preserve">
<value>��讛膩</value>
</data>
+ <data name="Download" xml:space="preserve">
+ <value>銝贝��</value>
+ </data>
<data name="ID" xml:space="preserve">
<value>蝺刻��</value>
</data>
@@ -171,6 +177,12 @@
<data name="Please confirm to delete vault." xml:space="preserve">
<value>�脣�睃澈�⏛�膄蝣箄��</value>
</data>
+ <data name="Please download the bakup file." xml:space="preserve">
+ <value>隢衤�贝�匧�嗘遢瑼�</value>
+ </data>
+ <data name="Restore" xml:space="preserve">
+ <value>�����</value>
+ </data>
<data name="Serial number" xml:space="preserve">
<value>蝺刻��</value>
</data>
diff --git a/Merchant Token Vault Management/backstage/Resources/Views/TokenVault/ListMasks.zh.resx b/Merchant Token Vault Management/backstage/Resources/Views/TokenVault/ListMasks.zh.resx
index ef105e22079a6de186473c912fd06f061434b862..3acd6491731b0692fb408791ce582fa57596748e 100644
--- a/Merchant Token Vault Management/backstage/Resources/Views/TokenVault/ListMasks.zh.resx
+++ b/Merchant Token Vault Management/backstage/Resources/Views/TokenVault/ListMasks.zh.resx
@@ -171,7 +171,7 @@
<data name="Delete" xml:space="preserve">
<value>�⏛�膄</value>
</data>
- <data name="Delete mask" xml:space="preserve">
+ <data name="Delete Mask" xml:space="preserve">
<value>�⏛�膄�桃蔗</value>
</data>
<data name="Description" xml:space="preserve">
@@ -228,9 +228,6 @@
<data name="Select user" xml:space="preserve">
<value>�鰵憓䂿鍂��</value>
</data>
- <data name="Send out" xml:space="preserve">
- <value>���枂</value>
- </data>
<data name="Serial number" xml:space="preserve">
<value>蝺刻��</value>
</data>
@@ -240,6 +237,9 @@
<data name="Status" xml:space="preserve">
<value>����</value>
</data>
+ <data name="Submit" xml:space="preserve">
+ <value>���枂</value>
+ </data>
<data name="Token Vault List" xml:space="preserve">
<value>隞�Ⅳ��碶�嗪麬摨怠�𡑒”蝞∠�</value>
</data>
diff --git a/Merchant Token Vault Management/backstage/Views/Key/ListKeys.cshtml b/Merchant Token Vault Management/backstage/Views/Key/ListKeys.cshtml
index 495991e351ec126f313cc730c3f8a51a6f82c39b..3291aea7bbb69930bf328c55635e7b4d0a46a81f 100644
--- a/Merchant Token Vault Management/backstage/Views/Key/ListKeys.cshtml
+++ b/Merchant Token Vault Management/backstage/Views/Key/ListKeys.cshtml
@@ -158,13 +158,13 @@
</div>
<div class="hidden" id="recoverKeyForm">
<div class="form-group">
- <label class="control-label">@Localizer["Key part1"]:</label>
+ <label class="control-label">@Localizer["Key Part 1"]:</label>
<div>
<input type="text" class="form-control input-sm" id="key1">
</div>
</div>
<div class="form-group">
- <label class="control-label">@Localizer["Key part2"]:</label>
+ <label class="control-label">@Localizer["Key Part 2"]:</label>
<div>
<input type="text" class="form-control input-sm" id="key2">
</div>
@@ -241,7 +241,7 @@
-->
<h3 class="modal-title">
@*<img src="~/images/memberGo/apiKey/newapp-orange-300ppi.png">*@
- @Localizer["Edit key"]
+ @Localizer["Edit Key"]
</h3>
</div> <!--END of div "modal-header"-->
<div class="modal-body" style="padding-top:35px">
diff --git a/Merchant Token Vault Management/backstage/Views/Shared/_Layout.cshtml b/Merchant Token Vault Management/backstage/Views/Shared/_Layout.cshtml
index 0a08aa62a0f7fc894aaa88e0eeed79d4a2c91d7c..c6aed6bbbba0bff0e4cef80fbff3e457ae7a781c 100644
--- a/Merchant Token Vault Management/backstage/Views/Shared/_Layout.cshtml
+++ b/Merchant Token Vault Management/backstage/Views/Shared/_Layout.cshtml
@@ -77,6 +77,10 @@
</div>
</a>
<div class="dropdown-menu navbar-dropdown" aria-labelledby="profileDropdown">
+ <a class="dropdown-item" asp-controller="User" asp-action="UploadLicense">
+ <i class="mdi mdi-folder-upload mr-2"></i>@Localizer["Upload New License File"]
+ </a>
+ <div class="dropdown-divider"></div>
<a class="dropdown-item" asp-controller="User" asp-action="ChangePassword" asp-route-username="@Context.User.Claims.FirstOrDefault(m => m.Type == "username").Value" asp-route-returnUrl="@Context.Request.Path.Value">
<i class="mdi mdi-lock-open mr-2"></i>@Localizer["Change Password"]
</a>
diff --git a/Merchant Token Vault Management/backstage/Views/TokenVault/List.cshtml b/Merchant Token Vault Management/backstage/Views/TokenVault/List.cshtml
index 9b470964c20ba4eecbf2bf194ed2d91c6b3eb4d2..d422bb00e5b70ad5bd4f32ce2391b35f2f6d5dbd 100644
--- a/Merchant Token Vault Management/backstage/Views/TokenVault/List.cshtml
+++ b/Merchant Token Vault Management/backstage/Views/TokenVault/List.cshtml
@@ -55,7 +55,7 @@
<div>
<div class="rank-table">
<div class="table-responsive">
- <table class="table table-striped ">
+ <table class="table table-striped TBL_tokenVaultList">
<thead>
<tr class="">
<th> @Localizer["ID"]</th>
@@ -109,14 +109,14 @@
<div class="modal-content">
<div class="modal-header">
- <h3 class="modal-title">Backup</h3>
+ <h3 class="modal-title">@Localizer["Backup"]</h3>
</div>
<div class="modal-body" style="padding-top:35px; padding-bottom: 35px">
- <p class="modal-body-title">銝贝�匧�嗘遢瑼𥪜��𧋦璈�</p>
- <p>銝贝�匧�嗘遢瑼𥪜��𧋦璈�</p>
+ <p class="modal-body-title"></p>
+ <p>@Localizer["Please download the bakup file."]</p>
<div class="SubmitBlock SubmitBlock_sm">
- <button type="button" id="backupConfirm" class="btn btn-mainblue-solid" data-dismiss="modal" style="">@Localizer["Confirm"]</button>
+ <button type="button" id="backupConfirm" class="btn btn-mainblue-solid" data-dismiss="modal" style="">@Localizer["Download"]</button>
<button type="button" class="btn btn-mainblue-hollow" data-dismiss="modal" style="">@Localizer["Cancel"]</button>
</div>
</div>
@@ -135,7 +135,7 @@
<div class="modal-content">
<div class="modal-header">
- <h3 class="modal-title">Restitute</h3>
+ <h3 class="modal-title">@Localizer["Restore"]</h3>
</div>
<div class="modal-body" style="padding-top:35px; padding-bottom: 35px">
diff --git a/Merchant Token Vault Management/backstage/Views/TokenVault/ListFields.cshtml b/Merchant Token Vault Management/backstage/Views/TokenVault/ListFields.cshtml
index afe0ad09c1a6c23ce2de91d8b2c01faa81683941..03a175f98d1f5514d1a848bffb34791ad7c88b08 100644
--- a/Merchant Token Vault Management/backstage/Views/TokenVault/ListFields.cshtml
+++ b/Merchant Token Vault Management/backstage/Views/TokenVault/ListFields.cshtml
@@ -97,7 +97,7 @@
<div>
<div class="rank-table">
<div class="table-responsive">
- <table class="table table-striped ">
+ <table class="table table-striped TBL_fieldList">
<thead>
<tr class="">
<th>@Localizer["Serial number"]</th>
diff --git a/Merchant Token Vault Management/backstage/Views/TokenVault/ListMasks.cshtml b/Merchant Token Vault Management/backstage/Views/TokenVault/ListMasks.cshtml
index 06272d795c63e7e4b956133a03ae421132a96b60..77657810dbb837560d82c5908fa20f6658e18715 100644
--- a/Merchant Token Vault Management/backstage/Views/TokenVault/ListMasks.cshtml
+++ b/Merchant Token Vault Management/backstage/Views/TokenVault/ListMasks.cshtml
@@ -148,7 +148,7 @@
<button type="button" class="close" data-dismiss="modal">×</button>
-->
<h3 class="modal-title">
- @Localizer["Add mask"]
+ @Localizer["Add Mask"]
</h3>
</div> <!--END of div "modal-header"-->
@@ -219,7 +219,7 @@
</div>
</div>
<div class="SubmitBlock">
- <button id="createMaskBtn" type="button" class="btn btn-mainblue-solid btnSubmit0"> @Localizer["Send out"]</button>
+ <button id="createMaskBtn" type="button" class="btn btn-mainblue-solid btnSubmit0"> @Localizer["Submit"]</button>
<button type="button" class="btn btn-mainblue-hollow btnReset0" data-dismiss="modal"> @Localizer["Cancel"]</button>
</div>
</form>
@@ -247,7 +247,7 @@
<div class="modal-header">
<h4>
- @Localizer["Delete mask"]
+ @Localizer["Delete Mask"]
</h4>
</div> <!--END of div "modal-header"-->
diff --git a/Merchant Token Vault Management/backstage/Views/TokenVault/ListUsers.cshtml b/Merchant Token Vault Management/backstage/Views/TokenVault/ListUsers.cshtml
index e422ffacc013e85dbf8febfc5e42da8787c85676..46c0a29fac392235b56b893560fc8ef4f46156fb 100644
--- a/Merchant Token Vault Management/backstage/Views/TokenVault/ListUsers.cshtml
+++ b/Merchant Token Vault Management/backstage/Views/TokenVault/ListUsers.cshtml
@@ -97,7 +97,7 @@
<td class="editUser">@i.default_mask_id</td>
<td>
- <a data-id="@i.id" class="btn btnPermission btn-sm" data-toggle="modal" data-target="#delete-field-user">@Localizer["Remove user"]</a>
+ <a data-id="@i.id" class="btn btnPermission btn-sm" data-toggle="modal" data-target="#delete-field-user">@Localizer["Remove User"]</a>
</td>
</tr>
}
diff --git a/Merchant Token Vault Management/backstage/Views/User/UploadLicense.cshtml b/Merchant Token Vault Management/backstage/Views/User/UploadLicense.cshtml
new file mode 100644
index 0000000000000000000000000000000000000000..9c7472162fa7dc98f71fbc795a50034ebf7d47ef
--- /dev/null
+++ b/Merchant Token Vault Management/backstage/Views/User/UploadLicense.cshtml
@@ -0,0 +1,91 @@
+嚜濃using Microsoft.AspNetCore.Mvc.Localization
+@inject IViewLocalizer Localizer
+@model backstage.Models.Users.UserResponse
+@{
+ bool isAdmin = User.IsInRole("Admin");
+ string disabledClass = isAdmin ? "" : "disabled";
+}
+<div class="page-header">
+
+ <h3 class="page-title">@Localizer["Upload New License File"]</h3>
+ <input id="msg" hidden value="@TempData["msg"]" />
+ @if (TempData["isSuccess"] != null)
+ {
+ <input id="isSuccess" hidden value="@TempData["isSuccess"].ToString()" />
+ }
+ <div class="floating-msg" id="msgDiv"></div>
+</div>
+
+@section header
+{
+ <script>
+ var localizationStrings = {
+ success: '@Localizer["��𣂼��"]',
+ error: '@Localizer["�𥲤隤�"]'
+ };
+ </script>
+}
+<div class="row">
+ <div class="col-lg-12 grid-margin stretch-card">
+ <div class="card">
+ <div class="card-body">
+ <p class="form-title card-description">Upload File</p>
+ <form class="forms-sample">
+ <div class="row align-items-center">
+ <div class="col-md-8 col-lg-6 form-group0 mt-1 mb-1">
+ <div class="input-group input-group-lg">
+ <div class="custom-file">
+ <input type="file" class="form-control custom-file-input" id="uploadLicenseFile" accept="">
+ <label class="custom-file-label" id="uploadLicenseFileLabel" for="uploadLicenseFile">Choose file</label>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-4 col-lg-6 form-group0">
+ <div class="SubmitBlock0 SubmitBlock_sm0">
+ <button type="button" id="" class="btn btn-primary">Upload</button>
+ </div>
+ </div>
+ </div>
+ </form>
+
+ <p class="form-title card-description mt-5">License Info</p>
+ <div class="table-responsive">
+ <table class="table table-striped table-hover0 table-bordered TBL_licenseInfo">
+ <tbody>
+ <tr>
+ <th style=" border-left: solid 1px #d9d9d9;">Product Name</th>
+ <td>Token Vault</td>
+ </tr>
+ <tr>
+ <th>Expireation Date</th>
+ <td>2033-07-21 17:00:30</td>
+ </tr>
+ <tr>
+ <th>Product Max Version</th>
+ <td>1.0</td>
+ </tr>
+ <tr>
+ <th>Department</th>
+ <td>Taipay</td>
+ </tr>
+ <tr>
+ <th>Creation Date</th>
+ <td>2023-07-17 17:49:30</td>
+ </tr>
+ <tr>
+ <th>Name</th>
+ <td>API License</td>
+ </tr>
+ <tr>
+ <th style=" border-right: solid 0.1px #d9d9d9;">Other</th>
+ <td></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+</div>
diff --git a/Merchant Token Vault Management/backstage/wwwroot/css/tokenizationPlatform.css b/Merchant Token Vault Management/backstage/wwwroot/css/tokenizationPlatform.css
index f79fdd0314ea3fca1482b9e8a7499363fc5e2740..cbb1a0e30e6fc0cd8263ed9a03d2e70ba1ce5527 100644
--- a/Merchant Token Vault Management/backstage/wwwroot/css/tokenizationPlatform.css
+++ b/Merchant Token Vault Management/backstage/wwwroot/css/tokenizationPlatform.css
@@ -4055,8 +4055,21 @@ TBL_keysList tbody td {
margin-bottom: 10px;
}
+.TBL_tokenVaultList a {
+ color: #337ab7 !important;
+}
+
+.TBL_fieldList a {
+ color: #337ab7 !important;
+}
+.TBL_licenseInfo tbody th {
+ background: #4c6482;
+ color: #fff;
+ width: 15%;
+}
+