Bugzilla – Attachment 116157 Details for
Bug 27583
Clarify how cash management fits together
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 27583: Proposed terminology changes
Bug-27583-Proposed-terminology-changes.patch (text/plain), 5.87 KB, created by
Martin Renvoize (ashimema)
on 2021-02-01 13:27:28 UTC
(
hide
)
Description:
Bug 27583: Proposed terminology changes
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2021-02-01 13:27:28 UTC
Size:
5.87 KB
patch
obsolete
>From afdbd86987ea554825a00315329da3d3e6a81b83 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Mon, 1 Feb 2021 13:14:45 +0000 >Subject: [PATCH] Bug 27583: Proposed terminology changes > >This patch impliments some terminology changes and clarifications for >the cash management system > >Test plan >1/ Apply the patches >2/ Enable 'UseCashRegisters' >3/ Navigate around the cash management system (via the Tools menu) >4/ Enable 'EnablePointOfSale' >5/ Navigate around the cash management system (via the Point of sale >module) >6/ Comment on what you think about the changes >--- > .../prog/en/includes/pos-menu.inc | 11 +++++++--- > .../prog/en/modules/pos/register.tt | 8 +++++-- > .../prog/en/modules/pos/registers.tt | 6 +++--- > .../prog/en/modules/tools/tools-home.tt | 21 ++++++++++++++----- > 4 files changed, 33 insertions(+), 13 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >index cb9998082e..3878bfa742 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >@@ -1,10 +1,15 @@ >+[% USE Branches %] >+[% USE Registers %] > <div id="navmenu"> > <div id="navmenulist"> > [% IF ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) %] >- <h5>Point of sale</h5> >+ <h5>Cash management</h5> > <ul> >- <li><a href="/cgi-bin/koha/pos/register.pl">Register details</a></li> >- <li><a href="/cgi-bin/koha/pos/registers.pl">Library details</a></li> >+ <li><a href="/cgi-bin/koha/pos/pay.pl">Point of sale</a></li> >+ [% IF !(Registers.session_register_name == '') %] >+ <li><a href="/cgi-bin/koha/pos/register.pl">Transaction history for [% Registers.session_register_name | html %]</a></li> >+ [% END %] >+ <li><a href="/cgi-bin/koha/pos/registers.pl">Cash summary for [% Branches.GetLoggedInBranchname | html %]</a></li> > </ul> > [% END %] > [% IF ( CAN_user_parameters_manage_cash_registers || CAN_user_parameters_manage_accounts) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >index 55c23fcdde..fde61fc794 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >@@ -16,7 +16,11 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'circ-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/pos/pay.pl">Point of sale</a> › Register details</div> >+<div id="breadcrumbs"> >+ <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ › <a href="/cgi-bin/koha/tools/tools-home.pl">Cash management</a> >+ › Transaction history for [% register.name | html %] >+</div> > > <div class="main container-fluid"> > <div class="row"> >@@ -54,7 +58,7 @@ > </div> > [% END %] > >- <h1>Register transaction details for [% register.name | html %]</h1> >+ <h1>Transaction history for [% register.name | html %]</h1> > > <h2>Summary</h2> > <ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt >index ebf468c4fc..f855101049 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt >@@ -15,8 +15,8 @@ > > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> >- › <a href="/cgi-bin/koha/pos/pay.pl">Point of sale</a> >- › Library details >+ › <a href="/cgi-bin/koha/tools/tools-home.pl">Cash management</a> >+ › Cash summary for [% library.branchname | html %] > </div> > > <div class="main container-fluid"> >@@ -49,7 +49,7 @@ > </div> > [% END %] > >- <h1>Library transaction details for [% library.branchname | html %]</h1> >+ <h1>Cash summary for [% library.branchname | html %]</h1> > > <h2>Summary</h2> > <ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >index c8d7f7d567..dfc3bda2af 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE Branches %] >+[% USE Registers %] > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools</title> >@@ -146,17 +148,26 @@ > <dd>Access files stored on the server, like log files or reports</dd> > [% END %] > >- [% IF ( Koha.Preference('UseCashRegisters') && CAN_user_cash_management_cashup ) %] >- <dt><a href="/cgi-bin/koha/pos/registers.pl">Cashup registers</a></dt> >- <dd>Perform cashup actions on cash registers</dd> >- [% END %] >- > [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %] > <dt><a href="/cgi-bin/koha/tools/problem-reports.pl">OPAC problem reports</a></dt> > <dd>Manage OPAC problem reports submitted by patrons</dd> > [% END %] > > </dl> >+ >+[% IF ( Koha.Preference('UseCashRegisters') && ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) ) %] >+<h3>Cash management</h3> >+<dl> >+ >+ <dt><a href="/cgi-bin/koha/pos/registers.pl">Cash summary for [% Branches.GetLoggedInBranchname | html %]</a></dt> >+ <dd>View cash takings for the current library</dd> >+ >+ <dt><a href="/cgi-bin/koha/pos/register.pl">Transaction history for [% Registers.session_register_name | html %]</a></dt> >+ <dd>View transaction history for the current cash register</dd> >+ >+</dl> >+[% END %] >+ > </div> > > <div class="col-sm-4 col-sm-pull-4"> >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 27583
:
116156
|
116157
|
118127
|
118224
|
120912
|
122690