From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Fri, 28 Sep 2018 08:09:01 +0000 (+0200)
Subject: Bug 18736: (QA follow-up) Cosmetic changes
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=9922d2bf40e2b7429f300d4d73134f9fef3b8c65;p=koha.git

Bug 18736: (QA follow-up) Cosmetic changes

[1] Resolve warnings like:
Use of uninitialized value $rounding_pref in string eq at /usr/share/koha/devclone/C4/Acquisition.pm line 2040.

[2] Fixing unusual use of whitespace too.

[3] Remove list operator from get_rounding_sql return. Only used in scalar
context.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index aad1408ee4..2123ea32ea 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -2003,7 +2003,7 @@ sub TransferOrder {
 
 =head3 get_rounding_sql
 
-    $rounding_sql = get_rounding_sql("mysql_variable_to_round_string");
+    $rounding_sql = get_rounding_sql($column_name);
 
 returns the correct SQL routine based on OrderPriceRounding system preference.
 
@@ -2011,9 +2011,11 @@ returns the correct SQL routine based on OrderPriceRounding system preference.
 
 sub get_rounding_sql {
     my ( $round_string ) = @_;
-    my $rounding_pref = C4::Context->preference('OrderPriceRounding');
-    if ( $rounding_pref eq "nearest_cent"  ) { return ("CAST($round_string*100 AS UNSIGNED)/100"); }
-    else                                     { return ("$round_string"); }
+    my $rounding_pref = C4::Context->preference('OrderPriceRounding') // q{};
+    if ( $rounding_pref eq "nearest_cent"  ) {
+        return "CAST($round_string*100 AS UNSIGNED)/100";
+    }
+    return $round_string;
 }
 
 =head3 get_rounded_price
@@ -2026,9 +2028,11 @@ returns a price rounded as specified in OrderPriceRounding system preference.
 
 sub get_rounded_price {
     my ( $price ) =  @_;
-    my $rounding_pref = C4::Context->preference('OrderPriceRounding');
-    if( $rounding_pref eq 'nearest_cent' ) { return Koha::Number::Price->new( $price )->round(); }
-    else                                   { return $price; }
+    my $rounding_pref = C4::Context->preference('OrderPriceRounding') // q{};
+    if( $rounding_pref eq 'nearest_cent' ) {
+        return Koha::Number::Price->new( $price )->round();
+    }
+    return $price;
 }