Add quotation, invoice, transaction title and manage profile desktop

5 files changed, 68 insertions, 69 deletions

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 (
     <>
-      <button type='button' onClick={toggle} className='p-4 flex items-center text-left'>
+      <button type='button' onClick={toggle} className='p-4 flex items-center text-left w-full'>
         <div>
           <div className='font-semibold mb-2'>Informasi Usaha</div>
           <div className='text-gray_r-11'>
             Dibawah ini adalah data usaha yang anda masukkan, periksa kembali data usaha anda.
           </div>
         </div>
-        <div className='ml-2 p-2 bg-gray_r-3 rounded'>
+        <div className='ml-auto p-2 bg-gray_r-3 rounded'>
           {!isOpen && <ChevronDownIcon className='w-6' />}
           {isOpen && <ChevronUpIcon className='w-6' />}
         </div>
       </button>
 
       {isOpen && (
-        <form
-          className='p-4 border-t border-gray_r-6 flex flex-col gap-y-4'
-          onSubmit={handleSubmit(onSubmitHandler)}
-        >
-          <div>
-            <label className='block mb-3'>Klasifikasi Jenis Usaha</label>
-            <Controller
-              name='industry'
-              control={control}
-              render={(props) => <HookFormSelect {...props} options={industries} />}
-            />
-          </div>
-          <div className='flex flex-wrap'>
-            <div className='w-full mb-3'>Nama Usaha</div>
-            <div className='w-3/12 pr-1'>
+        <form className='p-4 border-t border-gray_r-6' onSubmit={handleSubmit(onSubmitHandler)}>
+          <div className='grid grid-cols-1 sm:grid-cols-2 gap-4'>
+            <div>
+              <label className='block mb-3'>Klasifikasi Jenis Usaha</label>
               <Controller
-                name='companyType'
+                name='industry'
                 control={control}
-                render={(props) => <HookFormSelect {...props} options={companyTypes} />}
+                render={(props) => <HookFormSelect {...props} options={industries} />}
               />
             </div>
-            <div className='w-9/12 pl-1'>
-              <input
-                {...register('name')}
-                type='text'
-                className='form-input'
-                placeholder='Cth: Indoteknik Dotcom Gemilang'
-              />
+            <div className='flex flex-wrap'>
+              <div className='w-full mb-3'>Nama Usaha</div>
+              <div className='w-3/12 pr-1'>
+                <Controller
+                  name='companyType'
+                  control={control}
+                  render={(props) => <HookFormSelect {...props} options={companyTypes} />}
+                />
+              </div>
+              <div className='w-9/12 pl-1'>
+                <input
+                  {...register('name')}
+                  type='text'
+                  className='form-input'
+                  placeholder='Cth: Indoteknik Dotcom Gemilang'
+                />
+              </div>
+            </div>
+            <div>
+              <label>Nama Wajib Pajak</label>
+              <input {...register('taxName')} type='text' className='form-input mt-3' />
+            </div>
+            <div>
+              <label>Nomor NPWP</label>
+              <input {...register('npwp')} type='text' className='form-input mt-3' />
             </div>
           </div>
-          <div>
-            <label>Nama Wajib Pajak</label>
-            <input {...register('taxName')} type='text' className='form-input mt-3' />
-          </div>
-          <div>
-            <label>Nomor NPWP</label>
-            <input {...register('npwp')} type='text' className='form-input mt-3' />
-          </div>
-          <button type='submit' className='btn-yellow w-full mt-2'>
+          <button type='submit' className='btn-yellow w-full mt-6'>
             Simpan
           </button>
         </form>
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 = () => {
       <LinkItem href='/my/address' active={routeStartWith('/my/address')}>
         Daftar Alamat
       </LinkItem>
+      <LinkItem href='/my/profile' active={routeStartWith('/my/profile')}>
+        Profil Saya
+      </LinkItem>
       <button type='button' className='text-gray_r-12/80 p-2 text-left'>
         Keluar Akun
       </button>
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 (
     <>
-      <button type='button' onClick={toggle} className='p-4 flex items-center text-left'>
+      <button type='button' onClick={toggle} className='p-4 flex items-center text-left w-full'>
         <div>
           <div className='font-semibold mb-2'>Informasi Akun</div>
           <div className='text-gray_r-11'>
             Dibawah ini adalah data diri yang anda masukan, periksa kembali data diri anda
           </div>
         </div>
-        <div className='ml-2 p-2 bg-gray_r-3 rounded'>
+        <div className='ml-auto p-2 bg-gray_r-3 rounded'>
           {!isOpen && <ChevronDownIcon className='w-6' />}
           {isOpen && <ChevronUpIcon className='w-6' />}
         </div>
       </button>
 
       {isOpen && (
-        <form
-          className='p-4 border-t border-gray_r-6 flex flex-col gap-y-4'
-          onSubmit={handleSubmit(onSubmitHandler)}
-        >
-          <div>
-            <label>Email</label>
-            <input {...register('email')} type='text' disabled className='form-input mt-3' />
+        <form className='p-4 border-t border-gray_r-6' onSubmit={handleSubmit(onSubmitHandler)}>
+          <div className='grid grid-cols-1 sm:grid-cols-2 gap-4'>
+            <div>
+              <label>Email</label>
+              <input {...register('email')} type='text' disabled className='form-input mt-3' />
+            </div>
+            <div>
+              <label>Nama Lengkap</label>
+              <input {...register('name')} type='text' className='form-input mt-3' />
+            </div>
+            <div>
+              <label>No. Handphone</label>
+              <input {...register('mobile')} type='tel' className='form-input mt-3' />
+            </div>
+            <div>
+              <label>Kata Sandi</label>
+              <input
+                {...register('password')}
+                type='password'
+                className='form-input mt-3'
+                placeholder='Isi jika ingin mengubah kata sandi'
+              />
+            </div>
           </div>
-          <div>
-            <label>Nama Lengkap</label>
-            <input {...register('name')} type='text' className='form-input mt-3' />
-          </div>
-          <div>
-            <label>No. Handphone</label>
-            <input {...register('mobile')} type='tel' className='form-input mt-3' />
-          </div>
-          <div>
-            <label>Kata Sandi</label>
-            <input
-              {...register('password')}
-              type='password'
-              className='form-input mt-3'
-              placeholder='Isi jika ingin mengubah kata sandi'
-            />
-          </div>
-          <button type='submit' className='btn-yellow w-full mt-2'>
+          <button type='submit' className='btn-yellow w-full sm:w-fit sm:ml-auto mt-6'>
             Simpan
           </button>
         </form>
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 && (
             <Alert type='info' className='text-center'>
-              Tidak ada data invoice
+              Tidak ada invoice
             </Alert>
           )}
 
@@ -198,7 +198,7 @@ const Invoices = () => {
               <tbody>
                 {invoices.isLoading && (
                   <tr>
-                    <td colSpan={5}>
+                    <td colSpan={6}>
                       <div className='flex justify-center my-2'>
                         <Spinner className='w-6 text-gray_r-12/50 fill-gray_r-12' />
                       </div>
@@ -208,7 +208,7 @@ const Invoices = () => {
                 {!invoices.isLoading &&
                   (!invoices?.data?.invoices || invoices?.data?.invoices?.length == 0) && (
                     <tr>
-                      <td colSpan={6}>Tidak ada data invoice</td>
+                      <td colSpan={6}>Tidak ada invoice</td>
                     </tr>
                   )}
                 {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 && (
             <Alert type='info' className='text-center'>
-              Tidak ada data transaksi
+              Tidak ada transaksi
             </Alert>
           )}
 
@@ -246,7 +246,7 @@ const Transactions = ({ context = '' }) => {
                   (!transactions?.data?.saleOrders ||
                     transactions?.data?.saleOrders?.length == 0) && (
                     <tr>
-                      <td colSpan={7}>Tidak ada data transaksi</td>
+                      <td colSpan={7}>Tidak ada transaksi</td>
                     </tr>
                   )}
                 {transactions.data?.saleOrders?.map((saleOrder) => (