chore: clarify codepath around mute email and make invoice #41704
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
blaggacao
commented
May 31, 2024
Comment on lines
215
to
+221
| def make_invoice(self): | ||
| ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name) | ||
| if hasattr(ref_doc, "order_type") and ref_doc.order_type == "Shopping Cart": | ||
| from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice | ||
| from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice | ||
|
|
||
| si = make_sales_invoice(self.reference_name, ignore_permissions=True) | ||
| si.allocate_advances_automatically = True | ||
| si = si.insert(ignore_permissions=True) | ||
| si.submit() | ||
| si = make_sales_invoice(self.reference_name, ignore_permissions=True) | ||
| si.allocate_advances_automatically = True | ||
| si = si.insert(ignore_permissions=True) | ||
| si.submit() |
There was a problem hiding this comment.
shifting control to de caller for a more "atomic" make_invoice function (useful later)
blaggacao
commented
May 31, 2024
| ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name) | ||
|
|
||
| if ( | ||
| hasattr(ref_doc, "order_type") and ref_doc.order_type == "Shopping Cart" | ||
| ) or self.flags.mute_email: | ||
| send_mail = False | ||
|
|
||
| if send_mail and self.payment_channel != "Phone": | ||
| if send_mail and not (self.mute_email or self.flags.mute_email): |
There was a problem hiding this comment.
Use state instead of "logic on the leaves" (of the code branches)
blaggacao
commented
May 31, 2024
Comment on lines
-415
to
-417
| def get_payment_success_url(self): | ||
| return self.payment_success_url | ||
|
|
There was a problem hiding this comment.
there's no field payment_success_url
blaggacao
commented
May 31, 2024
Comment on lines
+491
to
+494
| "make_sales_invoice": args.order_type == "Shopping Cart", | ||
| "mute_email": args.mute_email | ||
| or args.order_type == "Shopping Cart" | ||
| or gateway_account.get("payment_channel", "Email") != "Email", |
There was a problem hiding this comment.
Ensure intent is properly reflected in state
blaggacao
commented
May 31, 2024
Comment on lines
-589
to
+579
| if gateway_account: | ||
| return get_payment_gateway_account(gateway_account) | ||
|
|
||
| gateway_account = get_payment_gateway_account({"is_default": 1}) | ||
|
|
||
| return gateway_account | ||
| return get_payment_gateway_account(gateway_account) |
blaggacao
commented
May 31, 2024
Comment on lines
-597
to
+586
| def get_payment_gateway_account(args): | ||
| def get_payment_gateway_account(filter): | ||
| return frappe.db.get_value( | ||
| "Payment Gateway Account", | ||
| args, | ||
| ["name", "payment_gateway", "payment_account", "message"], | ||
| filter, | ||
| ["name", "payment_gateway", "payment_account", "payment_channel", "message"], |
blaggacao
commented
May 31, 2024
| self.assertEqual(pr.mute_email, False) | ||
| self.assertEqual(pr.mute_email, True) |
There was a problem hiding this comment.
Finally, make the test semantically more correct.
blaggacao
commented
May 31, 2024
erpnext/accounts/doctype/payment_request/test_payment_request.py
Outdated
Show resolved
Hide resolved
|
@ruthra-kumar now it's green :-) |
|
@ruthra-kumar Does this look good?
|
|
Bit held up with other stuff. Will look into this PR next week. |
|
@ruthra-kumar Hey, I hope we can get through this next step. Kindly remember, there are still 6 or so ahead, at a minimum. :-) |
ruthra-kumar
approved these changes
Jun 23, 2024
|
Thanks a lot! The next one should be a lot smaller and easier! 🤝 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #40845
cc @ruthra-kumar