Merge branch 'development' of https://gitlab.com/mbugroup/lti-web-client into hotfix/marketing

src/components/pages/closing/sale/SalesReportTable.tsx

@@ -112,12 +112,16 @@ const SalesReportTable = ({
           <div className='font-semibold text-gray-900'>Total Penjualan</div>
         ),
       },
-      // {
-      //   id: 'age',
-      //   accessorKey: 'age',
-      //   header: 'Umur',
-      //   cell: (props) => props.getValue() || '-',
-      // },
+      {
+        id: 'age',
+        accessorKey: 'age',
+        header: 'Umur',
+        cell: (props) => {
+          const age = props.row.original.age;
+          const week = props.row.original.week;
+          return age && week ? `${age} hari (${week} minggu)` : '-';
+        },
+      },
       {
         id: 'do_number',
         accessorKey: 'do_number',

src/types/api/closing.d.ts

@@ -17,6 +17,7 @@ export type BaseSales = {
   id: number;
   realization_date: string;
   age: number;
+  week: number;
   do_number: string;
   product: Product;
   customer: Customer;