Attachment 107164 Details for Bug 24665 – Bug 24665: Add support for filtering by cash register

[patch] Bug 24665: Add support for filtering by cash register

Bug-24665-Add-support-for-filtering-by-cash-regist.patch (text/plain), 4.26 KB, created by ByWater Sandboxes on 2020-07-21 16:17:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ByWater Sandboxes

Created: 2020-07-21 16:17:49 UTC

Size: 4.26 KB

patch

obsolete

>From ee3c31687b498a0396ce3381319c48aa0bd7b970 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Tue, 21 Jul 2020 14:54:09 +0100
>Subject: [PATCH] Bug 24665: Add support for filtering by cash register
>
>Signed-off-by: Kelly McElligott <kelly@bywatersolutions.com>
>---
> Koha/Template/Plugin/Registers.pm                          | 11 +++++++++--
> .../prog/en/modules/reports/cash_register_stats.tt         | 14 ++++++++++++--
> reports/cash_register_stats.pl                             |  9 +++++++++
> 3 files changed, 30 insertions(+), 4 deletions(-)
>
>diff --git a/Koha/Template/Plugin/Registers.pm b/Koha/Template/Plugin/Registers.pm
>index b2952fc57c..c7d6d521a8 100644
>--- a/Koha/Template/Plugin/Registers.pm
>+++ b/Koha/Template/Plugin/Registers.pm
>@@ -58,9 +58,16 @@ sub all {
>     $where->{branch} = C4::Context->userenv->{'branch'}
>       if $filters->{current_branch};
>     my $registers = Koha::Cash::Registers->search($where)->unblessed();
>+
>+    my $selected = $params->{selected};
>     for my $register ( @{$registers} ) {
>-        $register->{selected} = ( defined( $self->session_register )
>-              && $register->{id} == $self->session_register ) ? 1 : 0;
>+        if ( defined($selected) ) {
>+            $register->{selected} = ( $register->{id} == $selected ) ? 1 : 0;
>+        }
>+        else {
>+            $register->{selected} = ( defined( $self->session_register )
>+                  && $register->{id} == $self->session_register ) ? 1 : 0;
>+        }
>     }
> 
>     return $registers;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>index cbcc27a056..bc0dd7e9b9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>@@ -1,8 +1,11 @@
> [% USE raw %]
> [% USE Asset %]
>+[% USE Branches %]
>+[% USE Koha %]
> [% USE KohaDates %]
> [% USE Price %]
> [% USE ItemTypes %]
>+[% USE Registers %]
> [% SET footerjs = 1 %]
> [% PROCESS 'accounts.inc' %]
> [% INCLUDE 'doc-head-open.inc' %]
>@@ -96,9 +99,15 @@
>                             [% END %]
>                         [% END %]
>                     </select>
>-             </td>
>-        </tr>
>                 </li>
>+                [% IF Koha.Preference('UseCashRegisters') %]
>+                <li>
>+                    <label for="registerid">Cash register: </label>
>+                    <select name="registerid" id="registerid">
>+                        [% PROCESS options_for_registers registers => Registers.all( selected => registerid ) %]
>+                    </select>
>+                </li>
>+                [% END %]
>             </ol>
>         </fieldset>
> 
>@@ -186,6 +195,7 @@
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>+    [% Asset.js("js/register_selection.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>     <script id="js">
>         $(document).ready(function() {
>diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl
>index 98390ac52d..0b4f2cf684 100755
>--- a/reports/cash_register_stats.pl
>+++ b/reports/cash_register_stats.pl
>@@ -62,6 +62,7 @@ my @debit_types =
>   Koha::Account::DebitTypes->search()->as_list;
> my @credit_types =
>   Koha::Account::CreditTypes->search()->as_list;
>+my $registerid;
> 
> if ($do_it) {
> 
>@@ -95,6 +96,12 @@ if ($do_it) {
>         push @extra_params, $manager_branchcode;
>     }
> 
>+    my $whereRegister = q{};
>+    $registerid = $input->param("registerid");
>+    if ($registerid) {
>+        $whereRegister = q{ AND al.register_id = ?};
>+        push @extra_params, $registerid;
>+    }
> 
>     my $query = "
>     SELECT round(amount,2) AS amount, description,
>@@ -111,6 +118,7 @@ if ($do_it) {
>         WHERE CAST(al.date AS DATE) BETWEEN ? AND ?
>         $whereTType
>         $whereBranchCode
>+        $whereRegister
>         ORDER BY al.date
>     ";
>     my $sth_stats = $dbh->prepare($query) or die "Unable to prepare query " . $dbh->errstr;
>@@ -192,6 +200,7 @@ $template->param(
>     branchloop       => Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed,
>     debit_types      => \@debit_types,
>     credit_types     => \@credit_types,
>+    registerid       => $registerid,
>     CGIsepChoice => GetDelimiterChoices,
> );
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24665: 107150 | 107164 | 112901 | 112960 | 113247 | 113248 | 113261