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.

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

LIMS-1108: Improve message re international shipping #721

Conversation

ndg63276
Copy link
Collaborator

JIRA ticket: LIMS-1108

Summary:

Improve the message displayed regarding international shipping

Changes:

  • Add a new variable for a link to help with international shipping $facility_courier_countries_link
  • If that variable exists, display the message at the top of the add shipment page, with the link
  • Change the message displayed at the top of a shipment page depending on whether the dewar's country is supported for Synchweb-based shipping (ie UK), semi-supported (ie EU), or not supported.

To test:

  • Click to add a new shipment, check no red message is displayed at the top
  • Add $facility_courier_countries_link = 'https://www.diamond.ac.uk/Instruments/Mx/I03/I03-Manual/Shipping-Samples.html'; to config.php, refresh and check a red message appears at the top with a link
  • View a booked shipment from the UK, check it shows a message about printing the air waybill
  • View an unbooked shipment from the UK, check it shows a message about booking the air waybill
  • View a shipment from the EU, check it shows a message including a link to help for EU users
  • View a shipment from outside the EU, check it shows a shorter message without the EU link

@ndg63276 ndg63276 changed the base branch from prerelease to master June 24, 2024 09:36
@NKatti2011
Copy link
Collaborator

Looks good to me but conflicts need to be resolved

@ndg63276 ndg63276 changed the base branch from master to pre-release/2024-R4.2 September 3, 2024 08:17
@ndg63276 ndg63276 merged commit f11757d into pre-release/2024-R4.2 Sep 3, 2024
2 checks passed
@ndg63276 ndg63276 deleted the improvement/LIMS-1108/improve-message-re-international-shipping branch September 3, 2024 08:20
@ndg63276 ndg63276 restored the improvement/LIMS-1108/improve-message-re-international-shipping branch September 3, 2024 10:57
@ndg63276 ndg63276 deleted the improvement/LIMS-1108/improve-message-re-international-shipping branch September 10, 2024 10:50
ndg63276 added a commit that referenced this pull request Sep 17, 2024
* LIMS-1432: Add shelxt downstream view (#818)

* LIMS-1436: Use auth provider provided logout URL when SSO is enabled (#822)

* LIMS-1108: Improve message re international shipping (#721)

* LIMS-1396: Use shipping service callback URL to only send emails once shipment is booked (#814)

* LIMS-1435: Put CCP4 location into config variable (#821)

* LIMS-656: Show auto subsamples if they have data (#817)

---------

Co-authored-by: Dean Keeble <[email protected]>
Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: Mark Williams <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants