From 8f6620e7aa5d235d2e39f0a69976da48bbd05463 Mon Sep 17 00:00:00 2001 From: caturbgs Date: Wed, 22 Dec 2021 21:40:07 +0700 Subject: [PATCH] fix: change wording menu payback --- src/pages/App/DesktopLayout.js | 18 +++++++++--------- src/pages/App/MenuList.js | 8 ++++---- src/pages/Payback/Payback.js | 1 - .../{PaybackFromUser.js => PaybackCreated.js} | 5 ++--- src/pages/Payback/PaybackModal.js | 4 ++-- src/routes/app.js | 8 ++++---- 6 files changed, 21 insertions(+), 23 deletions(-) rename src/pages/Payback/{PaybackFromUser.js => PaybackCreated.js} (98%) diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js index 0769e58..8e1edd0 100644 --- a/src/pages/App/DesktopLayout.js +++ b/src/pages/App/DesktopLayout.js @@ -206,24 +206,24 @@ export const DesktopLayout = observer(() => { )} } - title="Payback" + key="payback-main" + icon={} + title="Created" > {store.authentication.userData.role !== "Retail" && ( - - Payback To + + Confirmation )} {store.authentication.userData.role !== "Admin" && ( - - - Payback - + + + Created + )} diff --git a/src/pages/App/MenuList.js b/src/pages/App/MenuList.js index 5ece71d..6bd6c96 100644 --- a/src/pages/App/MenuList.js +++ b/src/pages/App/MenuList.js @@ -131,16 +131,16 @@ export const MenuList = observer((props) => { {store.authentication.userData.role !== "Retail" && ( - - Payback To + + Confirmation )} {store.authentication.userData.role !== "Admin" && ( - + - Payback + Created )} diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js index 3423829..c1ff5b4 100644 --- a/src/pages/Payback/Payback.js +++ b/src/pages/Payback/Payback.js @@ -33,7 +33,6 @@ export const Payback = observer(() => { init(); }, []); - const columns = [ { title: "Picture", diff --git a/src/pages/Payback/PaybackFromUser.js b/src/pages/Payback/PaybackCreated.js similarity index 98% rename from src/pages/Payback/PaybackFromUser.js rename to src/pages/Payback/PaybackCreated.js index 3cca08e..d990149 100644 --- a/src/pages/Payback/PaybackFromUser.js +++ b/src/pages/Payback/PaybackCreated.js @@ -10,7 +10,7 @@ import {ModalLoaderContext} from "../../utils/modal"; const {Search} = Input; -export const PaybackFromUser = observer(() => { +export const PaybackCreated = observer(() => { const store = useStore(); const [initialData, setInitialData] = useState({}); const modalLoader = useContext(ModalLoaderContext); @@ -37,7 +37,6 @@ export const PaybackFromUser = observer(() => { init(); }, []); - const columns = [ { title: "Picture", @@ -70,7 +69,7 @@ export const PaybackFromUser = observer(() => { name: "Home", }, { - route: LINKS.PAYBACK_FROM_USER, + route: LINKS.PAYBACK_CREATED, name: Payback User, }, ]; diff --git a/src/pages/Payback/PaybackModal.js b/src/pages/Payback/PaybackModal.js index 63bdc77..39ae6b9 100644 --- a/src/pages/Payback/PaybackModal.js +++ b/src/pages/Payback/PaybackModal.js @@ -68,7 +68,7 @@ export const PaybackModal = ({initialData}) => { image_prove: responseFilename } await store.payback.create(request); - message.success("Success Add Payback"); + message.success("Success Add Created"); } catch (e) { if (e.response?.body?.message) { message.error(e.response.body.message); @@ -97,7 +97,7 @@ export const PaybackModal = ({initialData}) => { return ( { - - + +