nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-05 14:38:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Messages

Browse Source 
- update messages according to new doctype
- sync logo in seller registration
- hub.is_seller_registered() and hub.is_user_registered() api
- Add Users dialog
This commit is contained in:
Faris Ansari
2018-09-03 15:42:00 +05:30
parent 18e3c61109
commit ad0be6aaa2
11 changed files with 105 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/hub_node/api.py
View File

@@ -19,6 +19,7 @@ current_user = frappe.session.user
@frappe.whitelist()
def register_marketplace(company, company_description):
validate_registerer()
settings = frappe.get_single('Marketplace Settings')
message = settings.register_seller(company, company_description)
@@ -151,6 +152,14 @@ def publish_selected_items(items_to_publish):
except Exception as e:
frappe.log_error(message=e, title='Hub Sync Error')
@frappe.whitelist()
def get_unregistered_users():
settings = frappe.get_single('Marketplace Settings')
registered_users = [user.user for user in settings.users] + ['Administrator', 'Guest']
all_users = [user.name for user in frappe.db.get_all('User', filters={'enabled': 1})]
unregistered_users = [user for user in all_users if user not in registered_users]
return unregistered_users
def item_sync_preprocess(intended_item_publish_count):
response = call_hub_method('pre_items_publish', {

10
erpnext/hub_node/doctype/marketplace_settings/marketplace_settings.py
View File

@@ -15,18 +15,16 @@ class MarketplaceSettings(Document):
def register_seller(self, company, company_description):
country, currency, description = frappe.db.get_value('Company', company,
['country', 'default_currency', 'company_description'])
country, currency, company_logo = frappe.db.get_value('Company', company,
['country', 'default_currency', 'company_logo'])
company_details = {
'company': company,
'country': country,
# 'city': '',
'currency': currency,
'company_description': company_description,
# 'company_logo': company_logo,
'site_name': frappe.utils.get_url(),
'company_logo': company_logo,
'site_name': frappe.utils.get_url()
}
hub_connection = self.get_connection()