diff --git a/portal/templates/pages/profile.html b/portal/templates/pages/profile.html index 697190953b..fe9ded5097 100644 --- a/portal/templates/pages/profile.html +++ b/portal/templates/pages/profile.html @@ -14,10 +14,6 @@ -
- - -
@@ -42,7 +38,6 @@ $(document).ready(function() { type: "POST", args: { fullname: $("#fullname").val(), - password: $("#password").val(), company_name: $("#company_name").val(), mobile_no: $("#mobile_no").val(), phone: $("#phone").val() diff --git a/portal/templates/pages/profile.py b/portal/templates/pages/profile.py index b7be74cdcd..8edd830d47 100644 --- a/portal/templates/pages/profile.py +++ b/portal/templates/pages/profile.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import webnotes +from webnotes import _ from webnotes.utils import cstr no_cache = True @@ -28,5 +29,11 @@ def update_profile(fullname, password=None, company_name=None, mobile_no=None, p from selling.utils.cart import update_party update_party(fullname, company_name, mobile_no, phone) - from core.doctype.profile import profile - return profile.update_profile(fullname, password) \ No newline at end of file + if not fullname: + return _("Name is required") + + webnotes.conn.set_value("Profile", webnotes.session.user, "first_name", fullname) + webnotes.add_cookies["full_name"] = fullname + + return _("Updated") + \ No newline at end of file diff --git a/portal/templates/sales_transactions.html b/portal/templates/sales_transactions.html index 5f337976ca..f4fd5d18cc 100644 --- a/portal/templates/sales_transactions.html +++ b/portal/templates/sales_transactions.html @@ -2,9 +2,11 @@ {% block javascript -%} {{ super() }} diff --git a/public/js/website_utils.js b/public/js/website_utils.js index fceb8f655a..06bbe590cd 100644 --- a/public/js/website_utils.js +++ b/public/js/website_utils.js @@ -24,8 +24,12 @@ $(document).ready(function() { // update login erpnext.cart.set_cart_count(); - $("#user-tools a").tooltip({"placement":"bottom"}); - $("#user-tools-post-login a").tooltip({"placement":"bottom"}); + // update profile + if(full_name) { + $('.navbar li[data-label="Profile"] a') + .html(' ' + full_name); + } + }); // shopping cart diff --git a/support/doctype/support_ticket/templates/pages/ticket.html b/support/doctype/support_ticket/templates/pages/ticket.html index 3584d7bdc7..4b41dc21e9 100644 --- a/support/doctype/support_ticket/templates/pages/ticket.html +++ b/support/doctype/support_ticket/templates/pages/ticket.html @@ -12,7 +12,6 @@
@@ -34,8 +33,8 @@
{{ doc.subject }}
-
- {{ utils.formatdate(doc.creation) }} +
+ {{ utils.formatdate(doc.creation) }}