feat(core): authorization request for a document #20

DeeMysterio · 2019-05-21T15:27:44Z

Purpose-
You may want to get a draft document authorised by the customer first and then go ahead with further processing.

Updates :

Authorization Request for Quotation :

Authorization Request for Contract :

vjFaLk · 2019-05-23T09:29:54Z

bloomstack_core/bloomstack_core/doctype/authorization_request/authorization_request.py

+		self.token_generated_on = now_datetime()
+		self.request_link = "http://localhost:8000/authorize_document?token={0}&name={1}".format(self.token, self.name)
+
+	def email_link(self):


Call this send_authorization_request instead?

vjFaLk · 2019-05-23T09:30:29Z

bloomstack_core/bloomstack_core/doctype/authorization_request/authorization_request.py

+	def generate_token(self):
+		self.token = frappe.generate_hash(self.name, 32)
+		self.token_generated_on = now_datetime()
+		self.request_link = "http://localhost:8000/authorize_document?token={0}&name={1}".format(self.token, self.name)


Use frappe.local.site to get sitename

vjFaLk · 2019-05-23T09:30:57Z

bloomstack_core/bloomstack_core/doctype/authorization_request/authorization_request.py

+
+	def email_link(self):
+		"""
+			Email the document link to user for them to authorize the document


Change to "Email the link to user for them to authorize the document"

vjFaLk · 2019-05-23T09:35:21Z

bloomstack_core/bloomstack_core/doctype/authorization_request/authorization_request.py

+		"""
+		message = frappe.render_template("templates/emails/authorization_request.html", {
+			"authorization_request": self,
+			"link": self.request_link


The authorization request will have the link anyway. No need to pass the link separately.

vjFaLk · 2019-05-23T09:35:56Z

bloomstack_core/bloomstack_core/doctype/authorization_request/authorization_request.py

+		})
+
+		frappe.sendmail(recipients=[self.authorizer_email], subject="You have a document to authorize", message=message)
+		frappe.msgprint("Document has been successfully sent to Email")


Change this to "Request Link has been successfully sent to Email"

vjFaLk · 2019-05-23T09:36:15Z

bloomstack_core/public/js/contract.js

