t/part/assortment.t

diff --git a/t/part/assortment.t b/t/part/assortment.t
index 8ad7e431026798b6f7578ecc24439271525a6b36..540d0f7160f73483331048723fe76c37d3b97159 100644 (file)
--- a/t/part/assortment.t
+++ b/t/part/assortment.t
@@ -19,9 +19,9 @@ is( SL::DB::Manager::Part->get_all_count(), 3,  "total number of parts created i
 my $assortment = SL::DB::Manager::Part->find_by( partnumber => 'as1' );
 
 is($assortment->part_type,                  'assortment', 'assortment has correct part_type');
 my $assortment = SL::DB::Manager::Part->find_by( partnumber => 'as1' );
 
 is($assortment->part_type,                  'assortment', 'assortment has correct part_type');

-is(scalar @{$assortment->assortment_items}, 2,            'assortment has two parts');
-is($assortment->assortment_sellprice_sum,   19.98,        'assortment sellprice sum ok');
-is($assortment->assortment_lastcost_sum,    13.32,        'assortment lastcost sum ok');
+is(scalar @{$assortment->assortment_items},  2,           'assortment has two parts');
+is($assortment->items_sellprice_sum,        19.98,        'assortment sellprice sum ok');
+is($assortment->items_lastcost_sum,         13.32,        'assortment lastcost sum ok');

 
 my $assortment_item = $assortment->assortment_items->[0];
 is( $assortment_item->assortment->partnumber, 'as1', "assortment_item links back to correct assortment");
 
 my $assortment_item = $assortment->assortment_items->[0];
 is( $assortment_item->assortment->partnumber, 'as1', "assortment_item links back to correct assortment");


@@ -32,13 +32,11 @@ done_testing;
 sub reset_state {
   my %params = @_;
 
 sub reset_state {
   my %params = @_;
 

-  my ($part1, $part2, $unit);
-

   # SL::DB::Manager::AssortmentItem->delete_all(all => 1);
   # SL::DB::Manager::Part->delete_all(all => 1);
   my ($part1, $part2, $unit, $assortment_part, $assortment_1, $assortment_2);
 
   # SL::DB::Manager::AssortmentItem->delete_all(all => 1);
   # SL::DB::Manager::Part->delete_all(all => 1);
   my ($part1, $part2, $unit, $assortment_part, $assortment_1, $assortment_2);
 

-  my $unit = SL::DB::Manager::Unit->find_by(name => 'Stck') || die "Can't find unit 'Stck'";
+  $unit = SL::DB::Manager::Unit->find_by(name => 'Stck') || die "Can't find unit 'Stck'";

   $part1 = SL::DB::Part->new_part( partnumber         => '7777',
                                    description        => "assortment part 1",
                                    unit               => $unit->name,
   $part1 = SL::DB::Part->new_part( partnumber         => '7777',
                                    description        => "assortment part 1",
                                    unit               => $unit->name,


@@ -50,12 +48,12 @@ sub reset_state {
   $part2->description( "assortment part 2" );
   $part2->save;
 
   $part2->description( "assortment part 2" );
   $part2->save;
 

-  my $assortment_part = SL::DB::Part->new_assortment( partnumber         => 'as1',
-                                                      description        => 'assortment',
-                                                      sellprice          => '0',
-                                                      unit               => $unit->name);
-  my $assortment_1 = SL::DB::AssortmentItem->new( parts_id => $part1->id, qty => 3, unit => $part1->unit, position => 1);
-  my $assortment_2 = SL::DB::AssortmentItem->new( parts_id => $part2->id, qty => 3, unit => $part2->unit, position => 2);
+  $assortment_part = SL::DB::Part->new_assortment( partnumber         => 'as1',
+                                                   description        => 'assortment',
+                                                   sellprice          => '0',
+                                                   unit               => $unit->name);
+  $assortment_1 = SL::DB::AssortmentItem->new( parts_id => $part1->id, qty => 3, unit => $part1->unit, position => 1);
+  $assortment_2 = SL::DB::AssortmentItem->new( parts_id => $part2->id, qty => 3, unit => $part2->unit, position => 2);

   $assortment_part->add_assortment_items($assortment_1, $assortment_2);
   $assortment_part->save or die "Couldn't save assortment";
 
   $assortment_part->add_assortment_items($assortment_1, $assortment_2);
   $assortment_part->save or die "Couldn't save assortment";