Attachment 44354 Details for Bug 15117 – Bug 15117: Transfer Order: Better user information and translation handling

[patch] Bug 15117: Transfer Order: Better user information and translation handling

Bug-15117-Transfer-Order-Better-user-information-a.patch (text/plain), 4.06 KB, created by Marc Véron on 2015-11-04 09:37:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2015-11-04 09:37:49 UTC

Size: 4.06 KB

patch

obsolete

>From 9cdd6ce5dd97478a7e9705b39769ab3ab52c3eb8 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Wed, 4 Nov 2015 10:13:46 +0100
>Subject: [PATCH] Bug 15117: Transfer Order: Better user information and
> translation handling
>
>While transferring an order, a untranslatable JavaScript confirmation
>dialog pops up.
>
>This patch moves the information about the order to be transferred to the
>top of the screen to better inform the user what order is to be transferred,
>and simplifies the confirmation dialog.
>
>To test:
>- Apply patch
>- Transfer an order from a basket to another basket
>- Verify, that on top of the screen an information is displayed about which
>  order from which vendor and basket is to be transferred
>- Verify that the transfer works OK
>- Update a po lang file and confirm you see the string and you are able
>  to translate it.
>---
> acqui/transferorder.pl                             |    4 ++++
> .../prog/en/modules/acqui/transferorder.tt         |   21 +++++++++++++++++++-
> 2 files changed, 24 insertions(+), 1 deletion(-)
>
>diff --git a/acqui/transferorder.pl b/acqui/transferorder.pl
>index 3e8bdc8..0f58887 100755
>--- a/acqui/transferorder.pl
>+++ b/acqui/transferorder.pl
>@@ -49,8 +49,10 @@ my $op              = $input->param('op');
> my $query           = $input->param('query');
> 
> my $order = GetOrder($ordernumber);
>+my $basketfromname = '';
> if($order) {
>     my $basket = GetBasket($order->{basketno});
>+    $basketfromname = $basket->{basketname};
>     $bookselleridfrom = $basket->{booksellerid} if $basket;
> }
> 
>@@ -65,6 +67,7 @@ if($booksellerto){
>     $booksellertoname = $booksellerto->{name};
> }
> 
>+
> if( $basketno && $ordernumber) {
>     # Transfer order and exit
>     my $order = GetOrder( $ordernumber );
>@@ -132,6 +135,7 @@ $template->param(
>     booksellertoname    => $booksellertoname,
>     ordernumber         => $ordernumber,
>     basketno            => $basketno,
>+    basketfromname      => $basketfromname,
> );
> 
> output_html_with_http_headers $input, $cookie, $template->output;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
>index 0ba9a0e..261d658 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
>@@ -12,6 +12,18 @@
>     //]]>
>     </script>
> [% END %]
>+
>+[% IF ( bookselleridfrom ) %]
>+    <script type="text/javascript">
>+    //<![CDATA[
>+        function confirmtransfer() {
>+            return confirm( _("Transfer order to this basket?") );
>+        }
>+    //]]>
>+    </script>
>+[% END %]
>+
>+
> </head>
> <body id="acq_transferorder" class="acq">
> 
>@@ -20,6 +32,13 @@
>     <div class="yui-g">
>         [% IF ( bookselleridfrom ) %]
>             <h3>Search for a vendor to transfer to</h3>
>+              <div class="transferinfo">
>+                <ul>
>+                  <li><span class="label">From vendor: </span>[% booksellerfromname %]</li>
>+                  <li><span class="label">Basket: </span>[% basketfromname %]</li>
>+                  <li><span class="label">Order: </span>[% ordernumber %]</li>
>+                </ol>
>+              </div>
>         [% ELSE %]
>             <h3>Search for a vendor to transfer from</h3>
>         [% END %]
>@@ -53,7 +72,7 @@
>                             <td>[% basket.basketname %] (#[% basket.basketno %])</td>
>                             <td>[% basket.createdby %]</td>
>                             <td>[% basket.creationdate %]</td>
>-                            <td><a href="transferorder.pl?basketno=[% basket.basketno %]&ordernumber=[% ordernumber %]" onclick="return confirm('Do you want to transfer order [% ordernumber %] from basket [% basketfromname %] ([% booksellerfromname %]) to basket [% basket.basketname %] ([% booksellertoname %]) ?');">Choose</a>
>+                            <td><a href="transferorder.pl?basketno=[% basket.basketno %]&ordernumber=[% ordernumber %]" onclick="return confirmtransfer();">Choose</a>
>                           </tr>
>                         [% END %]
>                     </tbody>
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 15117: 44354 | 44535 | 44547