feat: WIP advanced filter.

server/src/models/Account.Settings.ts

@@ -23,6 +23,7 @@ export default {
       column: 'slug',
       fieldType: 'text',
       columnable: false,
+      filterable: false,
     },
     code: {
       name: 'Account code',
@@ -76,6 +77,7 @@ export default {
       name: 'Currency',
       column: 'currency_code',
       fieldType: 'text',
+      filterable: false,
     },
     created_at: {
       name: 'Created at',

server/src/models/Bill.Settings.ts

@@ -48,12 +48,12 @@ export default {
       fieldType: 'enumeration',
       columnable: true,
       options: [
-        { name: 'Paid', key: 'paid' },
-        { name: 'Partially paid', key: 'partially-paid' },
-        { name: 'Overdue', key: 'overdue' },
-        { name: 'Unpaid', key: 'unpaid' },
-        { name: 'Opened', key: 'opened' },
-        { name: 'Draft', key: 'draft' },
+        { label: 'Paid', key: 'paid' },
+        { label: 'Partially paid', key: 'partially-paid' },
+        { label: 'Overdue', key: 'overdue' },
+        { label: 'Unpaid', key: 'unpaid' },
+        { label: 'Opened', key: 'opened' },
+        { label: 'Draft', key: 'draft' },
       ],
       filterCustomQuery: StatusFieldFilterQuery,
       sortCustomQuery: StatusFieldSortQuery,

server/src/models/Customer.Settings.ts

@@ -43,6 +43,7 @@ export default {
     created_at: {
       name: 'Created at',
       column: 'created_at',
+      fieldType: 'date',
     },
     balance: {
       name: 'Balance',
@@ -61,11 +62,13 @@ export default {
       fieldType: 'date',
     },
     currency_code: {
+      name: 'Curreny',
       column: 'currency_code',
       fieldType: 'text',
     },
     status: {
-      label: 'Status',
+      name: 'Status',
+      fieldType: 'enumeration',
       options: [
         { key: 'active', label: 'Active' },
         { key: 'inactive', label: 'Inactive' },

server/src/models/Expense.Settings.ts

@@ -48,8 +48,8 @@ export default {
       name: 'Status',
       fieldType: 'enumeration',
       options: [
-        { key: 'draft', name: 'Draft' },
-        { key: 'published', name: 'Published' },
+        { key: 'draft', label: 'Draft' },
+        { key: 'published', label: 'Published' },
       ],
       filterCustomQuery: StatusFieldFilterQuery,
       sortCustomQuery: StatusFieldSortQuery,

server/src/models/ItemCategory.Settings.ts

@@ -6,23 +6,23 @@ export default {
   },
   fields: {
     name: {
-      label: 'Name',
+      name: 'Name',
       column: 'name',
       fieldType: 'text',
     },
     description: {
-      label: 'Description',
+      name: 'Description',
       column: 'description',
       fieldType: 'text',
     },
     count: {
-      label: 'Count',
+      name: 'Count',
       column: 'count',
       fieldType: 'number',
       virtualColumn: true,
     },
     created_at: {
-      label: 'Created at',
+      name: 'Created at',
       column: 'created_at',
       columnType: 'date',
     },

server/src/models/ManualJournal.Settings.ts

@@ -6,43 +6,47 @@ export default {
   },
   fields: {
     'date': {
-      label: 'Date',
+      name: 'Date',
       column: 'date',
       fieldType: 'date',
     },
     'journal_number': {
-      label: 'Journal number',
+      name: 'Journal number',
       column: 'journal_number',
       fieldType: 'text',
     },
     'reference': {
-      label: 'Reference No.',
+      name: 'Reference No.',
       column: 'reference',
       fieldType: 'text',
     },
     'journal_type': {
-      label: 'Journal type',
+      name: 'Journal type',
       column: 'journal_type',
       fieldType: 'text',
     },
     'amount': {
-      label: 'Amount',
+      name: 'Amount',
       column: 'amount',
-      columnType: 'number',
+      fieldType: 'number',
     },
     'description': {
-      label: 'Description',
+      name: 'Description',
       column: 'description',
       fieldType: 'text',
     },
     'status': {
-      label: 'Status',
+      name: 'Status',
       column: 'status',
       fieldType: 'enumeration',
+      options: [
+        { key: 'draft', label: 'Draft' },
+        { key: 'published', label: 'published' }
+      ],
       sortCustomQuery: StatusFieldSortQuery,
     },
     'created_at': {
-      label: 'Created at',
+      name: 'Created at',
       column: 'created_at',
       fieldType: 'date',
     },

server/src/models/ModelSetting.ts

@@ -26,8 +26,8 @@ export default (Model) =>
      * @param {string} key
      * @returns
      */
-    public static getMeta(key: string) {
-      return get(this.meta, key);
+    public static getMeta(key?: string) {
+      return key ? get(this.meta, key): this.meta; 
     }
 
     /**

server/src/models/SaleEstimate.Settings.ts

@@ -55,11 +55,11 @@ export default {
       name: 'Status',
       fieldType: 'enumeration',
       options: [
-        { name: 'Delivered', key: 'delivered' },
-        { name: 'Rejected', key: 'rejected' },
-        { name: 'Approved', key: 'approved' },
-        { name: 'Delivered', key: 'delivered' },
-        { name: 'Draft', key: 'draft' },
+        { label: 'Delivered', key: 'delivered' },
+        { label: 'Rejected', key: 'rejected' },
+        { label: 'Approved', key: 'approved' },
+        { label: 'Delivered', key: 'delivered' },
+        { label: 'Draft', key: 'draft' },
       ],
       filterCustomQuery: StatusFieldFilterQuery,
       sortCustomQuery: StatusFieldSortQuery,

server/src/models/SaleInvoice.Settings.ts

@@ -64,15 +64,14 @@ export default {
     },
     status: {
       name: 'Status',
-      columnable: true,
       fieldType: 'enumeration',
       options: [
-        { key: 'draft', name: 'Draft' },
-        { key: 'delivered', name: 'Delivered' },
-        { key: 'unpaid', name: 'Unpaid' },
-        { key: 'overdue', name: 'Overdue' },
-        { key: 'partially-paid', name: 'Partially paid' },
-        { key: 'paid', name: 'Paid' },
+        { key: 'draft', label: 'Draft' },
+        { key: 'delivered', label: 'Delivered' },
+        { key: 'unpaid', label: 'Unpaid' },
+        { key: 'overdue', label: 'Overdue' },
+        { key: 'partially-paid', label: 'Partially paid' },
+        { key: 'paid', label: 'Paid' },
       ],
       filterCustomQuery: StatusFieldFilterQuery,
       sortCustomQuery: StatusFieldSortQuery,
@@ -97,4 +96,4 @@ function StatusFieldFilterQuery(query, role) {
  */
 function StatusFieldSortQuery(query, role) {
   query.modify('sortByStatus', role.order);
-}
+}

server/src/models/SaleReceipt.Settings.ts

@@ -22,8 +22,8 @@ export default {
       relationEntityKey: 'slug',
     },
     'customer': {
-      name: 'Customer',
-      column: 'customer_id',
+      label: 'Customer',
+      name: 'customer_id',
       fieldType: 'relation',
 
       relationType: 'enumeration',
@@ -67,8 +67,8 @@ export default {
       name: 'Status',
       fieldType: 'enumeration',
       options: [
-        { key: 'draft', name: 'Draft' },
-        { key: 'closed', name: 'Closed' },
+        { key: 'draft', label: 'Draft' },
+        { key: 'closed', label: 'Closed' },
       ],
       filterCustomQuery: StatusFieldFilterQuery,
       sortCustomQuery: StatusFieldSortQuery,

server/src/models/Vendor.Settings.ts

@@ -71,7 +71,8 @@ export default {
       fieldType: 'text',
     },
     'status': {
-      label: 'Status',
+      name: 'Status',
+      type: 'enumeration',
       options: [
         { key: 'overdue', label: 'Overdue' },
         { key: 'unpaid', label: 'Unpaid' },