Skip to content
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

Jump to bottom

LIMS-1331: Send all dispatch requests unless international via DHL for BI/MX #779

Merged
merged 2 commits into from
May 31, 2024
Merged

LIMS-1331: Send all dispatch requests unless international via DHL for BI/MX #779

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccbf068
LIMS-1331: Send all dispatch requests to Goods Handling unless intern…
JPHall-DLS May 29, 2024
8f71c33
Merge branch 'prerelease' into improvement/LIMS-1331/send-all-dispatc…
ndg63276 May 31, 2024
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
11 changes: 9 additions & 2 deletions api/src/Page/Shipment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ function _dispatch_dewar()
}

$dew = $this->db->pq(
"SELECT d.dewarid, d.barcode, d.storagelocation, d.dewarstatus, d.externalShippingIdFromSynchrotron, s.shippingid, CONCAT(p.proposalcode, p.proposalnumber) as proposal, count(distinct c.containerId) as num_pucks, count(b.blsampleId) as num_samples
"SELECT d.dewarid, d.barcode, d.storagelocation, d.dewarstatus, d.externalShippingIdFromSynchrotron, s.shippingid, p.proposalcode, CONCAT(p.proposalcode, p.proposalnumber) as proposal, count(distinct c.containerId) as num_pucks, count(b.blsampleId) as num_samples
FROM dewar d
INNER JOIN shipping s ON s.shippingid = d.shippingid
INNER JOIN proposal p ON p.proposalid = s.proposalid
Expand Down Expand Up @@ -1275,7 +1275,14 @@ function _dispatch_dewar()
$data['BARCODE'] = $dew['BARCODE'];
$email->data = $data;

if ($country != $facility_country && !is_null($dispatch_email_intl)) {
if (
$country != $facility_country &&
array_key_exists('DELIVERYAGENT_AGENTNAME', $data) &&
$data['DELIVERYAGENT_AGENTNAME'] === 'DHL' &&
ndg63276 marked this conversation as resolved.
Show resolved Hide resolved
array_key_exists('PROPOSALCODE', $dew) &&
in_array($dew['PROPOSALCODE'], array('bi','cm','mx')) &&
!is_null($dispatch_email_intl)
) {
$recpts = $dispatch_email_intl;
} else {
$recpts = $dispatch_email;
Expand Down
Loading