fixup! fixup! [Merton][WW] Allow transfer of ggw subscription

mysociety · Oct 31, 2024 · 8492c7d · 8492c7d
1 parent ea27997
commit 8492c7d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/perllib/FixMyStreet/App/Form/Waste/Garden/Transfer.pm b/perllib/FixMyStreet/App/Form/Waste/Garden/Transfer.pm
@@ -152,6 +152,7 @@ has_field addresses => (
         my $data = $c->cobrand->call_hook('check_ggw_transfer_applicable' => $self->value);
         if ($data->{error}) {
             $self->add_error($messages{ $data->{error} });
+            return;
         };
         $self->form->saved_data->{transfer_old_ggw_sub} = $data;
         ($self->form->saved_data->{previous_ggw_address}) = (grep { $_->{value} == $self->value } @{$self->form->saved_data->{addresses}})[0];

diff --git a/perllib/FixMyStreet/Cobrand/Merton/Waste.pm b/perllib/FixMyStreet/Cobrand/Merton/Waste.pm
@@ -398,9 +398,14 @@ sub check_ggw_transfer_applicable {
     return { error => 'due_soon' } if ($subscription_enddate && $self->waste_sub_due($subscription_enddate));
 
     my $old_subscription_bin_data = Integrations::Echo::force_arrayref($servicetask->{Data}, 'ExtensibleDatum');
-    my ($bin_number) = grep { $_->{DatatypeName} eq 'Quantity'} @{$old_subscription_bin_data->[0]->{ChildData}->{ExtensibleDatum}};
-    my ($bin_type) = grep { $_->{DatatypeName} eq 'Container Type'} @{$old_subscription_bin_data->[0]->{ChildData}->{ExtensibleDatum}};
-
+    my $bin_number;
+    my $bin_type;
+    for my $extensible_data (@$old_subscription_bin_data) {
+        if ($extensible_data->{DatatypeName} eq 'SLWP - Containers') {
+            ($bin_number) = grep { $_->{DatatypeName} eq 'Quantity'} @{$extensible_data->{ChildData}->{ExtensibleDatum}};
+            ($bin_type) = grep { $_->{DatatypeName} eq 'Container Type'} @{$extensible_data->{ChildData}->{ExtensibleDatum}};
+        }
+    };
     $old_garden->{subscription_enddate} = $subscription_enddate;
     $old_garden->{transfer_bin_number} = $bin_number->{Value};
     $old_garden->{transfer_bin_type} = $bin_type->{Value};