Skip to content

Merge bs-mar-sprint-1 into pre-release #579

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 1 commit into from
Mar 31, 2021
Merged

Merge bs-mar-sprint-1 into pre-release #579

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 17 additions & 9 deletions bloomstack_core/hook_events/delivery_note.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,23 @@ def execute_bloomtrace_integration_request():
delivery_note = frappe.get_doc("Delivery Note", integration_request.reference_docname)

try:
if not delivery_note.is_return and integration_request.endpoint == "Package":
insert_delivery_payload(delivery_note, frappe_client)

if delivery_note.lr_no or (delivery_note.estimated_arrival and delivery_note.departure_time) and integration_request.endpoint == "Transfer":
# If delivery trip is created or estimated_arrival and departure_time is present, only then move forward to integrate with BloomTrace
insert_transfer_template(delivery_note, frappe_client)

integration_request.error = ""
integration_request.status = "Completed"
error, status = "", "Completed"

if integration_request.endpoint == "Package":
if not delivery_note.is_return:
insert_delivery_payload(delivery_note, frappe_client)
else:
error, status = "Delivery Note is marked as return", "Failed"

if integration_request.endpoint == "Transfer":
if delivery_note.lr_no or (delivery_note.estimated_arrival and delivery_note.departure_time):
# If delivery trip is created or estimated_arrival and departure_time is present, only then move forward to integrate with BloomTrace
insert_transfer_template(delivery_note, frappe_client)
else:
error, status = "Delivery Trip / Estimated Departure / Estimated Arrival is missing", "Failed"

integration_request.error = error
integration_request.status = status
integration_request.save(ignore_permissions=True)
except Exception as e:
integration_request.error = cstr(frappe.get_traceback())
Expand Down