From 26297903e4cb4663320aac8aee49fca87d92f4a8 Mon Sep 17 00:00:00 2001
From: Jesse Weaver <jweaver@bywatersolutions.com>
Date: Mon, 11 Jan 2016 16:07:33 -0700
Subject: [PATCH] Bug 15531: (QA followup) Fix several small issues

  * Add `AFTER` to DB update
  * Change "Is standing order basket:" to "Orders are standing:"
  * Disable item creation when adding from a staged file
  * Correctly show is_standing for existing baskets

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 acqui/addorderiso2709.pl                                    | 6 ++++--
 acqui/basketheader.pl                                       | 1 +
 .../atomicupdate/bug_15531-add_is_standing_to_aqbasket.sql  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt     | 2 +-
 .../intranet-tmpl/prog/en/modules/acqui/basketheader.tt     | 6 +++++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index e5159dc74b..552754c947 100755
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -99,7 +99,8 @@ if ($op eq ""){
                      "allmatch" => $allmatch,
                      );
     import_biblios_list($template, $cgiparams->{'import_batch_id'});
-    if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
+    my $basket = GetBasket($cgiparams->{basketno});
+    if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$basket->{is_standing} ) {
         # prepare empty item form
         my $cell = PrepareItemrecordDisplay( '', '', '', 'ACQ' );
 
@@ -238,7 +239,8 @@ if ($op eq ""){
         # 4th, add items if applicable
         # parse the item sent by the form, and create an item just for the import_record_id we are dealing with
         # this is not optimised, but it's working !
-        if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
+        my $basket = GetBasket($cgiparams->{basketno});
+        if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$basket->{is_standing} ) {
             my @tags         = $input->multi_param('tag');
             my @subfields    = $input->multi_param('subfield');
             my @field_values = $input->multi_param('field_value');
diff --git a/acqui/basketheader.pl b/acqui/basketheader.pl
index 051e148000..c59ea87ba6 100755
--- a/acqui/basketheader.pl
+++ b/acqui/basketheader.pl
@@ -123,6 +123,7 @@ if ( $op eq 'add_form' ) {
                     booksellers => \@booksellers,
                     deliveryplace => $basket->{deliveryplace},
                     billingplace => $basket->{billingplace},
+                    is_standing => $basket->{is_standing},
     );
 
     my $billingplace = $basket->{'billingplace'} || C4::Context->userenv->{"branch"};
diff --git a/installer/data/mysql/atomicupdate/bug_15531-add_is_standing_to_aqbasket.sql b/installer/data/mysql/atomicupdate/bug_15531-add_is_standing_to_aqbasket.sql
index 69d8fabd41..4df3e9c494 100644
--- a/installer/data/mysql/atomicupdate/bug_15531-add_is_standing_to_aqbasket.sql
+++ b/installer/data/mysql/atomicupdate/bug_15531-add_is_standing_to_aqbasket.sql
@@ -1 +1 @@
-ALTER TABLE aqbasket ADD COLUMN is_standing TINYINT(1) NOT NULL DEFAULT 0;
+ALTER TABLE aqbasket ADD COLUMN is_standing TINYINT(1) NOT NULL DEFAULT 0 AFTER branch;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index d33de40900..128eed01ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -320,7 +320,7 @@
                 [% IF ( closedate ) %]<li><span class="label">Closed on:</span> [% closedate | $KohaDates %]</li>[% END %]
                 [% IF ( estimateddeliverydate ) %]<li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates  %]</li>[% END %]
                 [% IF ( estimateddeliverydate ) %]<li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates  %]</li>[% END %]
-                <li><span class="label">Is standing order basket:</span> [% IF is_standing %]Yes[% ELSE %]No[% END %]</li>
+                <li><span class="label">Orders are standing:</span> [% IF is_standing %]Yes[% ELSE %]No[% END %]</li>
 
 
                 </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
index 1e7f4e6f7c..cc06ae329e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
@@ -115,7 +115,11 @@
                 [% END %]
                 <li>
                     <label for="is_standing">Orders are standing:</label>
-                    <input type="checkbox" id="is_standing" name="is_standing"/>
+                    [% IF is_standing %]
+                        <input type="checkbox" id="is_standing" name="is_standing" checked="checked" />
+                    [% ELSE %]
+                        <input type="checkbox" id="is_standing" name="is_standing"/>
+                    [% END %]
                     <div class="hint">Standing orders do not close when received.</div>
                 </li>
             </ol>
-- 
2.39.5