+            if (!frm.doc.customer_signature) {
+                frm.add_custom_button(__("Authorize"), () => {
+                    frappe.new_doc("Authorization Request", {
+                        linked_doctype: frm.doc.doctype,


Add email and name as well?

vjFaLk · 2019-05-23T09:38:15Z

bloomstack_core/utils.py

+
+@frappe.whitelist()
+def make_authorization_request(source_name, target_doc=None):
+	print(locals())


vjFaLk · 2019-05-23T09:40:01Z

bloomstack_core/www/authorize_document.py

+    docname = frappe.local.request.args.get("name")
+
+    auth_req = frappe.get_doc("Authorization Request", docname)
+    if not token or token == auth_req.token:


This should be if not token or token != auth_req.token

vjFaLk · 2019-05-29T07:18:42Z

bloomstack_core/utils.py

+	authorization_request.save()
+
+	authorized_doc = frappe.get_doc(authorization_request.linked_doctype, authorization_request.linked_docname)
+	try:


You always want to except for a particular exception. I don't see the point of this try catch if you're going to do a .submit() anyway?

I think you should spend some time understanding how exception handling works

vjFaLk · 2019-05-29T07:28:13Z

bloomstack_core/bloomstack_core/doctype/authorization_request/authorization_request.js

+frappe.ui.form.on("Authorization Request", {
+
+});
+// frm.set_df_property("patient", "hidden", 0);


Remove this commented out code

Alchez · 2019-05-30T11:09:02Z

bloomstack_core/bloomstack_core/doctype/authorization_request/authorization_request.py

+	def generate_token(self):
+		self.token = frappe.generate_hash(self.name, 32)
+		self.token_generated_on = now_datetime()
+		self.request_link = "http://{0}/authorize_document?token={1}&name={2}".format(frappe.local.site, self.token, self.name)


Suggested change

self.request_link = "http://{0}/authorize_document?token={1}&name={2}".format(frappe.local.site, self.token, self.name)

from frappe.utils.data import get_url

self.request_link = "{0}/authorize_document?token={1}&name={2}".format(get_url(), self.token, self.name)

Alchez · 2019-05-30T11:12:25Z

bloomstack_core/templates/emails/authorization_request.html

@@ -0,0 +1 @@
+<p>Hi, a document has been generated for you to authorize, please go here {{ link }}</p>


Ashwin shared an HTML file on the Task for this feature. Replace this HTML with that - maybe get @Er-Naren719 to help you with the template.

Alchez · 2019-05-30T11:14:13Z

bloomstack_core/templates/includes/sign_document.js

+$("#step2").on("click", function () {
+    var sign = $sigdiv.jSignature("getData");
+    var signee = document.getElementById("signee").value;
+    if (!($sigdiv.jSignature('getData', 'native').length == 0) && signee) {


Maybe add some comments on what you're doing here exactly. Especially since you're using a separate library. Also fix formatting for this file ("Format Document" in VSCode).

Alchez · 2019-05-30T11:19:50Z

bloomstack_core/utils.py

+
+@frappe.whitelist(allow_guest=True)
+def authorize_document(sign=None, signee=None, docname=None):
+	authorization_request = frappe.get_doc("Authorization Request", docname)


get_doc will fail if the document doesn't exist. Just as a sanity check, do:

Suggested change

authorization_request = frappe.get_doc("Authorization Request", docname)

if frappe.db.exists("Authorization Request", docname):

authorization_request = frappe.get_doc("Authorization Request", docname)

Alchez · 2019-05-30T11:20:28Z

bloomstack_core/utils.py

+
+	authorized_doc = frappe.get_doc(authorization_request.linked_doctype, authorization_request.linked_docname)
+	if hasattr(authorized_doc, "is_signed"):
+		authorized_doc.is_signed = 1


Only set this if the document is not already signed.

bloomstack_core/utils.py

vjFaLk · 2019-06-21T08:36:51Z

@Alchez Is this approved?

Alchez · 2019-06-21T09:00:29Z

@DeeMysterio, can you update the screenshots with the new web view and other changes?

Alchez · 2019-06-21T11:05:50Z

bloomstack_core/www/authorize_document.py

    frappe.local.flags.ignore_print_permissions = True
-    context.print_doc = frappe.get_print(auth_req.linked_doctype, auth_req.linked_docname)
+    print_doc = frappe.get_print(auth_req.linked_doctype, auth_req.linked_docname)
+    context.print_doc = print_doc[print_doc.find('<body>')+len('<body>'):len(print_doc)-len('</body>')]


Wow, there has to be a better way to do this 🤣

dti-deploy · 2019-08-12T12:22:01Z

🎉 This PR is included in version 1.3.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

vjFaLk had a problem deploying to Tugboat May 21, 2019 15:27 Error

feat(core): request authorization

e108175

vjFaLk temporarily deployed to Tugboat May 21, 2019 15:32 Destroyed

vjFaLk temporarily deployed to Tugboat May 22, 2019 10:53 Destroyed

feat(core): Request Authorization for Contract

5553ab7

vjFaLk temporarily deployed to Tugboat May 22, 2019 14:54 Destroyed

vjFaLk temporarily deployed to Tugboat May 22, 2019 15:01 Destroyed

vjFaLk temporarily deployed to Tugboat May 23, 2019 00:41 Destroyed

vjFaLk suggested changes May 23, 2019

View reviewed changes

req feat feat

34f56ec

vjFaLk temporarily deployed to Tugboat May 24, 2019 00:42 Destroyed

vjFaLk temporarily deployed to Tugboat May 25, 2019 00:41 Destroyed

vjFaLk temporarily deployed to Tugboat May 26, 2019 00:43 Destroyed

vjFaLk temporarily deployed to Tugboat May 27, 2019 00:41 Destroyed

vjFaLk temporarily deployed to Tugboat May 28, 2019 00:42 Destroyed

feat(core): refactor code

06394e5

vjFaLk temporarily deployed to Tugboat May 28, 2019 09:57 Destroyed

vjFaLk temporarily deployed to Tugboat May 28, 2019 13:08 Destroyed

vjFaLk temporarily deployed to Tugboat May 29, 2019 00:44 Destroyed

vjFaLk suggested changes May 29, 2019

View reviewed changes

feat(core): remove print statements

ee5bf99

vjFaLk temporarily deployed to Tugboat May 29, 2019 11:59 Destroyed

vjFaLk temporarily deployed to Tugboat May 30, 2019 00:24 Destroyed

Alchez suggested changes May 30, 2019

View reviewed changes

vjFaLk temporarily deployed to Tugboat May 31, 2019 00:24 Destroyed

vjFaLk temporarily deployed to Tugboat May 31, 2019 11:53 Destroyed

vjFaLk temporarily deployed to Tugboat May 31, 2019 12:20 Destroyed

vjFaLk temporarily deployed to Tugboat June 1, 2019 00:10 Destroyed

vjFaLk temporarily deployed to Tugboat June 2, 2019 00:09 Destroyed

vjFaLk temporarily deployed to Tugboat June 3, 2019 00:11 Destroyed

vjFaLk temporarily deployed to Tugboat June 6, 2019 10:30 Destroyed

vjFaLk temporarily deployed to Tugboat June 7, 2019 00:40 Destroyed

vjFaLk temporarily deployed to Tugboat June 8, 2019 00:52 Destroyed

vjFaLk temporarily deployed to Tugboat June 9, 2019 01:03 Destroyed

vjFaLk temporarily deployed to Tugboat June 10, 2019 01:09 Destroyed

vjFaLk temporarily deployed to Tugboat June 11, 2019 00:11 Destroyed

vjFaLk temporarily deployed to Tugboat June 14, 2019 00:54 Destroyed

vjFaLk temporarily deployed to Tugboat June 15, 2019 01:07 Destroyed

vjFaLk temporarily deployed to Tugboat June 16, 2019 01:05 Destroyed

vjFaLk temporarily deployed to Tugboat June 17, 2019 01:05 Destroyed

vjFaLk temporarily deployed to Tugboat June 18, 2019 00:09 Destroyed

vjFaLk temporarily deployed to Tugboat June 19, 2019 00:39 Destroyed

vjFaLk temporarily deployed to Tugboat June 20, 2019 00:10 Destroyed

vjFaLk temporarily deployed to Tugboat June 21, 2019 00:12 Destroyed

vjFaLk temporarily deployed to Tugboat June 21, 2019 07:11 Destroyed

feat(core): improve web view of request authorization

59ad65d

vjFaLk temporarily deployed to Tugboat June 21, 2019 10:42 Destroyed

Alchez reviewed Jun 21, 2019

View reviewed changes

DeeMysterio changed the title ~~Request Authorization for a quotation~~ feat(core): authorization request for a document Jun 21, 2019

vjFaLk temporarily deployed to Tugboat June 22, 2019 00:10 Destroyed

vjFaLk temporarily deployed to Tugboat June 23, 2019 00:09 Destroyed

vjFaLk temporarily deployed to Tugboat June 24, 2019 00:09 Destroyed

vjFaLk approved these changes Jun 24, 2019

View reviewed changes

vjFaLk merged commit b932a87 into Bloomstack:staging Jun 24, 2019

Alchez deleted the request-authorization branch June 28, 2019 07:45

Alchez restored the request-authorization branch June 28, 2019 07:45

dti-deploy added the released label Aug 12, 2019

	self.request_link = "http://{0}/authorize_document?token={1}&name={2}".format(frappe.local.site, self.token, self.name)
	from frappe.utils.data import get_url
	self.request_link = "{0}/authorize_document?token={1}&name={2}".format(get_url(), self.token, self.name)

		@@ -0,0 +1 @@
		<p>Hi, a document has been generated for you to authorize, please go here {{ link }}</p> No newline at end of file

	authorization_request = frappe.get_doc("Authorization Request", docname)
	if frappe.db.exists("Authorization Request", docname):
	authorization_request = frappe.get_doc("Authorization Request", docname)

feat(core): authorization request for a document #20

feat(core): authorization request for a document #20

Uh oh!

Conversation

DeeMysterio commented May 21, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vjFaLk commented Jun 21, 2019

Uh oh!

Alchez commented Jun 21, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dti-deploy commented Aug 12, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

DeeMysterio commented May 21, 2019 •

edited

Loading