LIMS-1353: Cannot book multiple dewars in one shipment#788
Merged
ndg63276 merged 9 commits intopre-release/2024-R2.4.1from Jun 24, 2024
Merged
Conversation
* LIMS-1204: Remove log area from the top of active visits * LIMS-1204: Remove dclog.js --------- Co-authored-by: Mark Williams <[email protected]>
* LIMS-1113: Redirect to shipping-service on dispatch * LIMS-1113: Fix typos in shipping service URLs * LIMS-1113: Change text on submit button if redirecting * LIMS-1113: Fix shipment request requests for Dewars with no pucks/samples * LIMS-1113: Don't redirect for international shipments * LIMS-1113: Tweak logic for international shipments * LIMS-1113: Propagate shipping service error codes to client * LIMS-1113: Link to shipping service from shipping page * LIMS-1113: Restore commented code * LIMS-1113: Include Dewar data in dispatch error log * LIMS-1113: Apply GdF suggestions * LIMS-1113: Update config_sample.php * LIMS-1113: Limit redirects to supported countries * LIMS-1113: Add supported country dropdown to dispatch from * ULIMS-50: Redirect to shipping service to book incoming shipments * Update client/src/js/modules/shipment/views/createawb.js Co-authored-by: Guilherme Francisco <[email protected]> * Update client/src/js/modules/shipment/views/createawb.js Co-authored-by: Guilherme Francisco <[email protected]> * Update api/src/Page/Shipment.php Co-authored-by: Guilherme Francisco <[email protected]> * Update api/src/Page/Shipment.php Co-authored-by: Guilherme Francisco <[email protected]> * ULIMS-50: Add better error messages, make hidden fields not required * ULIMS-50: Update description and date validation in dispatch model * Restore EM menu in dropdown (#766) (#767) * Merge master into prerelease (#773) * Restore EM menu in dropdown (#766) * Pre release/2024 r2.2 (#770) * LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738) Co-authored-by: Mark Williams <[email protected]> * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams <[email protected]> * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams <[email protected]> * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams <[email protected]> * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams <[email protected]> --------- Co-authored-by: Mark Williams <[email protected]> * Pre release/2024 r2.3 (#772) * LIMS-1207: Move Calendar link to top left * LIMS-1207: Move Migrate link to Lab Contacts page * LIMS-1207: Re-order menu, remove Assign Containers * LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738) Co-authored-by: Mark Williams <[email protected]> * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams <[email protected]> * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams <[email protected]> * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams <[email protected]> * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams <[email protected]> * LIMS-1304: Correct the order of before and after snapshots * LIMS-1304: Update to fix typo Co-authored-by: Mark W <[email protected]> * LIMS-1235: Queries for implicit samples and DCs in project time out (#758) Co-authored-by: Mark Williams <[email protected]> * LIMS-1200: CSV file upload ignores first sample (#737) * LIMS-1200: CSV file upload ignores first sample * LIMS-1200: Fix bug uploading csv with one sample --------- Co-authored-by: Mark Williams <[email protected]> * LIMS-1174: Handle blank proposal on visits page (#740) Co-authored-by: Mark Williams <[email protected]> * LIMS-44: Speed up visit query (#759) Co-authored-by: Mark Williams <[email protected]> * LIMS-1059: Add visit column to shipments list (#742) Co-authored-by: Mark Williams <[email protected]> * Restore EM menu in dropdown (#766) (#768) * Add 2.2a changes to 2.3 (#771) * Restore EM menu in dropdown (#766) * Pre release/2024 r2.2 (#770) * LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738) Co-authored-by: Mark Williams <[email protected]> * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams <[email protected]> * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams <[email protected]> * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams <[email protected]> * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams <[email protected]> --------- Co-authored-by: Mark Williams <[email protected]> --------- Co-authored-by: Guilherme Francisco <[email protected]> Co-authored-by: Mark Williams <[email protected]> --------- Co-authored-by: Mark Williams <[email protected]> Co-authored-by: Dominic Oram <[email protected]> Co-authored-by: Guilherme Francisco <[email protected]> --------- Co-authored-by: Guilherme Francisco <[email protected]> Co-authored-by: Mark Williams <[email protected]> Co-authored-by: Dominic Oram <[email protected]> --------- Co-authored-by: Guilherme Francisco <[email protected]> Co-authored-by: Mark W <[email protected]> Co-authored-by: Mark Williams <[email protected]> Co-authored-by: Dominic Oram <[email protected]>
…ational via DHL for BI/MX (#779) Co-authored-by: Mark W <[email protected]>
* LIMS-1206: Remove stacked usage bar chart from visit page * Remove no longer used modules/stats/views/stack.js --------- Co-authored-by: Mark Williams <[email protected]>
…741) Co-authored-by: Mark Williams <[email protected]>
…led (#780) * LIMS-1342: Show regular create AWB form if shipping redirect not enabled * LIMS-1342: hide extra country dropdown if shipping service redirect not enabled * LIMS-1342: Json encode any error responses * LIMS-1342: define shipping service url even any redirect in use * LIMS-1342: Dont assume https * LIMS-1342: Only show 1 country select dropdown * LIMS-1342: Simplify logic a little * LIMS-1342: Same fixes for dewar dispatch * LIMS-1342: Show correct button if country changes --------- Co-authored-by: Mark Williams <[email protected]>
…-multiple-dewars-in-one-shipment
ndg63276
deleted the
fix/LIMS-1353/cannot-book-multiple-dewars-in-one-shipment
branch
ndg63276
added a commit
that referenced
this pull request
Jun 25, 2024
* LIMS-1353: Cannot book multiple dewars in one shipment --------- Co-authored-by: Mark Williams <[email protected]> Co-authored-by: Matthew Pritchard <[email protected]>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
JIRA ticket: LIMS-1353
Summary:
#731 introduced a bug whereby multiple dewars in one shipment were combined together, so only one was booked to ship. Counting the containerids seemed to cause the problem.
Changes:
To test: