From 2a0933e4dd2230bd76cf09f287dcbeee8ede67e3 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 15 May 2023 09:39:34 +0700 Subject: Add quotation, invoice, transaction title and manage profile desktop --- src/lib/auth/components/CompanyProfile.jsx | 70 ++++++++++++------------- src/lib/auth/components/Menu.jsx | 3 ++ src/lib/auth/components/PersonalProfile.jsx | 54 +++++++++---------- src/lib/invoice/components/Invoices.jsx | 6 +-- src/lib/transaction/components/Transactions.jsx | 4 +- src/pages/my/address/[id]/edit.jsx | 3 ++ src/pages/my/address/create.jsx | 3 ++ src/pages/my/address/index.jsx | 3 ++ src/pages/my/invoices/[id].jsx | 3 ++ src/pages/my/invoices/index.jsx | 3 ++ src/pages/my/profile.jsx | 32 +++++++++-- src/pages/my/quotations/[id].jsx | 3 ++ src/pages/my/quotations/index.jsx | 3 ++ src/pages/my/transactions/[id].jsx | 3 ++ src/pages/my/transactions/index.jsx | 3 ++ src/pages/my/wishlist.jsx | 3 ++ 16 files changed, 125 insertions(+), 74 deletions(-) (limited to 'src') diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx index 13d4a194..ff673953 100644 --- a/src/lib/auth/components/CompanyProfile.jsx +++ b/src/lib/auth/components/CompanyProfile.jsx @@ -60,7 +60,6 @@ const CompanyProfile = () => { } const isUpdated = await odooApi('PUT', `/api/v1/partner/${auth.parentId}`, data) if (isUpdated?.id) { - setIsOpen(false) toast.success('Berhasil mengubah profil', { duration: 1500 }) return } @@ -69,59 +68,58 @@ const CompanyProfile = () => { return ( <> - {isOpen && ( -
-
- - } - /> -
-
-
Nama Usaha
-
+ +
+
+ } + render={(props) => } />
-
- +
+
Nama Usaha
+
+ } + /> +
+
+ +
+
+
+ + +
+
+ +
-
- - -
-
- - -
- diff --git a/src/lib/auth/components/Menu.jsx b/src/lib/auth/components/Menu.jsx index 8a8e2e8a..f91fd552 100644 --- a/src/lib/auth/components/Menu.jsx +++ b/src/lib/auth/components/Menu.jsx @@ -29,6 +29,9 @@ const Menu = () => { Daftar Alamat + + Profil Saya + diff --git a/src/lib/auth/components/PersonalProfile.jsx b/src/lib/auth/components/PersonalProfile.jsx index bca54e24..b9fb3f5f 100644 --- a/src/lib/auth/components/PersonalProfile.jsx +++ b/src/lib/auth/components/PersonalProfile.jsx @@ -38,7 +38,6 @@ const PersonalProfile = () => { if (isUpdated?.user) { setAuth(isUpdated.user) setValue('password', '') - setIsOpen(false) toast.success('Berhasil mengubah profil', { duration: 1500 }) return } @@ -47,46 +46,45 @@ const PersonalProfile = () => { return ( <> - {isOpen && ( -
-
- - + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
- - -
-
- - -
-
- - -
- diff --git a/src/lib/invoice/components/Invoices.jsx b/src/lib/invoice/components/Invoices.jsx index 96686bbb..5edcfdbf 100644 --- a/src/lib/invoice/components/Invoices.jsx +++ b/src/lib/invoice/components/Invoices.jsx @@ -71,7 +71,7 @@ const Invoices = () => { {!invoices.isLoading && invoices.data?.invoices?.length === 0 && ( - Tidak ada data invoice + Tidak ada invoice )} @@ -198,7 +198,7 @@ const Invoices = () => { {invoices.isLoading && ( - +
@@ -208,7 +208,7 @@ const Invoices = () => { {!invoices.isLoading && (!invoices?.data?.invoices || invoices?.data?.invoices?.length == 0) && ( - Tidak ada data invoice + Tidak ada invoice )} {invoices.data?.invoices?.map((invoice) => ( diff --git a/src/lib/transaction/components/Transactions.jsx b/src/lib/transaction/components/Transactions.jsx index c1c27a51..642881a6 100644 --- a/src/lib/transaction/components/Transactions.jsx +++ b/src/lib/transaction/components/Transactions.jsx @@ -83,7 +83,7 @@ const Transactions = ({ context = '' }) => { {!transactions.isLoading && transactions.data?.saleOrders?.length === 0 && ( - Tidak ada data transaksi + Tidak ada transaksi )} @@ -246,7 +246,7 @@ const Transactions = ({ context = '' }) => { (!transactions?.data?.saleOrders || transactions?.data?.saleOrders?.length == 0) && ( - Tidak ada data transaksi + Tidak ada transaksi )} {transactions.data?.saleOrders?.map((saleOrder) => ( diff --git a/src/pages/my/address/[id]/edit.jsx b/src/pages/my/address/[id]/edit.jsx index 6706b458..bd680b90 100644 --- a/src/pages/my/address/[id]/edit.jsx +++ b/src/pages/my/address/[id]/edit.jsx @@ -1,3 +1,4 @@ +import Seo from '@/core/components/Seo' import AppLayout from '@/core/components/layouts/AppLayout' import BasicLayout from '@/core/components/layouts/BasicLayout' import DesktopView from '@/core/components/views/DesktopView' @@ -9,6 +10,8 @@ import IsAuth from '@/lib/auth/components/IsAuth' export default function EditAddress({ id, defaultValues }) { return ( + + diff --git a/src/pages/my/address/create.jsx b/src/pages/my/address/create.jsx index be645853..774e4327 100644 --- a/src/pages/my/address/create.jsx +++ b/src/pages/my/address/create.jsx @@ -1,3 +1,4 @@ +import Seo from '@/core/components/Seo' import AppLayout from '@/core/components/layouts/AppLayout' import BasicLayout from '@/core/components/layouts/BasicLayout' import DesktopView from '@/core/components/views/DesktopView' @@ -8,6 +9,8 @@ import IsAuth from '@/lib/auth/components/IsAuth' export default function CreateAddress() { return ( + + diff --git a/src/pages/my/address/index.jsx b/src/pages/my/address/index.jsx index 61d72a41..bd8b3ac3 100644 --- a/src/pages/my/address/index.jsx +++ b/src/pages/my/address/index.jsx @@ -1,3 +1,4 @@ +import Seo from '@/core/components/Seo' import AppLayout from '@/core/components/layouts/AppLayout' import BasicLayout from '@/core/components/layouts/BasicLayout' import DesktopView from '@/core/components/views/DesktopView' @@ -8,6 +9,8 @@ import IsAuth from '@/lib/auth/components/IsAuth' export default function Addresses() { return ( + + diff --git a/src/pages/my/invoices/[id].jsx b/src/pages/my/invoices/[id].jsx index 5972b382..c8f39acf 100644 --- a/src/pages/my/invoices/[id].jsx +++ b/src/pages/my/invoices/[id].jsx @@ -1,3 +1,4 @@ +import Seo from '@/core/components/Seo' import AppLayout from '@/core/components/layouts/AppLayout' import BasicLayout from '@/core/components/layouts/BasicLayout' import DesktopView from '@/core/components/views/DesktopView' @@ -11,6 +12,8 @@ export default function MyInvoice() { return ( + + diff --git a/src/pages/my/invoices/index.jsx b/src/pages/my/invoices/index.jsx index 73c7b9fe..a2eeceaa 100644 --- a/src/pages/my/invoices/index.jsx +++ b/src/pages/my/invoices/index.jsx @@ -1,3 +1,4 @@ +import Seo from '@/core/components/Seo' import AppLayout from '@/core/components/layouts/AppLayout' import BasicLayout from '@/core/components/layouts/BasicLayout' import DesktopView from '@/core/components/views/DesktopView' @@ -8,6 +9,8 @@ import InvoicesComponent from '@/lib/invoice/components/Invoices' export default function MyInvoices() { return ( + + diff --git a/src/pages/my/profile.jsx b/src/pages/my/profile.jsx index 72a1ee3c..25c3a608 100644 --- a/src/pages/my/profile.jsx +++ b/src/pages/my/profile.jsx @@ -1,19 +1,41 @@ import Divider from '@/core/components/elements/Divider/Divider' import AppLayout from '@/core/components/layouts/AppLayout' +import BasicLayout from '@/core/components/layouts/BasicLayout' +import DesktopView from '@/core/components/views/DesktopView' +import MobileView from '@/core/components/views/MobileView' import useAuth from '@/core/hooks/useAuth' import CompanyProfile from '@/lib/auth/components/CompanyProfile' import IsAuth from '@/lib/auth/components/IsAuth' +import Menu from '@/lib/auth/components/Menu' import PersonalProfile from '@/lib/auth/components/PersonalProfile' export default function Profile() { const auth = useAuth() return ( - - - - {auth?.parentId && } - + + + + + {auth?.parentId && } + + + + + +
+
+ +
+
+ + + {auth?.parentId && } + +
+
+
+
) } diff --git a/src/pages/my/quotations/[id].jsx b/src/pages/my/quotations/[id].jsx index 1fbbf34a..3ddf939d 100644 --- a/src/pages/my/quotations/[id].jsx +++ b/src/pages/my/quotations/[id].jsx @@ -1,3 +1,4 @@ +import Seo from '@/core/components/Seo' import AppLayout from '@/core/components/layouts/AppLayout' import BasicLayout from '@/core/components/layouts/BasicLayout' import DesktopView from '@/core/components/views/DesktopView' @@ -11,6 +12,8 @@ export default function MyQuotation() { return ( + + diff --git a/src/pages/my/quotations/index.jsx b/src/pages/my/quotations/index.jsx index bd91d9d0..f850de76 100644 --- a/src/pages/my/quotations/index.jsx +++ b/src/pages/my/quotations/index.jsx @@ -1,3 +1,4 @@ +import Seo from '@/core/components/Seo' import AppLayout from '@/core/components/layouts/AppLayout' import BasicLayout from '@/core/components/layouts/BasicLayout' import DesktopView from '@/core/components/views/DesktopView' @@ -10,6 +11,8 @@ const TransactionsComponent = dynamic(() => import('@/lib/transaction/components export default function MyQuotations() { return ( + + diff --git a/src/pages/my/transactions/[id].jsx b/src/pages/my/transactions/[id].jsx index e36c1ca4..31c2cd63 100644 --- a/src/pages/my/transactions/[id].jsx +++ b/src/pages/my/transactions/[id].jsx @@ -1,3 +1,4 @@ +import Seo from '@/core/components/Seo' import AppLayout from '@/core/components/layouts/AppLayout' import BasicLayout from '@/core/components/layouts/BasicLayout' import DesktopView from '@/core/components/views/DesktopView' @@ -11,6 +12,8 @@ export default function MyTransaction() { return ( + + diff --git a/src/pages/my/transactions/index.jsx b/src/pages/my/transactions/index.jsx index 91482a39..c1fb9a67 100644 --- a/src/pages/my/transactions/index.jsx +++ b/src/pages/my/transactions/index.jsx @@ -1,3 +1,4 @@ +import Seo from '@/core/components/Seo' import AppLayout from '@/core/components/layouts/AppLayout' import BasicLayout from '@/core/components/layouts/BasicLayout' import DesktopView from '@/core/components/views/DesktopView' @@ -10,6 +11,8 @@ const TransactionsComponent = dynamic(() => import('@/lib/transaction/components export default function MyTransactions() { return ( + + diff --git a/src/pages/my/wishlist.jsx b/src/pages/my/wishlist.jsx index 7d9ad0d7..52b70ae2 100644 --- a/src/pages/my/wishlist.jsx +++ b/src/pages/my/wishlist.jsx @@ -1,3 +1,4 @@ +import Seo from '@/core/components/Seo' import AppLayout from '@/core/components/layouts/AppLayout' import BasicLayout from '@/core/components/layouts/BasicLayout' import DesktopView from '@/core/components/views/DesktopView' @@ -8,6 +9,8 @@ import Wishlists from '@/lib/wishlist/components/Wishlists' export default function Wishlist() { return ( + + -- cgit v1.2.3