Bug 18120: Tidy up
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Fri, 29 Sep 2017 20:08:28 +0000 (17:08 -0300)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Fri, 29 Sep 2017 20:13:13 +0000 (17:13 -0300)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Koha/REST/V1/Acquisitions/Vendors.pm

index a244129..5f86ac8 100644 (file)
@@ -192,11 +192,8 @@ the attribute names the exposed REST api spec.
 =cut
 
 sub _to_api {
-
     my $vendor = shift;
 
-    #my $vendor = $vendor_param->TO_JSON;
-
     # Delete unused fields
     delete $vendor->{booksellerfax};
     delete $vendor->{bookselleremail};
@@ -205,16 +202,11 @@ sub _to_api {
     delete $vendor->{othersupplier};
 
     # Rename changed fields
-    $vendor->{list_currency} = $vendor->{listprice};
-    delete $vendor->{listprice};
-    $vendor->{invoice_currency} = $vendor->{invoiceprice};
-    delete $vendor->{invoiceprice};
-    $vendor->{gst} = $vendor->{gstreg};
-    delete $vendor->{gstreg};
-    $vendor->{list_includes_gst} = $vendor->{listincgst};
-    delete $vendor->{listincgst};
-    $vendor->{invoice_includes_gst} = $vendor->{invoiceincgst};
-    delete $vendor->{invoiceincgst};
+    $vendor->{list_currency}        = delete $vendor->{listprice};
+    $vendor->{invoice_currency}     = delete $vendor->{invoiceprice};
+    $vendor->{gst}                  = delete $vendor->{gstreg};
+    $vendor->{list_includes_gst}    = delete $vendor->{listincgst};
+    $vendor->{invoice_includes_gst} = delete $vendor->{invoiceincgst};
 
     return $vendor;
 }
@@ -227,21 +219,14 @@ attribute names.
 =cut
 
 sub _to_model {
-    my $vendor_param = shift;
-
-    my $vendor = $vendor_param;
+    my $vendor = shift;
 
     # Rename back
-    $vendor->{listprice} = $vendor->{list_currency};
-    delete $vendor->{list_currency};
-    $vendor->{invoiceprice} = $vendor->{invoice_currency};
-    delete $vendor->{invoice_currency};
-    $vendor->{gstreg} = $vendor->{gst};
-    delete $vendor->{gst};
-    $vendor->{listincgst} = $vendor->{list_includes_gst};
-    delete $vendor->{list_includes_gst};
-    $vendor->{invoiceincgst} = $vendor->{invoice_includes_gst};
-    delete $vendor->{invoice_includes_gst};
+    $vendor->{listprice}     = delete $vendor->{list_currency};
+    $vendor->{invoiceprice}  = delete $vendor->{invoice_currency};
+    $vendor->{gstreg}        = delete $vendor->{gst};
+    $vendor->{listincgst}    = delete $vendor->{list_includes_gst};
+    $vendor->{invoiceincgst} = delete $vendor->{invoice_includes_gst};
 
     return $vendor;
 }