refactor: merge v3 service providers into existing ones

give.php

@@ -221,11 +221,10 @@ final class Give
         DonationFormsServiceProvider::class,
         FormDesignServiceProvider::class,
         FormMigrationServiceProvider::class,
-        //TODO merge this service providers
+        //TODO: merge this service provider
+        Give\PaymentGateways\Gateways\ServiceProvider::class,
+        //TODO: this was the beta welcome banner, remove this?
         Give\Promotions\ServiceProviderV3::class,
-        Give\Donations\ServiceProviderV3::class,
-        Give\Donors\ServiceProviderV3::class,
-        Give\PaymentGateways\Gateways\ServiceProvider::class
 
     ];
 

src/Donations/ServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace Give\Donations;
 
+use Give\Donations\CustomFields\Controllers\DonationDetailsController;
 use Give\Donations\LegacyListeners\ClearDonationPostCache;
 use Give\Donations\LegacyListeners\DispatchDonationNoteEmailNotification;
 use Give\Donations\LegacyListeners\DispatchGiveInsertPayment;
@@ -46,6 +47,7 @@ public function boot()
     {
         $this->bootLegacyListeners();
         $this->registerDonationsAdminPage();
+        $this->addCustomFieldsToDonationDetails();
 
         give(MigrationsRegister::class)->addMigrations([
             AddMissingDonorIdToDonationComments::class,
@@ -115,4 +117,14 @@ private function registerDonationsAdminPage()
             }
         }
     }
+
+    /**
+     * @since 3.0.0
+     */
+    private function addCustomFieldsToDonationDetails()
+    {
+        add_action('give_view_donation_details_billing_after', static function ($donationId) {
+            echo (new DonationDetailsController())->show($donationId);
+        });
+    }
 }

src/Donors/ServiceProvider.php

@@ -2,10 +2,13 @@
 
 namespace Give\Donors;
 
+use Give\Donors\CustomFields\Controllers\DonorDetailsController;
 use Give\Donors\ListTable\DonorsListTable;
+use Give\Donors\Models\Donor;
 use Give\Donors\Repositories\DonorRepositoryProxy;
 use Give\Helpers\Hooks;
 use Give\ServiceProviders\ServiceProvider as ServiceProviderInterface;
+use Give_Donor as LegacyDonor;
 
 /**
  * @since 2.19.6
@@ -46,5 +49,20 @@ public function boot()
         {
             Hooks::addAction( 'admin_head', DonorsAdminPage::class, 'renderReactSwitch');
         }
+
+        $this->addCustomFieldsToDonorDetails();
+    }
+
+    /**
+     * @since 3.0.0
+     */
+    private function addCustomFieldsToDonorDetails()
+    {
+        add_action('give_donor_after_tables', static function (LegacyDonor $legacyDonor) {
+            /** @var Donor $donor */
+            $donor = Donor::find($legacyDonor->id);
+
+            echo (new DonorDetailsController())->show($donor);
+        });
     }
 }

src/Promotions/ServiceProviderV3.php

@@ -23,7 +23,7 @@ public function register()
      */
     public function boot()
     {
-        if(!get_option('givewp_next_gen_welcome_banner_dismissed')) {
+        if (!get_option('givewp_next_gen_welcome_banner_dismissed')) {
             Hooks::addAction('admin_notices', \Give\Promotions\WelcomeBanner\Actions\DisplayWelcomeBanner::class);
             Hooks::addAction('wp_ajax_givewp_next_gen_welcome_banner_dismiss', \Give\Promotions\WelcomeBanner\Actions\DismissWelcomeBanner::class);
         }

src/Promotions/WelcomeBanner/Actions/DisplayWelcomeBanner.php

@@ -2,7 +2,7 @@
 
 namespace Give\Promotions\WelcomeBanner\Actions;
 
-use Give\Addon\View;
+use Give\Framework\Views\View;
 
 class DisplayWelcomeBanner
 {