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

mysociety · Oct 31, 2024 · 34fd44f · 34fd44f
1 parent 8492c7d
commit 34fd44f
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/perllib/FixMyStreet/Cobrand/Merton/Waste.pm b/perllib/FixMyStreet/Cobrand/Merton/Waste.pm
@@ -398,18 +398,18 @@ 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;
-    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}};
+
+    foreach (@$old_subscription_bin_data) {
+        my $moredata = Integrations::Echo::force_arrayref($_->{ChildData}, 'ExtensibleDatum');
+        foreach (@$moredata) {
+            if ($_->{DatatypeName} eq 'Quantity') {
+                $old_garden->{transfer_bin_number} = $_->{Value};
+            } elsif ($_->{DatatypeName} eq 'Container Type') {
+                $old_garden->{transfer_bin_type} = $_->{Value};
+            }
         }
     };
     $old_garden->{subscription_enddate} = $subscription_enddate;
-    $old_garden->{transfer_bin_number} = $bin_number->{Value};
-    $old_garden->{transfer_bin_type} = $bin_type->{Value};
-
     return $old_garden;
 }