Skip to content

Merge develop into staging #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sahil28297 merged 8 commits into from
Mar 8, 2021
Merged

Merge develop into staging #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
41c9a4a
Update license_search.js
hrwX Feb 16, 2021
25d6e8a
Merge pull request #556 from Bloomstack/hrwX-patch-1
sahil28297 Feb 16, 2021
02502dd
fix: added company letterhead to quotation authorisation
hitenshKharva Feb 18, 2021
a6ab3e9
Merge pull request #557 from hitenshKharva/letterhead_authorize_contract
hrwX Feb 23, 2021
b3cc600
Merge pull request #558 from Bloomstack/bs-sprint
sahil28297 Feb 25, 2021
a72f5c1
Merge pull request #559 from Bloomstack/jha-sprint
sahil28297 Feb 25, 2021
e2ee1fa
Merge pull request #561 from Bloomstack/pre-release
sahil28297 Mar 8, 2021
7c8be63
Merge branch 'staging' into develop
sahil28297 Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion bloomstack_core/bloomstack_core/doctype/authorization_request/authorization_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion bloomstack_core/bloomstack_core/page/license_search/license_search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>`);
}
Expand Down
17 changes: 16 additions & 1 deletion bloomstack_core/templates/emails/authorization_request.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down