diff --git a/erpnext/hub_node/api.py b/erpnext/hub_node/api.py index ff1d267b72a..2a928d44a22 100644 --- a/erpnext/hub_node/api.py +++ b/erpnext/hub_node/api.py @@ -17,10 +17,10 @@ current_user = frappe.session.user @frappe.whitelist() -def register_marketplace(company): +def register_marketplace(company, company_description): validate_registerer() settings = frappe.get_single('Marketplace Settings') - message = settings.register_seller(company) + message = settings.register_seller(company, company_description) if message.get('hub_seller_name'): settings.registered = 1 diff --git a/erpnext/hub_node/doctype/marketplace_settings/marketplace_settings.py b/erpnext/hub_node/doctype/marketplace_settings/marketplace_settings.py index 482efadaed0..ebe8b702ab3 100644 --- a/erpnext/hub_node/doctype/marketplace_settings/marketplace_settings.py +++ b/erpnext/hub_node/doctype/marketplace_settings/marketplace_settings.py @@ -13,9 +13,9 @@ from six import string_types class MarketplaceSettings(Document): - def register_seller(self, company): + def register_seller(self, company, company_description): - country, currency, company_description = frappe.db.get_value('Company', company, + country, currency, description = frappe.db.get_value('Company', company, ['country', 'default_currency', 'company_description']) company_details = { diff --git a/erpnext/public/js/hub/components/profile_dialog.js b/erpnext/public/js/hub/components/profile_dialog.js index 0f22eaa361d..ea827ff3bfb 100644 --- a/erpnext/public/js/hub/components/profile_dialog.js +++ b/erpnext/public/js/hub/components/profile_dialog.js @@ -1,15 +1,39 @@ const ProfileDialog = (title = __('Edit Profile'), action={}) => { const fields = [ - { - fieldtype: 'Link', - fieldname: 'company', - label: __('Company'), - options: 'Company' - }, { fieldname: 'company_email', label: __('Email'), fieldtype: 'Read Only' + }, + { + fieldtype: 'Link', + fieldname: 'company', + label: __('Company'), + options: 'Company', + onchange: () => { + const value = dialog.get_value('company'); + if (value) { + frappe.db.get_doc('Company', value) + .then(company => { + console.log(company.company_logo); + dialog.set_values({ + company_logo: company.company_logo, + company_description: company.company_description + }); + }); + } + } + }, + // { + // fieldname: 'company_logo', + // label: __('Logo'), + // fieldtype: 'Attach Image', + // read_only: true + // }, + { + fieldname: 'company_description', + label: __('About Your Company'), + fieldtype: 'Long Text' } ]; diff --git a/erpnext/public/js/hub/marketplace.js b/erpnext/public/js/hub/marketplace.js index bdcb353e902..9df6303f6b8 100644 --- a/erpnext/public/js/hub/marketplace.js +++ b/erpnext/public/js/hub/marketplace.js @@ -101,12 +101,12 @@ erpnext.hub.Marketplace = class Marketplace { this.register_dialog.show(); } - register_marketplace({company, company_email}) { + register_marketplace({company, company_description}) { frappe.call({ method: 'erpnext.hub_node.api.register_marketplace', args: { company, - company_email, + company_description } }).then((r) => { if (r.message && r.message.ok) {