[Bexley] Garden subscription flow, front to payment.

perllib/FixMyStreet/App/Controller/Waste.pm

@@ -1425,7 +1425,7 @@ sub setup_garden_sub_params : Private {
     my $service_id;
     if (my $service = $c->cobrand->garden_current_subscription) {
         $service_id = $service->{service_id};
-    } else {
+    } elsif ($c->cobrand->can('garden_service_id')) { # XXX TODO Does Bexley need its own? Or is this actually Echo only?
         $service_id = $c->cobrand->garden_service_id;
     }
     $c->set_param('email_renewal_reminders_opt_in', $data->{email_renewal_reminders} eq 'Yes' ? 'Y' : 'N') if $data->{email_renewal_reminders};

perllib/FixMyStreet/Cobrand/Bexley.pm

@@ -18,8 +18,9 @@ use warnings;
 use Time::Piece;
 use DateTime;
 use Moo;
-with 'FixMyStreet::Roles::Open311Multi';
-with 'FixMyStreet::Cobrand::Bexley::Waste';
+with 'FixMyStreet::Roles::Open311Multi',
+     'FixMyStreet::Cobrand::Bexley::Garden',
+     'FixMyStreet::Cobrand::Bexley::Waste';
 
 sub council_area_id { 2494 }
 sub council_area { 'Bexley' }

perllib/FixMyStreet/Cobrand/Bexley/Garden.pm

@@ -0,0 +1,40 @@
+=head1 NAME
+
+FixMyStreet::Cobrand::Bexley::Garden - code specific to Bexley WasteWorks GGW
+
+=cut
+
+package FixMyStreet::Cobrand::Bexley::Garden;
+
+use Moo::Role;
+with 'FixMyStreet::Roles::Cobrand::SCP',
+     'FixMyStreet::Roles::Cobrand::Paye';
+
+sub garden_service_name { 'garden waste collection service' }
+
+# TODO No current subscription look up here
+#
+sub garden_current_subscription { undef }
+
+=item * You can order a maximum of five bins
+
+=cut
+
+sub waste_garden_maximum { 5 }
+
+=item * Garden waste has different price for the first bin
+
+=cut
+
+# TODO Check
+sub waste_cc_payment_sale_ref {
+    my ($self, $p) = @_;
+    return "GGW" . $p->get_extra_field_value('uprn');
+}
+
+sub waste_cc_payment_line_item_ref {
+    my ($self, $p) = @_;
+    return $p->id;
+}
+
+1;

perllib/Integrations/SCP.pm

@@ -117,7 +117,7 @@ sub pay {
             'scpbase:lgItemDetails' => ixhash(
                 'scpbase:fundCode' => $args->{fund_code},
                 'scpbase:additionalReference' => $_->{lineId},
-                'scpbase:narrative' => $args->{uprn},
+                'scpbase:narrative' => $args->{uprn}, # Needs to differ for Bexley
                 'scpbase:accountName' => {
                     'scpbase:surname' => $args->{name},
                 },