projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch (parent: c61e33e)
Bug 15117: Transfer Order: Better user information and translation handling
authorMarc Véron <veron@veron.ch>
Wed, 4 Nov 2015 09:13:46 +0000 (10:13 +0100)
committerLiz Rea <wizzyrea@gmail.com>
Thu, 10 Dec 2015 01:28:26 +0000 (14:28 +1300)
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.

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
  Dialog box with readable & translatable info.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 571ec9a94b9323cd23f9012d9b1f837fd9bf974c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 57a8479bf36f530a55fd93ba67fe965efb0e0373)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>

acqui/transferorder.pl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt patch | blob | history

diff --git a/acqui/transferorder.pl b/acqui/transferorder.pl
index d82ce20..d84def5 100755 (executable)
--- a/acqui/transferorder.pl
+++ b/acqui/transferorder.pl
@@ -50,8 +50,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;
 }
 
@@ -66,6 +68,7 @@ if($booksellerto){
     $booksellertoname = $booksellerto->{name};
 }
 
+
 if( $basketno && $ordernumber) {
     # Transfer order and exit
     my $order = GetOrder( $ordernumber );
@@ -133,6 +136,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 3671632..69b0231 100644 (file)
--- 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="order_transfer_page">
 
@@ -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>
Mirror of git://git.koha-community.org/koha.git