feat: sorting columns.

client/src/containers/Accounting/JournalsLanding/utils.js

@@ -44,17 +44,17 @@ export const useManualJournalsColumns = () => {
         className: 'journal_type',
       },
       {
-        id: 'publish',
+        id: 'status',
         Header: formatMessage({ id: 'publish' }),
         accessor: (row) => StatusAccessor(row),
         width: 95,
-        className: 'publish',
+        className: 'status',
       },
       {
         id: 'note',
         Header: formatMessage({ id: 'note' }),
         accessor: NoteAccessor,
-        disableSorting: true,
+        disableSortBy: true,
         width: 85,
         className: 'note',
       },

client/src/containers/Expenses/ExpensesLanding/components.js

@@ -139,28 +139,28 @@ export function useExpensesTableColumns() {
         className: 'payment_date',
       },
       {
-        id: 'total_amount',
+        id: 'amount',
         Header: formatMessage({ id: 'full_amount' }),
         accessor: TotalAmountAccessor,
-        className: 'total_amount',
+        className: 'amount',
         width: 150,
       },
       {
-        id: 'payment_account_id',
+        id: 'payment_account',
         Header: formatMessage({ id: 'payment_account' }),
         accessor: 'payment_account.name',
         className: 'payment_account',
         width: 150,
       },
       {
-        id: 'expense_account_id',
+        id: 'expense_account',
         Header: formatMessage({ id: 'expense_account' }),
         accessor: ExpenseAccountAccessor,
         width: 160,
         className: 'expense_account',
       },
       {
-        id: 'publish',
+        id: 'published',
         Header: formatMessage({ id: 'publish' }),
         accessor: PublishAccessor,
         width: 100,

client/src/containers/InventoryAdjustments/components.js

@@ -158,7 +158,7 @@ export const useInventoryAdjustmentsColumns = () => {
         width: 100,
       },
       {
-        id: 'publish',
+        id: 'published_at',
         Header: formatMessage({ id: 'status' }),
         accessor: PublishAccessor,
         width: 95,

client/src/containers/Items/components.js

@@ -82,7 +82,7 @@ export function ItemsActionMenuList({
   },
 }) {
   const { formatMessage } = useIntl();
- 
+
   return (
     <Menu>
       <MenuItem
@@ -124,7 +124,7 @@ export function ItemsActionMenuList({
       />
     </Menu>
   );
-};
+}
 
 export const ItemsActionsTableCell = (props) => {
   return (
@@ -137,7 +137,6 @@ export const ItemsActionsTableCell = (props) => {
   );
 };
 
-
 /**
  * Retrieve all items table columns.
  */
@@ -147,30 +146,35 @@ export const useItemsTableColumns = () => {
   return React.useMemo(
     () => [
       {
+        id: 'name',
         Header: formatMessage({ id: 'item_name' }),
         accessor: 'name',
         className: 'name',
         width: 180,
       },
       {
+        id:'code',
         Header: formatMessage({ id: 'item_code' }),
         accessor: 'code',
         className: 'code',
         width: 120,
       },
       {
+        id: 'type',
         Header: formatMessage({ id: 'item_type' }),
         accessor: ItemTypeAccessor,
         className: 'item_type',
         width: 120,
       },
       {
+        id: 'category',
         Header: formatMessage({ id: 'category' }),
         accessor: 'category.name',
         className: 'category',
         width: 150,
       },
       {
+        id:'sell_price',
         Header: formatMessage({ id: 'sell_price' }),
         Cell: SellPriceCell,
         accessor: 'sell_price',
@@ -178,6 +182,7 @@ export const useItemsTableColumns = () => {
         width: 150,
       },
       {
+        id:'cost_price',
         Header: formatMessage({ id: 'cost_price' }),
         Cell: CostPriceCell,
         accessor: 'cost_price',
@@ -185,6 +190,7 @@ export const useItemsTableColumns = () => {
         width: 150,
       },
       {
+        id:'quantity_on_hand',
         Header: formatMessage({ id: 'quantity_on_hand' }),
         accessor: 'quantity_on_hand',
         Cell: QuantityOnHandCell,
@@ -199,4 +205,4 @@ export const useItemsTableColumns = () => {
     ],
     [formatMessage],
   );
-}
+};

client/src/containers/Purchases/Bills/BillsLanding/components.js

@@ -112,11 +112,11 @@ export function useBillsTableColumns() {
         className: 'bill_date',
       },
       {
-        id: 'vendor_id',
+        id: 'vendor',
         Header: formatMessage({ id: 'vendor_name' }),
         accessor: 'vendor.display_name',
         width: 140,
-        className: 'vendor_id',
+        className: 'vendor',
       },
       {
         id: 'bill_number',

client/src/containers/Purchases/PaymentMades/PaymentsLanding/components.js

@@ -83,7 +83,7 @@ export function usePaymentMadesTableColumns() {
         className: 'payment_date',
       },
       {
-        id: 'vendor_id',
+        id: 'vendor',
         Header: formatMessage({ id: 'vendor_name' }),
         accessor: 'vendor.display_name',
         width: 140,
@@ -98,7 +98,7 @@ export function usePaymentMadesTableColumns() {
         className: 'payment_number',
       },
       {
-        id: 'payment_account_id',
+        id: 'payment_account',
         Header: formatMessage({ id: 'payment_account' }),
         accessor: 'payment_account.name',
         width: 140,
@@ -112,7 +112,7 @@ export function usePaymentMadesTableColumns() {
         className: 'amount',
       },
       {
-        id: 'reference',
+        id: 'reference_no',
         Header: formatMessage({ id: 'reference' }),
         accessor: 'reference',
         width: 140,

client/src/containers/Sales/Estimates/EstimatesLanding/components.js

@@ -153,7 +153,7 @@ export function useEstiamtesTableColumns() {
         className: 'estimate_date',
       },
       {
-        id: 'customer_id',
+        id: 'customer',
         Header: formatMessage({ id: 'customer_name' }),
         accessor: 'customer.display_name',
         width: 140,
@@ -190,11 +190,11 @@ export function useEstiamtesTableColumns() {
         className: 'status',
       },
       {
-        id: 'reference',
+        id: 'reference_no',
         Header: formatMessage({ id: 'reference_no' }),
-        accessor: 'reference',
-        width: 140,
-        className: 'reference',
+        accessor: 'reference_no',
+        width: 90,
+        className: 'reference_no',
       },
       {
         id: 'actions',

client/src/containers/Sales/Invoices/InvoicesLanding/components.js

@@ -159,7 +159,7 @@ export function useInvoicesTableColumns() {
         className: 'invoice_date',
       },
       {
-        id: 'customer_id',
+        id: 'customer',
         Header: formatMessage({ id: 'customer_name' }),
         accessor: 'customer.display_name',
         width: 180,

client/src/containers/Sales/PaymentReceives/PaymentsLanding/components.js

@@ -93,7 +93,7 @@ export function usePaymentReceivesColumns() {
         className: 'payment_date',
       },
       {
-        id: 'customer_id',
+        id: 'customer',
         Header: formatMessage({ id: 'customer_name' }),
         accessor: 'customer.display_name',
         width: 160,
@@ -122,7 +122,7 @@ export function usePaymentReceivesColumns() {
         className: 'reference_no',
       },
       {
-        id: 'deposit_account_id',
+        id: 'deposit_account',
         Header: formatMessage({ id: 'deposit_account' }),
         accessor: 'deposit_account.name',
         width: 140,

client/src/containers/Sales/Receipts/ReceiptsLanding/components.js

@@ -104,7 +104,7 @@ export function useReceiptsTableColumns() {
         className: 'receipt_date',
       },
       {
-        id: 'customer_id',
+        id: 'customer',
         Header: formatMessage({ id: 'customer_name' }),
         accessor: 'customer.display_name',
         width: 140,
@@ -119,7 +119,7 @@ export function useReceiptsTableColumns() {
         className: 'receipt_number',
       },
       {
-        id: 'deposit_account_id',
+        id: 'deposit_account',
         Header: formatMessage({ id: 'deposit_account' }),
         accessor: 'deposit_account.name',
         width: 140,