diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1245ede8..35dea1dd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -176,7 +176,7 @@ jobs: release-version: ${{ steps.myvars.outputs.tag_version }} release-name: ${{ steps.myvars.outputs.github_repo }} minimum-version: ${{ steps.koha-version-oldstable.outputs.version-major-minor }} - plugin-module: "Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced.pm" + plugin-module: "Koha/Plugin/Com/ByWaterSolutions/EdifactLSC.pm" - name: See if kpz was created run: | diff --git a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced.pm b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC.pm similarity index 98% rename from Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced.pm rename to Koha/Plugin/Com/ByWaterSolutions/EdifactLSC.pm index 1f2ae818..e284c2cf 100755 --- a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced.pm +++ b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC.pm @@ -1,4 +1,4 @@ -package Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced; +package Koha::Plugin::Com::ByWaterSolutions::EdifactLSC; ## It's good practive to use Modern::Perl use Modern::Perl; @@ -28,9 +28,9 @@ our $VERSION = "{VERSION}"; ## Here is our metadata, some keys are required, some are optional our $metadata = { - name => 'Edifact - Enhanced', + name => 'Edifact - LSC', author => 'Kyle M Hall', - description => 'Edifact Enhanced plugin', + description => 'Edifact Enhanced plugin customized for LSC', date_authored => '2015-12-21', date_updated => '1900-01-01', minimum_version => '22.05.06', @@ -60,30 +60,30 @@ sub new { sub edifact { my ( $self, $args ) = @_; - require Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact; + require Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact; - my $edifact = Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact->new($args); + my $edifact = Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact->new($args); return $edifact; } sub edifact_order { my ( $self, $args ) = @_; - require Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact::Order; + require Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact::Order; $args->{params}->{plugin} = $self; - my $edifact_order = Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact::Order->new( $args->{params} ); + my $edifact_order = Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact::Order->new( $args->{params} ); return $edifact_order; } sub edifact_transport { my ( $self, $args ) = @_; - require Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact::Transport; + require Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact::Transport; $args->{params}->{plugin} = $self; - my $edifact_transport = Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact::Transport->new( $args->{vendor_edi_account_id}, $self ); + my $edifact_transport = Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact::Transport->new( $args->{vendor_edi_account_id}, $self ); return $edifact_transport; } diff --git a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact.pm b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact.pm similarity index 96% rename from Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact.pm rename to Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact.pm index ad1f1526..7418afdc 100755 --- a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact.pm +++ b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact.pm @@ -1,4 +1,4 @@ -package Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact; +package Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact; # Copyright 2014 PTFS-Europe Ltd # @@ -22,8 +22,8 @@ use warnings; use File::Slurp; use Carp; use Encode qw( from_to ); -use Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact::Segment; -use Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact::Message; +use Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact::Segment; +use Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact::Message; my $separator = { component => q{\:}, @@ -174,7 +174,7 @@ sub message_array { elsif ( $seg->tag eq 'UNT' ) { $in_msg = 0; if ( @{$msg} ) { - push @{$msg_arr}, Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact::Message->new($msg); + push @{$msg_arr}, Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact::Message->new($msg); $msg = []; } } @@ -226,7 +226,7 @@ sub segmentize { }x; my @segmented; while ( $raw =~ /($re)/g ) { - push @segmented, Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact::Segment->new( { seg_string => $1 } ); + push @segmented, Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact::Segment->new( { seg_string => $1 } ); } return \@segmented; } diff --git a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact/Message.pm b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact/Message.pm similarity index 98% rename from Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact/Message.pm rename to Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact/Message.pm index 9886e154..a1fed89b 100644 --- a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact/Message.pm +++ b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact/Message.pm @@ -1,4 +1,4 @@ -package Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact::Message; +package Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact::Message; # Copyright 2014 PTFS-Europe Ltd # diff --git a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact/Order.pm b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact/Order.pm similarity index 99% rename from Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact/Order.pm rename to Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact/Order.pm index 050f56e9..4a08b262 100755 --- a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact/Order.pm +++ b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact/Order.pm @@ -1,4 +1,4 @@ -package Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact::Order; +package Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact::Order; use Modern::Perl; use utf8; @@ -140,7 +140,7 @@ sub interchange_header { my $hdr = 'UNB+UNOC:3'; # controling agency character set syntax version number # Interchange Sender - + # If plugin is set to send Buyer SAN in header *and* the vendor username as buyer SAN is set, send that # If plugin is set to send Buyer SAN in header *and* the buyer sand should come from the library ean description if ( $self->{plugin}->retrieve_data('buyer_san_in_header') && $self->{plugin}->retrieve_data('buyer_san_extract_from_library_ean_description') ) { @@ -320,7 +320,7 @@ sub order_msg_header { push @header, name_and_address( 'BUYER', - $self->{sender}->ean, + $self->{sender}->ean, $self->{sender}->id_code_qualifier, ); } diff --git a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact/Segment.pm b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact/Segment.pm similarity index 98% rename from Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact/Segment.pm rename to Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact/Segment.pm index 2a5aae4c..874b4d4a 100644 --- a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact/Segment.pm +++ b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact/Segment.pm @@ -1,4 +1,4 @@ -package Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact::Segment; +package Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact::Segment; # Copyright 2014 PTFS-Europe Ltd # diff --git a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact/Transport.pm b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact/Transport.pm similarity index 99% rename from Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact/Transport.pm rename to Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact/Transport.pm index 96b878f6..25ed36e2 100644 --- a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/Edifact/Transport.pm +++ b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/Edifact/Transport.pm @@ -1,4 +1,4 @@ -package Koha::Plugin::Com::ByWaterSolutions::EdifactEnhanced::Edifact::Transport; +package Koha::Plugin::Com::ByWaterSolutions::EdifactLSC::Edifact::Transport; # Copyright 2014 PTFS-Europe Ltd # diff --git a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/configure.tt b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/configure.tt similarity index 95% rename from Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/configure.tt rename to Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/configure.tt index 6a35ef6d..2c818760 100755 --- a/Koha/Plugin/Com/ByWaterSolutions/EdifactEnhanced/configure.tt +++ b/Koha/Plugin/Com/ByWaterSolutions/EdifactLSC/configure.tt @@ -6,7 +6,7 @@ - - - - -
- - -