[Bug 30144] New: Add support for EDI GIR:LVT, Servicing instructions, segment
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Bug ID: 30144 Summary: Add support for EDI GIR:LVT, Servicing instructions, segment Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: enhancement Priority: P5 - low Component: Acquisitions Assignee: koha-bugs@lists.koha-community.org Reporter: martin.renvoize@ptfs-europe.com QA Contact: testopia@bugs.koha-community.org We allow for free text instructions in the EDI FTX segment now, taken from the vendor notes field. But this is at the order level, it would be helpful to add support for the LVT segment at the line level. -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Janet McGowan <janet.mcgowan@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |janet.mcgowan@ptfs-europe.c | |om -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aude.charillon@ptfs-europe. | |com -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Add support for EDI |Add support for EDI GIR:LVT |GIR:LVT, Servicing |and/or GIR:LVC, Servicing |instructions, segment |instructions, segment -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Sponsorship status|--- |Sponsored Patch complexity|--- |Small patch Assignee|koha-bugs@lists.koha-commun |martin.renvoize@openfifth.c |ity.org |o.uk Comma delimited| |Martin Renvoize list of Sponsors| |<martin.renvoize@gmail.com> Status|NEW |Needs Signoff -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #1 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 193017 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193017&action=edit Bug 30144: Add servicing_instruction field to aqorders table This patch adds a new TEXT field 'servicing_instruction' to the aqorders table to store EDIFACT servicing instructions (GIR LVT/LVC segments) as JSON. The field stores an array of instruction groups, where each group is an array of instruction objects with 'type' (LVC or LVT) and 'value' fields. Structure: [[{type:"LVC",value:"BB"},{type:"LVT",value:"text"}],[...]] This allows for: - Multiple servicing instruction groups per order line - Combinations of coded (LVC) and free-text (LVT) instructions - Instructions that work together in groups Also adds EDIFACT_SI authorized value category with EDItEUR List 3B servicing instruction codes for coded (LVC) instructions. Test plan: 1. Run database update 2. Verify aqorders.servicing_instruction field exists 3. Verify EDIFACT_SI authorized value category is created 4. Verify authorized values include codes like BB, BI, etc. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #2 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 193018 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193018&action=edit Bug 30144: Update DBIC schema Patch from commit 04a7b7f -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #3 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 193019 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193019&action=edit Bug 30144: Process and send servicing instructions in EDI messages This patch updates the EDIFACT processing to handle multiple servicing instruction groups in both incoming quotes and outgoing orders. Changes to Koha/EDI.pm (quote_item): - Reads both LVC (coded) and LVT (freetext) instructions from incoming quotes - Validates LVC codes against EDIFACT_SI authorized values - Stores instructions as JSON array structure - Groups instructions that work together Changes to Koha/Edifact/Order.pm (gir_segments): - Parses JSON servicing instruction data from order - Generates multiple GIR segments for outgoing orders - Each instruction becomes a separate GIR element - Logs JSON parse errors to EDI log using Koha::Logger - Fixed element counter reset bug when segments exceed 5 elements Structure allows vendors to specify: - Single coded instruction: [[{type:"LVC",value:"BB"}]] - Single text instruction: [[{type:"LVT",value:"Handle with care"}]] - Combined instructions: [[{type:"LVC",value:"BB"},{type:"LVT",value:"Apply on spine"}]] - Multiple services: [[{type:"LVC",value:"BB"}],[{type:"LVC",value:"BI"}]] Test plan: 1. Receive EDIFACT quote with servicing instructions 2. Verify instructions are stored correctly in aqorders 3. Create EDI order from basket 4. Verify GIR segments are generated correctly in outgoing message 5. Check EDI log for any JSON parse errors -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #4 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 193020 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193020&action=edit Bug 30144: Add UI for servicing instructions This patch adds the user interface for managing and displaying EDIFACT servicing instructions in the acquisitions module. Changes to acqui/neworderempty.pl: - Parses servicing_instruction JSON for editing existing orders - Fetches EDIFACT_SI authorized values for dropdown - Passes data to template in both array and JSON formats Changes to acqui/addorder.pl: - Accepts servicing_instruction_groups_json from form submission - Validates and stores JSON in database Changes to acqui/basket.pl: - Fetches EDIFACT_SI authorized values - Formats servicing instructions for display in get_order_infos() - Creates human-readable display strings with: * LVC codes replaced with descriptions * Groups separated by <br> tags * Format: "Description" or "Description: free text" Changes to neworderempty.tt: - Dynamic UI for adding/removing servicing instruction groups - Each group can contain: * One LVC (coded) instruction only, OR * One LVT (free-text) instruction only, OR * One LVC + one LVT combination - Validation prevents: * More than 2 instructions per group * Duplicate LVC or LVT in same group - LVC instructions use dropdown populated from EDIFACT_SI authorized values - LVT instructions use free-text input - Groups serialized to JSON hidden field for form submission - Smart button labels show what can be added to each group Changes to basket.tt: - Displays servicing instructions in basket table - Pre-formatted in Perl (no JavaScript parsing needed) - Shows LVC descriptions instead of codes - Multiple groups displayed on separate lines Changes to columns_settings.yml: - Adds servicing_instruction column to basket table configuration Display format examples: - LVC only: "Barcode labelling" - LVT only: "Handle with care" - Combined: "Binding: Apply to spine" - Multiple groups (on separate lines): Barcode labelling Binding: Special instructions Test plan: 1. Create/edit order 2. Add servicing instruction groups 3. Try to add more than 2 instructions to a group (should prevent) 4. Try to add duplicate LVC or LVT to group (should prevent) 5. Save order 6. View basket and verify instructions display correctly 7. Edit order and verify instructions load into form -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #5 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 193021 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193021&action=edit Bug 30144: Add unit tests for servicing instructions This patch adds comprehensive unit tests for the servicing instruction functionality in t/db_dependent/Koha/Edifact/Order.t. Changes: - Updated test count from 6 to 7 - Added servicing_instruction => undef to test orders to prevent TestBuilder from generating random invalid JSON - Added servicing instruction subtest with 18 tests covering: * Single LVC instruction * Single LVT instruction * Multiple LVC in one group (tests GIR segment overflow) * Mixed LVC/LVT in one group * Multiple groups * Empty servicing instruction * Invalid JSON handling (logged to EDI log) - Tests correctly handle GIR segment 5-element limit and overflow to additional segments Test plan: 1. Run: prove t/db_dependent/Koha/Edifact/Order.t 2. Verify all tests pass -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #6 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 193022 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193022&action=edit Bug 30144: Add tests for EDIFACT servicing instruction handling This commit adds comprehensive tests for servicing instruction processing in both incoming quotes and outgoing orders: 1. Integration tests for incoming quote processing (Koha/EDI.pm) - Tests LVC (coded) and LVT (freetext) extraction - Tests multiple GIR occurrences with different servicing instructions - Tests all combinations: LVC only, LVT only, and LVC+LVT together 2. Test EDIFACT quote file (QUOTES_SERVICING.CEQ) - Contains 3 line items with 4 total orders - Demonstrates different servicing instruction patterns 3. Fix for multi-occurrence servicing instruction extraction - Modified quote_item() to extract servicing instructions per GIR occurrence instead of across all occurrences - Ensures each order gets only its own servicing instructions - Aligns with existing multi-item processing for funds and stock rotation Test coverage: - t/db_dependent/Koha/EDI.t: 29 tests for incoming quote processing - t/db_dependent/Koha/Edifact/Order.t: 18 tests for outgoing order generation (previously added) All tests pass successfully. Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kyle@bywatersolutions.com -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Kyle M Hall (khall) <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #7 from Kyle M Hall (khall) <kyle@bywatersolutions.com> --- All tests pass with a fresh database, but if I check out current main, apply the patches, run the database update and then run the tests, they fail: Running tests (2) * Proving /kohadevbox/koha/t/db_dependent/Koha/EDI.t FAIL # Loaded QUOTE file with 1 Message that contains 2 LIN segments with the first # consistent of 1 item and the second with 3 items with 2 different funds. # Loading QUOTE file with 1 Message that contains 2 LIN segments with the first # consistent of 1 item and the second with 3 items with 2 different undefined funds. # Loading QUOTE file with 2 messages # Failed test 'no warnings' # at /usr/share/perl/5.36/Test/Builder.pm line 193. # There were 3 warning(s) # Previous test 0 '' # Violation of unique constraint in AuthorisedValue at /kohadevbox/koha/t/lib/TestBuilder.pm line 365. # at /kohadevbox/koha/t/lib/TestBuilder.pm line 365. # t::lib::TestBuilder::_buildColumnValues(t::lib::TestBuilder=HASH(0xaaab04581518), HASH(0xaaab100ad118)) called at /kohadevbox/koha/t/lib/TestBuilder.pm line 121 # t::lib::TestBuilder::build(t::lib::TestBuilder=HASH(0xaaab04581518), HASH(0xaaab100fdc18)) called at /kohadevbox/koha/t/db_dependent/Koha/EDI.t line 1995 # main::__ANON__() called at /usr/share/perl/5.36/Test/Builder.pm line 374 # eval {...} called at /usr/share/perl/5.36/Test/Builder.pm line 374 # Test::Builder::subtest(Test::Builder=HASH(0xaaab0483a2d0), "servicing_instructions_quote_processing", CODE(0xaaab0fd25d60)) called at /usr/share/perl/5.36/Test/More.pm line 809 # Test::More::subtest("servicing_instructions_quote_processing", CODE(0xaaab0fd25d60)) called at /kohadevbox/koha/t/db_dependent/Koha/EDI.t line 2105 # # ---------- # Previous test 0 '' # Violation of unique constraint in AuthorisedValue at /kohadevbox/koha/t/lib/TestBuilder.pm line 365. # at /kohadevbox/koha/t/lib/TestBuilder.pm line 365. # t::lib::TestBuilder::_buildColumnValues(t::lib::TestBuilder=HASH(0xaaab04581518), HASH(0xaaab10139a58)) called at /kohadevbox/koha/t/lib/TestBuilder.pm line 121 # t::lib::TestBuilder::build(t::lib::TestBuilder=HASH(0xaaab04581518), HASH(0xaaab101606d8)) called at /kohadevbox/koha/t/db_dependent/Koha/EDI.t line 1995 # main::__ANON__() called at /usr/share/perl/5.36/Test/Builder.pm line 374 # eval {...} called at /usr/share/perl/5.36/Test/Builder.pm line 374 # Test::Builder::subtest(Test::Builder=HASH(0xaaab0483a2d0), "servicing_instructions_quote_processing", CODE(0xaaab0fd25d60)) called at /usr/share/perl/5.36/Test/More.pm line 809 # Test::More::subtest("servicing_instructions_quote_processing", CODE(0xaaab0fd25d60)) called at /kohadevbox/koha/t/db_dependent/Koha/EDI.t line 2105 # # ---------- # Previous test 0 '' # Violation of unique constraint in AuthorisedValue at /kohadevbox/koha/t/lib/TestBuilder.pm line 365. # at /kohadevbox/koha/t/lib/TestBuilder.pm line 365. # t::lib::TestBuilder::_buildColumnValues(t::lib::TestBuilder=HASH(0xaaab04581518), HASH(0xaaab100ad118)) called at /kohadevbox/koha/t/lib/TestBuilder.pm line 121 # t::lib::TestBuilder::build(t::lib::TestBuilder=HASH(0xaaab04581518), HASH(0xaaab100fdc18)) called at /kohadevbox/koha/t/db_dependent/Koha/EDI.t line 1995 # main::__ANON__() called at /usr/share/perl/5.36/Test/Builder.pm line 374 # eval {...} called at /usr/share/perl/5.36/Test/Builder.pm line 374 # Test::Builder::subtest(Test::Builder=HASH(0xaaab0483a2d0), "servicing_instructions_quote_processing", CODE(0xaaab0fd25d60)) called at /usr/share/perl/5.36/Test/More.pm line 809 # Test::More::subtest("servicing_instructions_quote_processing", CODE(0xaaab0fd25d60)) called at /kohadevbox/koha/t/db_dependent/Koha/EDI.t line 2105 # # Looks like you failed 1 test of 9. /kohadevbox/koha/t/db_dependent/Koha/EDI.t .. Dubious, test returned 1 (wstat 256, 0x100) Failed 1/9 subtests Test Summary Report ------------------- /kohadevbox/koha/t/db_dependent/Koha/EDI.t (Wstat: 256 (exited 1) Tests: 9 Failed: 1) Failed test: 9 Non-zero exit status: 1 Files=1, Tests=9, 3 wallclock secs ( 0.02 usr 0.00 sys + 2.51 cusr 0.58 csys = 3.11 CPU) Result: FAIL * Proving /kohadevbox/koha/t/db_dependent/Koha/Edifact/Order.t PASS -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193017|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193018|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193019|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193020|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193021|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193022|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #8 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 193093 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193093&action=edit Bug 30144: Add servicing_instruction field to aqorders table This patch adds a new TEXT field 'servicing_instruction' to the aqorders table to store EDIFACT servicing instructions (GIR LVT/LVC segments) as JSON. The field stores an array of instruction groups, where each group is an array of instruction objects with 'type' (LVC or LVT) and 'value' fields. Structure: [[{type:"LVC",value:"BB"},{type:"LVT",value:"text"}],[...]] This allows for: - Multiple servicing instruction groups per order line - Combinations of coded (LVC) and free-text (LVT) instructions - Instructions that work together in groups Also adds EDIFACT_SI authorized value category with EDItEUR List 3B servicing instruction codes for coded (LVC) instructions. Test plan: 1. Run database update 2. Verify aqorders.servicing_instruction field exists 3. Verify EDIFACT_SI authorized value category is created 4. Verify authorized values include codes like BB, BI, etc. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #9 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 193094 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193094&action=edit Bug 30144: Update DBIC schema Patch from commit 407a54a -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #10 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 193095 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193095&action=edit Bug 30144: Process and send servicing instructions in EDI messages This patch updates the EDIFACT processing to handle multiple servicing instruction groups in both incoming quotes and outgoing orders. Changes to Koha/EDI.pm (quote_item): - Reads both LVC (coded) and LVT (freetext) instructions from incoming quotes - Validates LVC codes against EDIFACT_SI authorized values - Stores instructions as JSON array structure - Groups instructions that work together Changes to Koha/Edifact/Order.pm (gir_segments): - Parses JSON servicing instruction data from order - Generates multiple GIR segments for outgoing orders - Each instruction becomes a separate GIR element - Logs JSON parse errors to EDI log using Koha::Logger - Fixed element counter reset bug when segments exceed 5 elements Structure allows vendors to specify: - Single coded instruction: [[{type:"LVC",value:"BB"}]] - Single text instruction: [[{type:"LVT",value:"Handle with care"}]] - Combined instructions: [[{type:"LVC",value:"BB"},{type:"LVT",value:"Apply on spine"}]] - Multiple services: [[{type:"LVC",value:"BB"}],[{type:"LVC",value:"BI"}]] Test plan: 1. Receive EDIFACT quote with servicing instructions 2. Verify instructions are stored correctly in aqorders 3. Create EDI order from basket 4. Verify GIR segments are generated correctly in outgoing message 5. Check EDI log for any JSON parse errors -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #11 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 193096 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193096&action=edit Bug 30144: Add UI for servicing instructions This patch adds the user interface for managing and displaying EDIFACT servicing instructions in the acquisitions module. Changes to acqui/neworderempty.pl: - Parses servicing_instruction JSON for editing existing orders - Fetches EDIFACT_SI authorized values for dropdown - Passes data to template in both array and JSON formats Changes to acqui/addorder.pl: - Accepts servicing_instruction_groups_json from form submission - Validates and stores JSON in database Changes to acqui/basket.pl: - Fetches EDIFACT_SI authorized values - Formats servicing instructions for display in get_order_infos() - Creates human-readable display strings with: * LVC codes replaced with descriptions * Groups separated by <br> tags * Format: "Description" or "Description: free text" Changes to neworderempty.tt: - Dynamic UI for adding/removing servicing instruction groups - Each group can contain: * One LVC (coded) instruction only, OR * One LVT (free-text) instruction only, OR * One LVC + one LVT combination - Validation prevents: * More than 2 instructions per group * Duplicate LVC or LVT in same group - LVC instructions use dropdown populated from EDIFACT_SI authorized values - LVT instructions use free-text input - Groups serialized to JSON hidden field for form submission - Smart button labels show what can be added to each group Changes to basket.tt: - Displays servicing instructions in basket table - Pre-formatted in Perl (no JavaScript parsing needed) - Shows LVC descriptions instead of codes - Multiple groups displayed on separate lines Changes to columns_settings.yml: - Adds servicing_instruction column to basket table configuration Display format examples: - LVC only: "Barcode labelling" - LVT only: "Handle with care" - Combined: "Binding: Apply to spine" - Multiple groups (on separate lines): Barcode labelling Binding: Special instructions Test plan: 1. Create/edit order 2. Add servicing instruction groups 3. Try to add more than 2 instructions to a group (should prevent) 4. Try to add duplicate LVC or LVT to group (should prevent) 5. Save order 6. View basket and verify instructions display correctly 7. Edit order and verify instructions load into form -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #12 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 193097 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193097&action=edit Bug 30144: Add unit tests for servicing instructions This patch adds comprehensive unit tests for the servicing instruction functionality in t/db_dependent/Koha/Edifact/Order.t. Changes: - Updated test count from 6 to 7 - Added servicing_instruction => undef to test orders to prevent TestBuilder from generating random invalid JSON - Added servicing instruction subtest with 18 tests covering: * Single LVC instruction * Single LVT instruction * Multiple LVC in one group (tests GIR segment overflow) * Mixed LVC/LVT in one group * Multiple groups * Empty servicing instruction * Invalid JSON handling (logged to EDI log) - Tests correctly handle GIR segment 5-element limit and overflow to additional segments Test plan: 1. Run: prove t/db_dependent/Koha/Edifact/Order.t 2. Verify all tests pass -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #13 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 193098 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193098&action=edit Bug 30144: Add tests for EDIFACT servicing instruction handling This commit adds comprehensive tests for servicing instruction processing in both incoming quotes and outgoing orders: 1. Integration tests for incoming quote processing (Koha/EDI.pm) - Tests LVC (coded) and LVT (freetext) extraction - Tests multiple GIR occurrences with different servicing instructions - Tests all combinations: LVC only, LVT only, and LVC+LVT together 2. Test EDIFACT quote file (QUOTES_SERVICING.CEQ) - Contains 3 line items with 4 total orders - Demonstrates different servicing instruction patterns 3. Fix for multi-occurrence servicing instruction extraction - Modified quote_item() to extract servicing instructions per GIR occurrence instead of across all occurrences - Ensures each order gets only its own servicing instructions - Aligns with existing multi-item processing for funds and stock rotation Test coverage: - t/db_dependent/Koha/EDI.t: 29 tests for incoming quote processing - t/db_dependent/Koha/Edifact/Order.t: 18 tests for outgoing order generation (previously added) All tests pass successfully. Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #14 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 193099 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193099&action=edit Bug 30144: (QA follow-up) Add EDIFACT_SI authorised values to installer data Tests were failing on upgrade route because they tried to create EDIFACT_SI authorised values that already existed from the atomicupdate script, causing unique constraint violations. This patch: - Removes test code that created EDIFACT_SI values (tests should assume database defaults exist) - Adds EDIFACT_SI category to auth_val_cat.sql for fresh installs - Adds all 32 EDItEUR List 3B servicing instruction codes to auth_values.yml for fresh installs Now the authorised values exist in both installation paths: - Upgrade route: Created by atomicupdate script - Fresh install: Created by installer SQL/YAML files Test plan: 1. prove t/db_dependent/Koha/EDI.t 2. prove t/db_dependent/Koha/Edifact/Order.t 3. Verify both tests pass without warnings -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #15 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Good catch Kyle, I had the installer files uncommited in my tree.. combined with "fixing" the test to add the data for testing against.. Not a great combination.. I changed my mind partway through and forgot. Anywho.. should all work sensible now with that follow-up. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |41852 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41852 [Bug 41852] Modernize EDI support in Koha -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|41852 | Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41852 [Bug 41852] Modernize EDI support in Koha -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |38195 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38195 [Bug 38195] EDI/Edifact classes should use Koha::Objects instead of plain DBIC -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Kyle M Hall (khall) <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |kyle@bywatersolutions.com |y.org | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Kyle M Hall (khall) <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193093|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Kyle M Hall (khall) <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193094|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Kyle M Hall (khall) <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193095|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Kyle M Hall (khall) <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193096|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Kyle M Hall (khall) <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193097|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Kyle M Hall (khall) <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193098|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Kyle M Hall (khall) <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193099|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #16 from Kyle M Hall (khall) <kyle@bywatersolutions.com> --- Created attachment 193318 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193318&action=edit Bug 30144: Add servicing_instruction field to aqorders table This patch adds a new TEXT field 'servicing_instruction' to the aqorders table to store EDIFACT servicing instructions (GIR LVT/LVC segments) as JSON. The field stores an array of instruction groups, where each group is an array of instruction objects with 'type' (LVC or LVT) and 'value' fields. Structure: [[{type:"LVC",value:"BB"},{type:"LVT",value:"text"}],[...]] This allows for: - Multiple servicing instruction groups per order line - Combinations of coded (LVC) and free-text (LVT) instructions - Instructions that work together in groups Also adds EDIFACT_SI authorized value category with EDItEUR List 3B servicing instruction codes for coded (LVC) instructions. Test plan: 1. Run database update 2. Verify aqorders.servicing_instruction field exists 3. Verify EDIFACT_SI authorized value category is created 4. Verify authorized values include codes like BB, BI, etc. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #17 from Kyle M Hall (khall) <kyle@bywatersolutions.com> --- Created attachment 193319 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193319&action=edit Bug 30144: Update DBIC schema Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #18 from Kyle M Hall (khall) <kyle@bywatersolutions.com> --- Created attachment 193320 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193320&action=edit Bug 30144: Process and send servicing instructions in EDI messages This patch updates the EDIFACT processing to handle multiple servicing instruction groups in both incoming quotes and outgoing orders. Changes to Koha/EDI.pm (quote_item): - Reads both LVC (coded) and LVT (freetext) instructions from incoming quotes - Validates LVC codes against EDIFACT_SI authorized values - Stores instructions as JSON array structure - Groups instructions that work together Changes to Koha/Edifact/Order.pm (gir_segments): - Parses JSON servicing instruction data from order - Generates multiple GIR segments for outgoing orders - Each instruction becomes a separate GIR element - Logs JSON parse errors to EDI log using Koha::Logger - Fixed element counter reset bug when segments exceed 5 elements Structure allows vendors to specify: - Single coded instruction: [[{type:"LVC",value:"BB"}]] - Single text instruction: [[{type:"LVT",value:"Handle with care"}]] - Combined instructions: [[{type:"LVC",value:"BB"},{type:"LVT",value:"Apply on spine"}]] - Multiple services: [[{type:"LVC",value:"BB"}],[{type:"LVC",value:"BI"}]] Test plan: 1. Receive EDIFACT quote with servicing instructions 2. Verify instructions are stored correctly in aqorders 3. Create EDI order from basket 4. Verify GIR segments are generated correctly in outgoing message 5. Check EDI log for any JSON parse errors Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #19 from Kyle M Hall (khall) <kyle@bywatersolutions.com> --- Created attachment 193321 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193321&action=edit Bug 30144: Add UI for servicing instructions This patch adds the user interface for managing and displaying EDIFACT servicing instructions in the acquisitions module. Changes to acqui/neworderempty.pl: - Parses servicing_instruction JSON for editing existing orders - Fetches EDIFACT_SI authorized values for dropdown - Passes data to template in both array and JSON formats Changes to acqui/addorder.pl: - Accepts servicing_instruction_groups_json from form submission - Validates and stores JSON in database Changes to acqui/basket.pl: - Fetches EDIFACT_SI authorized values - Formats servicing instructions for display in get_order_infos() - Creates human-readable display strings with: * LVC codes replaced with descriptions * Groups separated by <br> tags * Format: "Description" or "Description: free text" Changes to neworderempty.tt: - Dynamic UI for adding/removing servicing instruction groups - Each group can contain: * One LVC (coded) instruction only, OR * One LVT (free-text) instruction only, OR * One LVC + one LVT combination - Validation prevents: * More than 2 instructions per group * Duplicate LVC or LVT in same group - LVC instructions use dropdown populated from EDIFACT_SI authorized values - LVT instructions use free-text input - Groups serialized to JSON hidden field for form submission - Smart button labels show what can be added to each group Changes to basket.tt: - Displays servicing instructions in basket table - Pre-formatted in Perl (no JavaScript parsing needed) - Shows LVC descriptions instead of codes - Multiple groups displayed on separate lines Changes to columns_settings.yml: - Adds servicing_instruction column to basket table configuration Display format examples: - LVC only: "Barcode labelling" - LVT only: "Handle with care" - Combined: "Binding: Apply to spine" - Multiple groups (on separate lines): Barcode labelling Binding: Special instructions Test plan: 1. Create/edit order 2. Add servicing instruction groups 3. Try to add more than 2 instructions to a group (should prevent) 4. Try to add duplicate LVC or LVT to group (should prevent) 5. Save order 6. View basket and verify instructions display correctly 7. Edit order and verify instructions load into form Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #20 from Kyle M Hall (khall) <kyle@bywatersolutions.com> --- Created attachment 193322 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193322&action=edit Bug 30144: Add unit tests for servicing instructions This patch adds comprehensive unit tests for the servicing instruction functionality in t/db_dependent/Koha/Edifact/Order.t. Changes: - Updated test count from 6 to 7 - Added servicing_instruction => undef to test orders to prevent TestBuilder from generating random invalid JSON - Added servicing instruction subtest with 18 tests covering: * Single LVC instruction * Single LVT instruction * Multiple LVC in one group (tests GIR segment overflow) * Mixed LVC/LVT in one group * Multiple groups * Empty servicing instruction * Invalid JSON handling (logged to EDI log) - Tests correctly handle GIR segment 5-element limit and overflow to additional segments Test plan: 1. Run: prove t/db_dependent/Koha/Edifact/Order.t 2. Verify all tests pass Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #21 from Kyle M Hall (khall) <kyle@bywatersolutions.com> --- Created attachment 193323 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193323&action=edit Bug 30144: Add tests for EDIFACT servicing instruction handling This commit adds comprehensive tests for servicing instruction processing in both incoming quotes and outgoing orders: 1. Integration tests for incoming quote processing (Koha/EDI.pm) - Tests LVC (coded) and LVT (freetext) extraction - Tests multiple GIR occurrences with different servicing instructions - Tests all combinations: LVC only, LVT only, and LVC+LVT together 2. Test EDIFACT quote file (QUOTES_SERVICING.CEQ) - Contains 3 line items with 4 total orders - Demonstrates different servicing instruction patterns 3. Fix for multi-occurrence servicing instruction extraction - Modified quote_item() to extract servicing instructions per GIR occurrence instead of across all occurrences - Ensures each order gets only its own servicing instructions - Aligns with existing multi-item processing for funds and stock rotation Test coverage: - t/db_dependent/Koha/EDI.t: 29 tests for incoming quote processing - t/db_dependent/Koha/Edifact/Order.t: 18 tests for outgoing order generation (previously added) All tests pass successfully. Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #22 from Kyle M Hall (khall) <kyle@bywatersolutions.com> --- Created attachment 193324 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=193324&action=edit Bug 30144: (QA follow-up) Add EDIFACT_SI authorised values to installer data Tests were failing on upgrade route because they tried to create EDIFACT_SI authorised values that already existed from the atomicupdate script, causing unique constraint violations. This patch: - Removes test code that created EDIFACT_SI values (tests should assume database defaults exist) - Adds EDIFACT_SI category to auth_val_cat.sql for fresh installs - Adds all 32 EDItEUR List 3B servicing instruction codes to auth_values.yml for fresh installs Now the authorised values exist in both installation paths: - Upgrade route: Created by atomicupdate script - Fresh install: Created by installer SQL/YAML files Test plan: 1. prove t/db_dependent/Koha/EDI.t 2. prove t/db_dependent/Koha/Edifact/Order.t 3. Verify both tests pass without warnings Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Kyle M Hall (khall) <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Kyle M Hall (khall) <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|kyle@bywatersolutions.com |testopia@bugs.koha-communit | |y.org -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|--- |26.11 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Initiative type|--- |Feature -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |kyle@bywatersolutions.com |y.org | Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #193318|0 |1 is obsolete| | Attachment #193319|0 |1 is obsolete| | Attachment #193320|0 |1 is obsolete| | Attachment #193321|0 |1 is obsolete| | Attachment #193322|0 |1 is obsolete| | Attachment #193323|0 |1 is obsolete| | Attachment #193324|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #23 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 200825 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200825&action=edit Bug 30144: Add servicing_instruction field to aqorders table This patch adds a new TEXT field 'servicing_instruction' to the aqorders table to store EDIFACT servicing instructions (GIR LVT/LVC segments) as JSON. The field stores an array of instruction groups, where each group is an array of instruction objects with 'type' (LVC or LVT) and 'value' fields. Structure: [[{type:"LVC",value:"BB"},{type:"LVT",value:"text"}],[...]] This allows for: - Multiple servicing instruction groups per order line - Combinations of coded (LVC) and free-text (LVT) instructions - Instructions that work together in groups Also adds EDIFACT_SI authorized value category with EDItEUR List 3B servicing instruction codes for coded (LVC) instructions. Test plan: 1. Run database update 2. Verify aqorders.servicing_instruction field exists 3. Verify EDIFACT_SI authorized value category is created 4. Verify authorized values include codes like BB, BI, etc. Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #24 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 200826 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200826&action=edit Bug 30144: Update DBIC schema Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #25 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 200827 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200827&action=edit Bug 30144: Process and send servicing instructions in EDI messages This patch updates the EDIFACT processing to handle multiple servicing instruction groups in both incoming quotes and outgoing orders. Changes to Koha/EDI.pm (quote_item): - Reads both LVC (coded) and LVT (freetext) instructions from incoming quotes - Validates LVC codes against EDIFACT_SI authorized values - Stores instructions as JSON array structure - Groups instructions that work together Changes to Koha/Edifact/Order.pm (gir_segments): - Parses JSON servicing instruction data from order - Generates multiple GIR segments for outgoing orders - Each instruction becomes a separate GIR element - Logs JSON parse errors to EDI log using Koha::Logger - Fixed element counter reset bug when segments exceed 5 elements Structure allows vendors to specify: - Single coded instruction: [[{type:"LVC",value:"BB"}]] - Single text instruction: [[{type:"LVT",value:"Handle with care"}]] - Combined instructions: [[{type:"LVC",value:"BB"},{type:"LVT",value:"Apply on spine"}]] - Multiple services: [[{type:"LVC",value:"BB"}],[{type:"LVC",value:"BI"}]] Test plan: 1. Receive EDIFACT quote with servicing instructions 2. Verify instructions are stored correctly in aqorders 3. Create EDI order from basket 4. Verify GIR segments are generated correctly in outgoing message 5. Check EDI log for any JSON parse errors Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #26 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 200828 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200828&action=edit Bug 30144: Add UI for servicing instructions This patch adds the user interface for managing and displaying EDIFACT servicing instructions in the acquisitions module. Changes to acqui/neworderempty.pl: - Parses servicing_instruction JSON for editing existing orders - Fetches EDIFACT_SI authorized values for dropdown - Passes data to template in both array and JSON formats Changes to acqui/addorder.pl: - Accepts servicing_instruction_groups_json from form submission - Validates and stores JSON in database Changes to acqui/basket.pl: - Fetches EDIFACT_SI authorized values - Formats servicing instructions for display in get_order_infos() - Creates human-readable display strings with: * LVC codes replaced with descriptions * Groups separated by <br> tags * Format: "Description" or "Description: free text" Changes to neworderempty.tt: - Dynamic UI for adding/removing servicing instruction groups - Each group can contain: * One LVC (coded) instruction only, OR * One LVT (free-text) instruction only, OR * One LVC + one LVT combination - Validation prevents: * More than 2 instructions per group * Duplicate LVC or LVT in same group - LVC instructions use dropdown populated from EDIFACT_SI authorized values - LVT instructions use free-text input - Groups serialized to JSON hidden field for form submission - Smart button labels show what can be added to each group Changes to basket.tt: - Displays servicing instructions in basket table - Pre-formatted in Perl (no JavaScript parsing needed) - Shows LVC descriptions instead of codes - Multiple groups displayed on separate lines Changes to columns_settings.yml: - Adds servicing_instruction column to basket table configuration Display format examples: - LVC only: "Barcode labelling" - LVT only: "Handle with care" - Combined: "Binding: Apply to spine" - Multiple groups (on separate lines): Barcode labelling Binding: Special instructions Test plan: 1. Create/edit order 2. Add servicing instruction groups 3. Try to add more than 2 instructions to a group (should prevent) 4. Try to add duplicate LVC or LVT to group (should prevent) 5. Save order 6. View basket and verify instructions display correctly 7. Edit order and verify instructions load into form Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #27 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 200829 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200829&action=edit Bug 30144: Add unit tests for servicing instructions This patch adds comprehensive unit tests for the servicing instruction functionality in t/db_dependent/Koha/Edifact/Order.t. Changes: - Updated test count from 6 to 7 - Added servicing_instruction => undef to test orders to prevent TestBuilder from generating random invalid JSON - Added servicing instruction subtest with 18 tests covering: * Single LVC instruction * Single LVT instruction * Multiple LVC in one group (tests GIR segment overflow) * Mixed LVC/LVT in one group * Multiple groups * Empty servicing instruction * Invalid JSON handling (logged to EDI log) - Tests correctly handle GIR segment 5-element limit and overflow to additional segments Test plan: 1. Run: prove t/db_dependent/Koha/Edifact/Order.t 2. Verify all tests pass Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #28 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 200830 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200830&action=edit Bug 30144: Add tests for EDIFACT servicing instruction handling This commit adds comprehensive tests for servicing instruction processing in both incoming quotes and outgoing orders: 1. Integration tests for incoming quote processing (Koha/EDI.pm) - Tests LVC (coded) and LVT (freetext) extraction - Tests multiple GIR occurrences with different servicing instructions - Tests all combinations: LVC only, LVT only, and LVC+LVT together 2. Test EDIFACT quote file (QUOTES_SERVICING.CEQ) - Contains 3 line items with 4 total orders - Demonstrates different servicing instruction patterns 3. Fix for multi-occurrence servicing instruction extraction - Modified quote_item() to extract servicing instructions per GIR occurrence instead of across all occurrences - Ensures each order gets only its own servicing instructions - Aligns with existing multi-item processing for funds and stock rotation Test coverage: - t/db_dependent/Koha/EDI.t: 29 tests for incoming quote processing - t/db_dependent/Koha/Edifact/Order.t: 18 tests for outgoing order generation (previously added) All tests pass successfully. Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #29 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 200831 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=200831&action=edit Bug 30144: (QA follow-up) Add EDIFACT_SI authorised values to installer data Tests were failing on upgrade route because they tried to create EDIFACT_SI authorised values that already existed from the atomicupdate script, causing unique constraint violations. This patch: - Removes test code that created EDIFACT_SI values (tests should assume database defaults exist) - Adds EDIFACT_SI category to auth_val_cat.sql for fresh installs - Adds all 32 EDItEUR List 3B servicing instruction codes to auth_values.yml for fresh installs Now the authorised values exist in both installation paths: - Upgrade route: Created by atomicupdate script - Fresh install: Created by installer SQL/YAML files Test plan: 1. prove t/db_dependent/Koha/EDI.t 2. prove t/db_dependent/Koha/Edifact/Order.t 3. Verify both tests pass without warnings Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Pedro Amorim (ammopt) <pedro.amorim@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply CC| |pedro.amorim@openfifth.co.u | |k -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |41709 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41709 [Bug 41709] GIR segment data should be encoded in EDI ORDERs -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |41604 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41604 [Bug 41604] Impossible to hide Checkin column in issues-table in circ/circulation.pl -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #30 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Added dependencies on the bugs that were pushed before this causing new conflicts (for RMaints reference) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #200825|0 |1 is obsolete| | Attachment #200826|0 |1 is obsolete| | Attachment #200827|0 |1 is obsolete| | Attachment #200828|0 |1 is obsolete| | Attachment #200829|0 |1 is obsolete| | Attachment #200830|0 |1 is obsolete| | Attachment #200831|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #31 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 202897 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202897&action=edit Bug 30144: Add servicing_instruction field to aqorders table This patch adds a new TEXT field 'servicing_instruction' to the aqorders table to store EDIFACT servicing instructions (GIR LVT/LVC segments) as JSON. The field stores an array of instruction groups, where each group is an array of instruction objects with 'type' (LVC or LVT) and 'value' fields. Structure: [[{type:"LVC",value:"BB"},{type:"LVT",value:"text"}],[...]] This allows for: - Multiple servicing instruction groups per order line - Combinations of coded (LVC) and free-text (LVT) instructions - Instructions that work together in groups Also adds EDIFACT_SI authorized value category with EDItEUR List 3B servicing instruction codes for coded (LVC) instructions. Test plan: 1. Run database update 2. Verify aqorders.servicing_instruction field exists 3. Verify EDIFACT_SI authorized value category is created 4. Verify authorized values include codes like BB, BI, etc. Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #32 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 202898 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202898&action=edit Bug 30144: Update DBIC schema Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #33 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 202899 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202899&action=edit Bug 30144: Process and send servicing instructions in EDI messages This patch updates the EDIFACT processing to handle multiple servicing instruction groups in both incoming quotes and outgoing orders. Changes to Koha/EDI.pm (quote_item): - Reads both LVC (coded) and LVT (freetext) instructions from incoming quotes - Validates LVC codes against EDIFACT_SI authorized values - Stores instructions as JSON array structure - Groups instructions that work together Changes to Koha/Edifact/Order.pm (gir_segments): - Parses JSON servicing instruction data from order - Generates multiple GIR segments for outgoing orders - Each instruction becomes a separate GIR element - Logs JSON parse errors to EDI log using Koha::Logger - Fixed element counter reset bug when segments exceed 5 elements Structure allows vendors to specify: - Single coded instruction: [[{type:"LVC",value:"BB"}]] - Single text instruction: [[{type:"LVT",value:"Handle with care"}]] - Combined instructions: [[{type:"LVC",value:"BB"},{type:"LVT",value:"Apply on spine"}]] - Multiple services: [[{type:"LVC",value:"BB"}],[{type:"LVC",value:"BI"}]] Test plan: 1. Receive EDIFACT quote with servicing instructions 2. Verify instructions are stored correctly in aqorders 3. Create EDI order from basket 4. Verify GIR segments are generated correctly in outgoing message 5. Check EDI log for any JSON parse errors Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #34 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 202900 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202900&action=edit Bug 30144: Add UI for servicing instructions This patch adds the user interface for managing and displaying EDIFACT servicing instructions in the acquisitions module. Changes to acqui/neworderempty.pl: - Parses servicing_instruction JSON for editing existing orders - Fetches EDIFACT_SI authorized values for dropdown - Passes data to template in both array and JSON formats Changes to acqui/addorder.pl: - Accepts servicing_instruction_groups_json from form submission - Validates and stores JSON in database Changes to acqui/basket.pl: - Fetches EDIFACT_SI authorized values - Formats servicing instructions for display in get_order_infos() - Creates human-readable display strings with: * LVC codes replaced with descriptions * Groups separated by <br> tags * Format: "Description" or "Description: free text" Changes to neworderempty.tt: - Dynamic UI for adding/removing servicing instruction groups - Each group can contain: * One LVC (coded) instruction only, OR * One LVT (free-text) instruction only, OR * One LVC + one LVT combination - Validation prevents: * More than 2 instructions per group * Duplicate LVC or LVT in same group - LVC instructions use dropdown populated from EDIFACT_SI authorized values - LVT instructions use free-text input - Groups serialized to JSON hidden field for form submission - Smart button labels show what can be added to each group Changes to basket.tt: - Displays servicing instructions in basket table - Pre-formatted in Perl (no JavaScript parsing needed) - Shows LVC descriptions instead of codes - Multiple groups displayed on separate lines Changes to columns_settings.yml: - Adds servicing_instruction column to basket table configuration Display format examples: - LVC only: "Barcode labelling" - LVT only: "Handle with care" - Combined: "Binding: Apply to spine" - Multiple groups (on separate lines): Barcode labelling Binding: Special instructions Test plan: 1. Create/edit order 2. Add servicing instruction groups 3. Try to add more than 2 instructions to a group (should prevent) 4. Try to add duplicate LVC or LVT to group (should prevent) 5. Save order 6. View basket and verify instructions display correctly 7. Edit order and verify instructions load into form Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #35 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 202901 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202901&action=edit Bug 30144: Add unit tests for servicing instructions This patch adds comprehensive unit tests for the servicing instruction functionality in t/db_dependent/Koha/Edifact/Order.t. Changes: - Updated test count from 6 to 7 - Added servicing_instruction => undef to test orders to prevent TestBuilder from generating random invalid JSON - Added servicing instruction subtest with 18 tests covering: * Single LVC instruction * Single LVT instruction * Multiple LVC in one group (tests GIR segment overflow) * Mixed LVC/LVT in one group * Multiple groups * Empty servicing instruction * Invalid JSON handling (logged to EDI log) - Tests correctly handle GIR segment 5-element limit and overflow to additional segments Test plan: 1. Run: prove t/db_dependent/Koha/Edifact/Order.t 2. Verify all tests pass Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #36 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 202902 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202902&action=edit Bug 30144: Add tests for EDIFACT servicing instruction handling This commit adds comprehensive tests for servicing instruction processing in both incoming quotes and outgoing orders: 1. Integration tests for incoming quote processing (Koha/EDI.pm) - Tests LVC (coded) and LVT (freetext) extraction - Tests multiple GIR occurrences with different servicing instructions - Tests all combinations: LVC only, LVT only, and LVC+LVT together 2. Test EDIFACT quote file (QUOTES_SERVICING.CEQ) - Contains 3 line items with 4 total orders - Demonstrates different servicing instruction patterns 3. Fix for multi-occurrence servicing instruction extraction - Modified quote_item() to extract servicing instructions per GIR occurrence instead of across all occurrences - Ensures each order gets only its own servicing instructions - Aligns with existing multi-item processing for funds and stock rotation Test coverage: - t/db_dependent/Koha/EDI.t: 29 tests for incoming quote processing - t/db_dependent/Koha/Edifact/Order.t: 18 tests for outgoing order generation (previously added) All tests pass successfully. Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #37 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Created attachment 202903 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=202903&action=edit Bug 30144: (QA follow-up) Add EDIFACT_SI authorised values to installer data Tests were failing on upgrade route because they tried to create EDIFACT_SI authorised values that already existed from the atomicupdate script, causing unique constraint violations. This patch: - Removes test code that created EDIFACT_SI values (tests should assume database defaults exist) - Adds EDIFACT_SI category to auth_val_cat.sql for fresh installs - Adds all 32 EDItEUR List 3B servicing instruction codes to auth_values.yml for fresh installs Now the authorised values exist in both installation paths: - Upgrade route: Created by atomicupdate script - Fresh install: Created by installer SQL/YAML files Test plan: 1. prove t/db_dependent/Koha/EDI.t 2. prove t/db_dependent/Koha/Edifact/Order.t 3. Verify both tests pass without warnings Sponsored-by: Martin Renvoize <martin.renvoize@gmail.com> Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 --- Comment #38 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Rebased and ready to go. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30144 Pedro Amorim (ammopt) <pedro.amorim@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Failed QA --- Comment #39 from Pedro Amorim (ammopt) <pedro.amorim@openfifth.co.uk> --- Stored XSS in neworderempty.tt. To reproduce: 1. Go to ktd's only vendor: <staff_url>/cgi-bin/koha/acquisition/vendors/1 2. Click "New" -> "Basket", give it a name, and save. 3. On the basket page, click "Add to basket" -> "From a new (empty) record". 4. Fill in the minimum required fields (title, quantity, fund/budget, price). Don't forget to click 'Add item'. 5. In the "Servicing instructions" section, add a group with an LVT (free-text) instruction. Enter the following: test' + alert(1) + ' 6. Save the order line. 7. Back on the basket page, click "Modify" on that order line to reopen the edit form. 8. Note that the JavaScript alert fires on page load. 9. Entering plain text with an apostrophe is enough to break the page also, e.g. "Don't break". Check the browser console for a JS syntax error. Bonus: 10. Repeat steps 1-4, but for the LVT free-text instruction enter: <script>alert(1)</script> (or <img src=x onerror=alert(1)> if script tags get stripped/ignored by the browser in that context) 11. Save the order line: no need to click Modify, the alert fires right there on the basket page itself. -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org