Merge branch 'staging' into production

sahil28297 · sahil28297 · commit 8399ae74cc4b · 2021-03-08T13:45:42.000+05:30
diff --git a/bloomstack_core/__init__.py b/bloomstack_core/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = '2.0.12'
+__version__ = '2.0.13'
diff --git a/bloomstack_core/bloomstack_core/doctype/authorization_request/authorization_request.py b/bloomstack_core/bloomstack_core/doctype/authorization_request/authorization_request.py
@@ -28,12 +28,17 @@ def send_authorization_request(self):
 
 		doc = frappe.get_doc(self.linked_doctype, self.linked_docname)
 		company = doc.company if hasattr(doc, 'company') else get_default_company()
+		default_letterhead = frappe.db.get_value("Company", company, "default_letter_head")
+		letterhead_content = ""
+		if default_letterhead:
+			letterhead_content = frappe.db.get_value("Letter Head", default_letterhead, "content")
 
 		subject = "{0} requests your authorization on {1}".format(company, self.linked_doctype)
 		message = frappe.render_template("templates/emails/authorization_request.html", {
 			"authorization_request": self,
 			"linked_doc": doc,
-			"company": company
+			"company": company,
+			"letter_head": letterhead_content
 		})
 
 		frappe.sendmail(recipients=[self.authorizer_email], subject=subject, message=message)
diff --git a/bloomstack_core/bloomstack_core/page/license_search/license_search.js b/bloomstack_core/bloomstack_core/page/license_search/license_search.js
@@ -135,7 +135,7 @@ class LicenseSearch {
 			return;
 		}
 
-		$wrapper.html(`<p class="text-muted">${cards_range_start} -
+		$wrapper.html(`<p class="text-muted">${cards_range_start ? cards_range_start : 1} -
 			${(cards_range_end >= me.total_count ? me.total_count : cards_range_end)}
 			of ${me.total_count}</p>`);
 	}
diff --git a/bloomstack_core/templates/emails/authorization_request.html b/bloomstack_core/templates/emails/authorization_request.html
@@ -10,10 +10,25 @@
 </head>
 
 <body style="margin: 0;">
-  
+
   <table
   style="max-width: 600px; margin: 0 auto; font-family: Helvetica, 'sans-serif'; color: #808080; line-height: 24px;">
   
+  <thead style="background-color: #f7f7f7;">
+    <tr>
+      <td style="padding: 40px 20px">
+        <div style="margin-bottom: 7px;" class="text-center">{{ letter_head }}</div>
+        <p style="float: right; padding-top: 25px; font-size: 21px; margin-bottom: 0;">
+          {% if authorization_request.status == "Request Sent" %}
+            Authorization Request
+          {% else %}
+            {{ authorization_request.linked_docname }}
+          {% endif %}
+        </p>
+      </td>
+    </tr>
+  </thead>
+
   <tbody>
     <tr>
       <td>

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ class LicenseSearch {`
`135`	`135`	`return;`
`136`	`136`	`}`
`137`	`137`
`138`		- $wrapper.html(`<p class="text-muted">${cards_range_start} -
	`138`	+ $wrapper.html(`<p class="text-muted">${cards_range_start ? cards_range_start : 1} -
`139`	`139`	`${(cards_range_end >= me.total_count ? me.total_count : cards_range_end)}`
`140`	`140`	of ${me.total_count}</p>`);
`141`	`141`	`}`