diff --git a/wiaflos/client/cmdline/Statements.pm b/wiaflos/client/cmdline/Statements.pm index 4fc44d643d01cc73c0c4b61a4dbbaae0159056da..01954a0d914ebe7f5de3888335c7a99a783b4dda 100644 --- a/wiaflos/client/cmdline/Statements.pm +++ b/wiaflos/client/cmdline/Statements.pm @@ -1,5 +1,5 @@ # Statement functions -# Copyright (C) 2009-2014, AllWorldIT +# Copyright (C) 2009-2020, AllWorldIT # Copyright (C) 2008, LinuxRulz # Copyright (C) 2007 Nigel Kukard # @@ -51,14 +51,14 @@ our $pluginInfo = { MenuItem => "Show", Regex => "show", Desc => "Display statement", - Help => 'show client="" [start=""]', + Help => 'show client="" [start=""] [end="yyyy-mm-dd"]', Function => \&show, }, { MenuItem => "Send", Regex => "send", Desc => "Send statement", - Help => 'send client="" start="" [subject=""] sendto=""', + Help => 'send client="" [start=""] [end="yyyy-mm-dd"] [subject=""] sendto=""', Function => \&send, }, ], @@ -86,6 +86,7 @@ sub show my $detail; $detail->{'ClientCode'} = $parms->{'client'}; $detail->{'StartDate'} = $parms->{'start'}; + $detail->{'EndDate'} = $parms->{'end'}; my $res = soapCall($OUT,"wiaflos/server/api/Statements","getStatement",$detail); if ($res->{'Result'} == RES_OK) { @@ -136,6 +137,7 @@ sub send my $detail; $detail->{'ClientCode'} = $parms->{'client'}; $detail->{'StartDate'} = $parms->{'start'}; + $detail->{'EndDate'} = $parms->{'end'}; $detail->{'SendTo'} = $parms->{'sendto'}; $detail->{'Subject'} = $parms->{'subject'}; my $res = soapCall($OUT,"wiaflos/server/api/Statements","sendStatement",$detail); diff --git a/wiaflos/server/api/Statements.pm b/wiaflos/server/api/Statements.pm index 41f6bc9d8a0ab563230a537342b5b58c11d4ea6f..3229fb0986503e3f2340a3aeff0d33494ca921a2 100644 --- a/wiaflos/server/api/Statements.pm +++ b/wiaflos/server/api/Statements.pm @@ -1,5 +1,5 @@ # SOAP interface to Statements module -# Copyright (C) 2009-2014, AllWorldIT +# Copyright (C) 2009-2020, AllWorldIT # Copyright (C) 2008, LinuxRulz # Copyright (C) 2007 Nigel Kukard # @@ -53,6 +53,7 @@ sub init { # Parameters: # ClientCode - Client code # StartDate - Start date +# EndDate - End date sub getStatement { my (undef,$data) = @_; @@ -67,6 +68,7 @@ sub getStatement { my $detail; $detail->{'ClientCode'} = $data->{'ClientCode'}; $detail->{'StartDate'} = $data->{'StartDate'}; + $detail->{'EndDate'} = $data->{'EndDate'}; my $rawData = wiaflos::server::core::Statements::getStatement($detail); if (ref $rawData ne "ARRAY") { return SOAPResponse(RES_ERROR,$rawData,wiaflos::server::core::Statements::Error()); @@ -97,6 +99,7 @@ sub getStatement { # SendTo - Send statement to here # Optional: # StartDate - Start date +# EndDate - End date # Subject - Statement subject sub sendStatement { my (undef,$data) = @_; @@ -118,6 +121,7 @@ sub sendStatement { $detail->{'ClientCode'} = $data->{'ClientCode'}; $detail->{'SendTo'} = $data->{'SendTo'}; $detail->{'StartDate'} = $data->{'StartDate'}; + $detail->{'EndDate'} = $data->{'EndDate'}; $detail->{'Subject'} = $data->{'Subject'}; my $res = wiaflos::server::core::Statements::sendStatement($detail); diff --git a/wiaflos/server/core/Statements.pm b/wiaflos/server/core/Statements.pm index 05eeea58e099e408c8af35969184e6ce4bcb4414..aafc4c1ef267e198ecdc0b3e9b8dc3859bc5dee2 100644 --- a/wiaflos/server/core/Statements.pm +++ b/wiaflos/server/core/Statements.pm @@ -1,5 +1,5 @@ # Statement functions -# Copyright (C) 2009-2014, AllWorldIT +# Copyright (C) 2009-2020, AllWorldIT # Copyright (C) 2008, LinuxRulz # Copyright (C) 2007 Nigel Kukard # @@ -138,6 +138,7 @@ sub getStatement # Parameters: # ClientCode - Client code # StartDate - Start date +# EndDate - End date # SendTo - Send to, email: , file: , return # Optional: # Subject - Subject of the statement @@ -156,6 +157,7 @@ sub sendStatement my $data; $data->{'ClientCode'} = $detail->{'ClientCode'}; $data->{'StartDate'} = $detail->{'StartDate'}; + $data->{'EndDate'} = $detail->{'EndDate'}; my $entries = getStatement($data); if (ref $entries ne "ARRAY") { setError(Error());