diff --git a/foundation/erpnext_foundation/doctype/service_provider/service_provider.py b/foundation/erpnext_foundation/doctype/service_provider/service_provider.py index 106ec511..280c983e 100644 --- a/foundation/erpnext_foundation/doctype/service_provider/service_provider.py +++ b/foundation/erpnext_foundation/doctype/service_provider/service_provider.py @@ -35,14 +35,24 @@ def send_reminder(service_provider_details): frappe.sendmail(recipients=service_provider_details.email, subject="About account inactivity", message=message) def unpublish_service_provider(): - for service_provider in frappe.get_all("Service Provider", fields=['name', 'title']): + for service_provider in frappe.get_all("Service Provider", fields=['email', 'name','title']): if get_last_login_diff(service_provider.email) == 90: frappe.db.set_value('Service Provider', service_provider.name, 'show_in_website', 0, update_modified=False) +def publish_service_provider(): + """ + If Service provider is unpublished and login then automatically enabled name in service provider listing + """ + for service_provider in frappe.get_all("Service Provider", fields=['email','name', 'title', 'show_in_website']): + if get_last_login_diff(service_provider.email) == 0 and service_provider.show_in_website == 0: + frappe.db.set_value('Service Provider', service_provider.name, 'show_in_website', 1, update_modified=False) + def get_last_login_diff(user): """ Returns difference between todays date and last login date """ last_login = frappe.db.get_value("User", user, ["last_login"]) + for x in xrange(1,10): + print((get_datetime() - get_datetime(last_login)).days, user) return (get_datetime() - get_datetime(last_login)).days \ No newline at end of file diff --git a/foundation/hooks.py b/foundation/hooks.py index 73dc49b4..bb3156d0 100644 --- a/foundation/hooks.py +++ b/foundation/hooks.py @@ -123,6 +123,7 @@ scheduler_events = { "daily": [ "foundation.erpnext_foundation.doctype.service_provider.service_provider.send_alert_to_inactive_service_providers", "foundation.erpnext_foundation.doctype.service_provider.service_provider.unpublish_service_provider", + "foundation.erpnext_foundation.doctype.service_provider.service_provider.publish_service_provider", ], # "hourly": [ # "foundation.tasks.hourly"