Attachment 25372 Details for Bug 11471 – [ALT] Bug 11471: Display the currency for baskets in a basketgroup

[patch] [ALT] Bug 11471: Display the currency for baskets in a basketgroup

Bug-11471-Display-the-currency-for-baskets-in-a-ba.patch (text/plain), 2.08 KB, created by Jonathan Druart on 2014-02-18 14:10:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-02-18 14:10:55 UTC

Size: 2.08 KB

patch

obsolete

>From cefadb06fa1c170949c755de4d2391f66dd638dc Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Tue, 18 Feb 2014 15:07:38 +0100
>Subject: [PATCH] Bug 11471: Display the currency for baskets in a basketgroup
>
>On editing a basketgroup, the currency for baskets in a basketgroup is
>always '0'.
>
>With this patch, the currency is correctly displayed.
>
>Test plan:
>Edit a basket group with baskets and verify the currenty is correct.
>---
> acqui/basketgroup.pl |    6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
>index 2051eaa..c050967 100755
>--- a/acqui/basketgroup.pl
>+++ b/acqui/basketgroup.pl
>@@ -250,6 +250,7 @@ if ( $op eq "add" ) {
> # else, edit (if it is open) or display (if it is close) the basketgroup basketgroupid
> # the template will know if basketgroup must be displayed or edited, depending on the value of closed key
> #
>+    my $bookseller = &GetBookSellerFromId($booksellerid);
>     if(! $booksellerid){
> # Unknown bookseller
> # FIXME : ungroupedlist does not seem to be used in this file nor in template
>@@ -277,8 +278,8 @@ if ( $op eq "add" ) {
>         if ( $basketgroupid ) {
>             # Get the selected baskets in the basketgroup to display them
>             my $selecteds = GetBasketsByBasketgroup($basketgroupid);
>-            foreach (@{$selecteds}){
>-                $_->{total} = BasketTotal($_->{basketno}, $_);
>+            foreach my $basket(@{$selecteds}){
>+                $basket->{total} = BasketTotal($basket->{basketno}, $bookseller);
>             }
>             $template->param(basketgroupid => $basketgroupid,
>                              selectedbaskets => $selecteds);
>@@ -311,7 +312,6 @@ if ( $op eq "add" ) {
>     # the template will display a unique basketgroup
>     $template->param(grouping => 1);
>     my $basketgroups = &GetBasketgroups($booksellerid);
>-    my $bookseller = &GetBookSellerFromId($booksellerid);
>     my $baskets = &GetBasketsByBookseller($booksellerid);
>     displaybasketgroups($basketgroups, $bookseller, $baskets);
> } elsif ($op eq 'mod_basket') {
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 11471: 23897 | 23898 | 25352 | 25372 | 25388 | 25532