diff --git a/src/components/Dashboard/Management/Vendors/NewVendor.jsx b/src/components/Dashboard/Management/Vendors/NewVendor.jsx index 41a236f..dbb3d32 100644 --- a/src/components/Dashboard/Management/Vendors/NewVendor.jsx +++ b/src/components/Dashboard/Management/Vendors/NewVendor.jsx @@ -5,7 +5,7 @@ import WizardView from '../../common/WizardView' const NewVendor = ({ onOk }) => { return ( - + {({ handleSubmit, submitLoading, objectData, formValid }) => { const steps = [ { diff --git a/src/database/models/Vendor.js b/src/database/models/Vendor.js index ffef6a8..e9ca73b 100644 --- a/src/database/models/Vendor.js +++ b/src/database/models/Vendor.js @@ -69,9 +69,34 @@ export const Vendor = { `/dashboard/management/vendors/info?vendorId=${_id}&action=delete` } ], - columns: ['name', '_id', 'country', 'email', 'website', 'createdAt'], - filters: ['name', '_id', 'country', 'email'], - sorters: ['name', 'country', 'email', 'createdAt', '_id'], + columns: [ + 'name', + '_id', + 'country', + 'email', + 'website', + 'active', + 'createdAt', + 'updatedAt' + ], + filters: [ + 'name', + '_id', + 'country', + 'email', + 'active', + 'createdAt', + 'updatedAt' + ], + sorters: [ + 'name', + 'country', + 'email', + 'active', + 'createdAt', + 'updatedAt', + '_id' + ], group: ['country'], properties: [ { @@ -108,6 +133,13 @@ export const Vendor = { readOnly: false, required: false }, + { + name: 'active', + label: 'Active', + type: 'bool', + readOnly: false, + required: true + }, { name: 'country', label: 'Country', @@ -137,6 +169,55 @@ export const Vendor = { type: 'url', readOnly: false, required: false + }, + { + name: 'address.building', + label: 'Building', + type: 'text', + readOnly: false, + required: false + }, + { + name: 'address.addressLine1', + label: 'Address Line 1', + type: 'text', + readOnly: false, + required: false + }, + { + name: 'address.addressLine2', + label: 'Address Line 2', + type: 'text', + readOnly: false, + required: false + }, + { + name: 'address.city', + label: 'City', + type: 'text', + readOnly: false, + required: false + }, + { + name: 'address.state', + label: 'State', + type: 'text', + readOnly: false, + required: false + }, + { + name: 'address.postcode', + label: 'Postcode', + type: 'text', + readOnly: false, + required: false + }, + { + name: 'address.country', + label: 'Country', + type: 'country', + readOnly: false, + required: false } ] }