Merged PR 295: develop動作確認
## 概要 [Task2214: develop動作確認](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2214) dev動作確認で出た指摘点を修正しました。 指摘点は以下となります。 ・Distributorのスペルが違う →多言語対応を修正 ・子アカウント行で、shortageは正の場合赤字 →赤字対応を追加 ・戻るときにグルグルを追加する →画面更新時のLoading画像を追加 ・注文後に画面更新する →ポップアップを閉じた際の情報再取得を追加 ・アカウントIDについては押せるようなカーソルにすべき →表内のアカウント名選択時のカーソルをポインターに修正 ## レビューポイント なし ## UIの変更 なし ## 動作確認状況 ローカルで動作確認済み ## 補足 なし
This commit is contained in:
parent
794099f37d
commit
3b30ee6035
@ -35,6 +35,7 @@ import {
|
|||||||
import { LicenseOrderPopup } from "./licenseOrderPopup";
|
import { LicenseOrderPopup } from "./licenseOrderPopup";
|
||||||
import LicenseSummary from "./licenseSummary";
|
import LicenseSummary from "./licenseSummary";
|
||||||
import { LicenseOrderHistory } from "../LicenseOrderHistoryPage";
|
import { LicenseOrderHistory } from "../LicenseOrderHistoryPage";
|
||||||
|
import progress_activit from "../../assets/images/progress_activit.svg";
|
||||||
|
|
||||||
const PartnerLicense: React.FC = (): JSX.Element => {
|
const PartnerLicense: React.FC = (): JSX.Element => {
|
||||||
const dispatch: AppDispatch = useDispatch();
|
const dispatch: AppDispatch = useDispatch();
|
||||||
@ -211,6 +212,7 @@ const PartnerLicense: React.FC = (): JSX.Element => {
|
|||||||
<CardLicenseIssuePopup
|
<CardLicenseIssuePopup
|
||||||
onClose={() => {
|
onClose={() => {
|
||||||
setIsCardLicenseIssuePopupOpen(false);
|
setIsCardLicenseIssuePopupOpen(false);
|
||||||
|
dispatch(getMyAccountAsync());
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@ -218,6 +220,7 @@ const PartnerLicense: React.FC = (): JSX.Element => {
|
|||||||
<LicenseOrderPopup
|
<LicenseOrderPopup
|
||||||
onClose={() => {
|
onClose={() => {
|
||||||
setIslicenseOrderPopupOpen(false);
|
setIslicenseOrderPopupOpen(false);
|
||||||
|
dispatch(getMyAccountAsync());
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@ -385,6 +388,7 @@ const PartnerLicense: React.FC = (): JSX.Element => {
|
|||||||
{childrenPartnerLicensesInfo.map((value) => (
|
{childrenPartnerLicensesInfo.map((value) => (
|
||||||
<tr key={value.accountId}>
|
<tr key={value.accountId}>
|
||||||
<td
|
<td
|
||||||
|
title={value.tier !== 5 ? "View child accounts" : ""}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
if (value.tier !== 5) {
|
if (value.tier !== 5) {
|
||||||
handleRowClick(value);
|
handleRowClick(value);
|
||||||
@ -397,7 +401,13 @@ const PartnerLicense: React.FC = (): JSX.Element => {
|
|||||||
<td>{value.accountId}</td>
|
<td>{value.accountId}</td>
|
||||||
<td>{value.stockLicense}</td>
|
<td>{value.stockLicense}</td>
|
||||||
<td>{value.issuedRequested}</td>
|
<td>{value.issuedRequested}</td>
|
||||||
<td>{value.shortage}</td>
|
<td>
|
||||||
|
<span
|
||||||
|
className={value.shortage > 0 ? styles.isAlert : ""}
|
||||||
|
>
|
||||||
|
{value.shortage}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
<td>{value.issueRequesting}</td>
|
<td>{value.issueRequesting}</td>
|
||||||
<td>
|
<td>
|
||||||
<ul
|
<ul
|
||||||
@ -485,6 +495,12 @@ const PartnerLicense: React.FC = (): JSX.Element => {
|
|||||||
</a>
|
</a>
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
|
<img
|
||||||
|
style={{ display: isLoading ? "inline" : "none" }}
|
||||||
|
src={progress_activit}
|
||||||
|
className={styles.icLoading}
|
||||||
|
alt="Loading"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
"copyRight": "(de)OM Digital Solutions 2023",
|
"copyRight": "(de)OM Digital Solutions 2023",
|
||||||
"tier1": "(de)Admin",
|
"tier1": "(de)Admin",
|
||||||
"tier2": "(de)BC",
|
"tier2": "(de)BC",
|
||||||
"tier3": "(de)Distributer",
|
"tier3": "(de)Distributor",
|
||||||
"tier4": "(de)Dealer",
|
"tier4": "(de)Dealer",
|
||||||
"tier5": "(de)Customer"
|
"tier5": "(de)Customer"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
"copyRight": "OM Digital Solutions 2023",
|
"copyRight": "OM Digital Solutions 2023",
|
||||||
"tier1": "Admin",
|
"tier1": "Admin",
|
||||||
"tier2": "BC",
|
"tier2": "BC",
|
||||||
"tier3": "Distributer",
|
"tier3": "Distributor",
|
||||||
"tier4": "Dealer",
|
"tier4": "Dealer",
|
||||||
"tier5": "Customer"
|
"tier5": "Customer"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
"copyRight": "(es)OM Digital Solutions 2023",
|
"copyRight": "(es)OM Digital Solutions 2023",
|
||||||
"tier1": "(es)Admin",
|
"tier1": "(es)Admin",
|
||||||
"tier2": "(es)BC",
|
"tier2": "(es)BC",
|
||||||
"tier3": "(es)Distributer",
|
"tier3": "(es)Distributor",
|
||||||
"tier4": "(es)Dealer",
|
"tier4": "(es)Dealer",
|
||||||
"tier5": "(es)Customer"
|
"tier5": "(es)Customer"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
"copyRight": "(fr)OM Digital Solutions 2023",
|
"copyRight": "(fr)OM Digital Solutions 2023",
|
||||||
"tier1": "(fr)Admin",
|
"tier1": "(fr)Admin",
|
||||||
"tier2": "(fr)BC",
|
"tier2": "(fr)BC",
|
||||||
"tier3": "(fr)Distributer",
|
"tier3": "(fr)Distributor",
|
||||||
"tier4": "(fr)Dealer",
|
"tier4": "(fr)Dealer",
|
||||||
"tier5": "(fr)Customer"
|
"tier5": "(fr)Customer"
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user