Skip to content

LIMS-2120: Hide courier fields if using facility account#1050

Merged
ndg63276 merged 2 commits intopre-release/2026-R2.2from
improvement/LIMS-2120/hide-courier-fields-if-using-facility-account
Apr 7, 2026
Merged

LIMS-2120: Hide courier fields if using facility account#1050
ndg63276 merged 2 commits intopre-release/2026-R2.2from
improvement/LIMS-2120/hide-courier-fields-if-using-facility-account

Conversation

@ndg63276
Copy link
Copy Markdown
Collaborator

JIRA ticket: LIMS-2120

Summary:

When making a shipment, we should detect if the lab contact is in the UK, and academic. Then we can present the button to say "Use Facility Account", and if they do, we can hide all the courier fields.

Changes:

  • Remove "Return Lab Contact" field from add shipment page, just use the outgoing lab contact for return
  • Move the courier name and account number fields up, and display a "Use facility account" button if UK/EU & academic
  • If the Ts & Cs are accepted, pass that to the backend when the shipment is created
  • Also hide all the courier fields on the Add Shipment page
  • Hide the courier fields on the View Shipment page (if the user has selected to use facility account)

To test:

  • Go to any proposal, edit the lab contacts so that one is UK based, one is EU based (as per $facility_courier_countries_nde), and one is non-EU
  • Go to Shipments and then Add Shipment, give it a name, a dewar code, and choose UDC for simplicity
  • Select the UK based lab contact, check the "Use Facility Account" button is displayed
  • Select the EU based lab contact, check the "Use Facility Account" button is displayed
  • Select the non-EU based lab contact, check the "Use Facility Account" button is not displayed
  • Go back to the UK lab contact, and click "Use Facility Account". Check all the courier fields disappear and it just says "Paid for by facility"
  • Click the "Add Shipment" button at the bottom, and you will be taken to the view shipment page. Check no courier fields are shown at the top of the page
  • Click "Create DHL Air Waybill", check it already says "Paid for by Facility"
  • Repeat shipment creation without clicking "Use Facility Account". Check all the courier fields are shown on the View Shipment page.
  • Click "Create DHL Air Waybill" or "Dispatch" (if non-EU) and check it asks for full courier details
  • Go to an "in" or "sw" proposal, check the "Use Facility Account" button is not shown when creating a shipment

@ndg63276 ndg63276 changed the base branch from master to pre-release/2026-R2.2 April 7, 2026 10:15
@ndg63276 ndg63276 merged commit 15d02ad into pre-release/2026-R2.2 Apr 7, 2026
2 checks passed
@ndg63276 ndg63276 deleted the improvement/LIMS-2120/hide-courier-fields-if-using-facility-account branch April 7, 2026 10:16
ndg63276 added a commit that referenced this pull request Apr 20, 2026
* LIMS-2125: Allow use of shipping service for EU dispatches (#1049)

* LIMS-2033: Fix count of autoprocessing errors (#1047)

* LIMS-2037: Remove manual check for duplicate acronyms (#1034)

* LIMS-2120: Hide courier fields if using facility account (#1050)

* LIMS-2141: Suppress errors if visit directory has been replaced with a file (#1051)

* I02-1 has 3 webcams

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
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