Removes asset tag if 2D code is not present #15817
Merged
Conversation
This file contains 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
PR Summary
|
|
I only see two files changed here, and am still seeing this with LabelWriter_1933081. 
|
snipe
added a commit
that referenced
this pull request
Nov 14, 2024
Signed-off-by: snipe <[email protected]>
|
I patched LabelWriter_1933081 |
DarthKillian
added a commit
to DarthKillian/eti-assets
that referenced
this pull request
Dec 31, 2024
* Versioning stuff is hard - fixed v7.0.14 to v7.1.14 Signed-off-by: snipe <[email protected]> * Versioning stuff is hard - fixed v7.0.14 to v7.1.14 Signed-off-by: snipe <[email protected]> * this should work in theory - local is screwy though * working except for null 🤔 * seems to work just fine now, needs translations * note and rm dump and comment * Specify table name in select Signed-off-by: snipe <[email protected]> * Add @maciej-poleszczyk as a contributor * Fixed snipe#15812 - regression in action_type search Signed-off-by: snipe <[email protected]> * Removed Twitter links Signed-off-by: snipe <[email protected]> * Removed extra sort Signed-off-by: snipe <[email protected]> * Fixed anchor links Signed-off-by: snipe <[email protected]> * replace the via channel class * removes tag if qr code is not present * translations and attribute names * fixed rest of dymos * rm unnecessary imports * Corrected route name for filestable on assets Signed-off-by: snipe <[email protected]> * Fixed delete model file route Signed-off-by: snipe <[email protected]> * oops, something went wrong translation * Fixed snipe#15820 - added model number to view-assets Signed-off-by: snipe <[email protected]> * Additional fix for snipe#15817 Signed-off-by: snipe <[email protected]> * Fixed snipe#15825 Signed-off-by: snipe <[email protected]> * Fixed admin user not showing in download all activity report Signed-off-by: snipe <[email protected]> * this should be all it takes to fix this, i think * replace env with config variable for from address * Fix rollback for created_by * Fix rollback for webhook_endpoint by using correct column type * update default from address to alternate config variable * Update README.md typo mosrt to most under Join our Community links * Feature: Added API endpoint for generating asset labels * Feature: Added translations for label generation API endpoint * Feature: Added API route for asset label generation * Fixed variable name Signed-off-by: snipe <[email protected]> * Indicate requiredness on status select on bulk user checkin+delete Signed-off-by: snipe <[email protected]> * use existing validation strings * add testing example var MAIL_FROM_ADDR * fix mail.from.address variables in config, simplify envelop[ variable * adding colon to password translation * Add tests around component check ins via api * Formatting * Use === over == * Add tests around deleting component via ui * Improve check for image existence * Feature: Added category to asset checkout email * Feature: Added category to asset checkin email * Feature: Added category to asset acceptance/decline email * Feature: Added category to asset requested email * Fix: Removed setting validation as it is not strictly necessary * no checked out to email doesnt trigger a 500 * Always run validation on checkin * Use database file for sqlite in GitHub Action for tests * remove the changes to mail.from.address default * Add tests for component checkout api endpoint * [Snyk] Upgrade jquery-ui from 1.14.0 to 1.14.1 snipe#15868 Signed-off-by: snipe <[email protected]> * fixing colon placements * Always call resizeCanvas * WIP: move signature pad creation up and add debugging * Remove debugging * commit for testing * orange bar for requirednessness * Updated translations Signed-off-by: snipe <[email protected]> * Updated version Signed-off-by: snipe <[email protected]> * fix user api update from clearing location_id unnecessarily * fixed mobile view of assets * fix mobile view for asset and user * Harden asset checkout validation by requiring ints * requested changes from pr * fixing line * Dev assets Signed-off-by: snipe <[email protected]> * Use transformer on API update Signed-off-by: snipe <[email protected]> * Fixed order by notes for users Signed-off-by: snipe <[email protected]> * Fixed snipe#15901 - re-added required indicator on text and select custom fields Signed-off-by: snipe <[email protected]> * Fixed bulk user form in user detail view Signed-off-by: snipe <[email protected]> * Revert "Hardened asset checkout validation by requiring integer" * Some CSS twiddling Signed-off-by: snipe <[email protected]> * Fixed funky layout in importer Signed-off-by: snipe <[email protected]> * fixes general webhook not firing * Include MAIL_FROM_ADDR in phpunit configuration * Fixed sr-only blank text Signed-off-by: snipe <[email protected]> * Harden asset checkout validation * fix unaccepted assets report resend acceptance * add property check * adds mail from name to mail envelope * fix typo * layout / added category id * fixed * add mail class for unaccepted assets reminders * fixed conditionals * missed a spot * fix duplicate emails being sent in unaccepted reminder command * cleans up the Unaccepted Asset reminder variables * wrap comment * adds testing to unaccepted reminder command * delete notification version of reminder * Only update asset locations to assets checked out to users. * Removed issue/PR templates Signed-off-by: snipe <[email protected]> * note, will come back to this once question is answered * Show frontend "required" validation for model and status selects * Updated supported versions Signed-off-by: snipe <[email protected]> * add null safe operator to acceptance reminder * Fixes snipe#15952 - fixed typo in content-type Signed-off-by: snipe <[email protected]> * Add @sgross-emlix as a contributor * Fixed snipe#15928 - updated method name to setCreatedBy from SetUserId Signed-off-by: snipe <[email protected]> * Fix league/commonmark's quadratic complexity bugs may lead to a denial of service * Use appropriate category for licenses when seeding * reversed order of the acceptance and note paramter * fix other mailables * Revert "Show frontend "required" validation for model and status selects" This reverts commit 10a7ae8. * fix other mailables * Fix validation messages for select2 inputs * leaving this here for notes etc * Removed index and destroy settinga API endpoints Signed-off-by: snipe <[email protected]> * Fixes to 'clean' mode to better handle character sets and zero-values * Check for assigned (not assigned_to) before trying to present() the name on bulk delete assets Signed-off-by: snipe <[email protected]> * Updated strings Signed-off-by: snipe <[email protected]> * Add accessory ui tests * Add consumable ui tests * Scaffold and implement some license checkin tests * Bumped font-awesome to 6.7.0 Signed-off-by: snipe <[email protected]> * Refactor of snipe#15235 - added accessory checkout to locations, assets Signed-off-by: snipe <[email protected]> * Use history icon Signed-off-by: snipe <[email protected]> * Added currency and history icons Signed-off-by: snipe <[email protected]> * Fixed variable in test Signed-off-by: snipe <[email protected]> * Updated user_id to created_by Signed-off-by: snipe <[email protected]> * Added new route Signed-off-by: snipe <[email protected]> * Updated route Signed-off-by: snipe <[email protected]> * Fixed user_id to created_by Signed-off-by: snipe <[email protected]> * No need to include assigned_to Signed-off-by: snipe <[email protected]> * Updated transformer Signed-off-by: snipe <[email protected]> * Removed create() method Signed-off-by: snipe <[email protected]> * Specify created_by in the API call as well Signed-off-by: snipe <[email protected]> * Added assignedAccessories method Signed-off-by: snipe <[email protected]> * Added assets endpoint Signed-off-by: snipe <[email protected]> * Added accessory transformer to assets transformer Signed-off-by: snipe <[email protected]> * Updated route in view Signed-off-by: snipe <[email protected]> * Updated routes with new endpoints Signed-off-by: snipe <[email protected]> * Updated comment Signed-off-by: snipe <[email protected]> * Added new test Signed-off-by: snipe <[email protected]> * Fixed admin -> adminuser property Signed-off-by: snipe <[email protected]> * Fixed property Signed-off-by: snipe <[email protected]> * Removed inadvertently added files. * Add tests for license checkin * Add permissions property to group factory * Add simple tests to ensure views render * Use correct id * Remove leftover testing logic and fix checkout permissions Removed console logs and temporary testing code from the bootstrap-table view. Updated the transformer to correctly check checkout permissions against the Asset class instead of PredefinedKit. * rm note * change barcode column names in seeder * add note * oops, rm dump * Added a few order options on audit report Signed-off-by: snipe <[email protected]> * Update settings property keys * Fix broken merge conflict files part 1 Signed-off-by: Darth Killian <[email protected]> * More Merge Conflict Bug Fixes Signed-off-by: Darth Killian <[email protected]> * More bug fixes and add bulk checkout company & order number support back in Signed-off-by: Darth Killian <[email protected]> * Fix some additional lang stuff and disable user checkout on accessories Signed-off-by: Darth Killian <[email protected]> * Fix some more missing language references Signed-off-by: Darth Killian <[email protected]> * Fix broken language and testing files Signed-off-by: Darth Killian <[email protected]> * Fix tests (again) Signed-off-by: Darth Killian <[email protected]> --------- Signed-off-by: snipe <[email protected]> Signed-off-by: Darth Killian <[email protected]> Co-authored-by: snipe <[email protected]> Co-authored-by: spencerrlongg <[email protected]> Co-authored-by: Godfrey M <[email protected]> Co-authored-by: Marcus Moore <[email protected]> Co-authored-by: victoria <[email protected]> Co-authored-by: NebelKreis <[email protected]> Co-authored-by: akemidx <[email protected]> Co-authored-by: Brady Wetherington <[email protected]> Co-authored-by: Joël Pittet <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
The asset tag comes free when a QR code is used.
But if the QR code is not present the asset tag would be placed in an awkward place.
If a QR code is not being used the asset tag will have to be in a field space now:
These changes are applied to the following labels:
LabelWriter_1933081
LabelWriter_2112283
LabelWriter_30252
Fixes # (issue)
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test Configuration:
Checklist: