-my @loop_suppliers;
-for ( my $i = 0 ; $i < $count ; $i++ ) {
- my $orders = GetBasketsByBookseller( $suppliers[$i]->{'id'}, {groupby => "aqbasket.basketno", orderby => "aqbasket.basketname"} );
- my $ordcount = scalar @$orders;
- my %line;
-
- $line{supplierid} = $suppliers[$i]->{'id'};
- $line{name} = $suppliers[$i]->{'name'};
- $line{active} = $suppliers[$i]->{'active'};
- my @loop_basket;
- my $uid = GetMember(borrowernumber => $loggedinuser)->{userid} if $loggedinuser;
- for ( my $i2 = 0 ; $i2 < $ordcount ; $i2++ ) {
- if ( $orders->[$i2]{'authorisedby'} eq $loggedinuser || haspermission($uid, { flagsrequired => { 'acquisition' => '*' } } ) ) {
- my %inner_line;
- $inner_line{basketno} = $orders->[$i2]{'basketno'};
- $inner_line{basketname} = $orders->[$i2]{'basketname'};
- $inner_line{total} = scalar GetOrders($orders->[$i2]{'basketno'});
- $inner_line{authorisedby} = $orders->[$i2]{'authorisedby'};
- my $authby = GetMember(borrowernumber => $orders->[$i2]{'authorisedby'});
- $inner_line{surname} = $authby->{'firstname'};
- $inner_line{firstname} = $authby->{'surname'};
- $inner_line{creationdate} = format_date( $orders->[$i2]{'creationdate'} );
- $inner_line{closedate} = format_date( $orders->[$i2]{'closedate'} );
- $inner_line{uncertainprice} = $orders->[$i2]{'uncertainprice'};
- push @loop_basket, \%inner_line;
+my $loop_suppliers = [];
+
+for my $vendor (@suppliers) {
+ my $baskets = get_vendors_baskets( $vendor->{id} );
+
+ my $loop_basket = [];
+
+ for my $basket ( @{$baskets} ) {
+ my $authorisedby = $basket->{authorisedby};
+ my $basketbranch = GetMember( borrowernumber => $authorisedby )->{branchcode};
+
+ if ($userenv->{'flags'} & 1 || #user is superlibrarian
+ (haspermission( $uid, { acquisition => q{*} } ) && #user has acq permissions and
+ ($viewbaskets eq 'all' || #user is allowed to see all baskets
+ ($viewbaskets eq 'branch' && $authorisedby && $userbranch eq $basketbranch) || #basket belongs to user's branch
+ ($basket->{authorisedby} && $viewbaskets == 'user' && $authorisedby == $loggedinuser) #user created this basket
+ )
+ )
+ ) {
+ for my $date_field (qw( creationdate closedate)) {
+ if ( $basket->{$date_field} ) {
+ $basket->{$date_field} = format_date( $basket->{$date_field} );
+ }
+ }
+ push @{$loop_basket}, $basket;