Merge pull request #135 from raghukamath/service-providers

Remove service providers from listing who don't have show in website checked

foundation/erpnext_foundation/doctype/service_provider/service_provider.py

@@ -8,7 +8,7 @@ from frappe.website.website_generator import WebsiteGenerator
 from frappe.utils import get_datetime
 
 class ServiceProvider(WebsiteGenerator):
-	_website = frappe._dict(
+	website = frappe._dict(
 		condition_field = "show_in_website",
 	)
 	def validate(self):
@@ -31,8 +31,6 @@ class ServiceProvider(WebsiteGenerator):
 			else:
 				context.image = "/assets/foundation/img/default-membership-logo.png"
 
-
-
 def send_alert_to_inactive_service_providers():
 	for service_provider in frappe.get_all("Service Provider", fields=['email', 'title']):
 		if get_last_login_diff(service_provider.email) == 80:
@@ -55,7 +53,6 @@ def publish_service_provider():
 		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

foundation/patches.txt

@@ -1,2 +1,3 @@
 foundation.patches.v0_0.update_erpnext_job_route
 foundation.patches.v0_0.change_website_to_website_url
+foundation.patches.v0_0.service_providers_website_to_website_url

foundation/patches/v0_0/change_website_to_website_url.py

@@ -3,4 +3,4 @@ import frappe
 def execute():
     frappe.db.sql('''
         ALTER TABLE `tabFoundation Fellowship` CHANGE `website` `website_url` varchar(140);
-    ''')
+    ''')

foundation/patches/v0_0/service_providers_website_to_website_url.py

@@ -0,0 +1,7 @@
+import frappe
+
+def execute():
+	frappe.db.sql('''
+	update `tabService Provider`
+	set website_url = website
+	''')

foundation/public/css/erpnext-org-theme.css

@@ -349,6 +349,12 @@ a:visited {
   background-color: #fff;
   min-width: 200px;
   transition: all 0.3s ease-out;
+  margin: 0 1rem;
+}
+@media screen and (min-width: 500px) {
+  .list-items {
+    margin: 0;
+  }
 }
 .list-items:hover {
   box-shadow: 0 5px 9px 0 rgba(0, 0, 0, 0.05);

foundation/public/less/erpnext-org-theme.less

@@ -145,6 +145,11 @@ a {
 	background-color: #fff;
 	min-width: 200px;
 	transition: all @transition;
+	margin: 0 1rem;
+
+	@media screen and (min-width: @screen-palm) {
+		margin: 0;
+	}
 
 	&:hover {
 		box-shadow: 0 5px 9px 0 rgba(0, 0, 0, 0.05);

foundation/www/service_providers.py

@@ -11,6 +11,7 @@ def get_context(context):
 			route='service-providers', title='All Service Providers')]
 
 	filters = dict()
+	filters['show_in_website'] = 1
 	if frappe.form_dict.country:
 		filters['country'] = frappe.form_dict.country