Added BLADE billing redirect fix (#1263)

Author: CetoBasilius

Diff for: src/Traits/BillingController.php

@@ -91,11 +91,12 @@ public function process(
         );
 
         // Go to homepage of app
-        return Redirect::route(Util::getShopifyConfig('route_names.home'), [
+        return Redirect::route(Util::getShopifyConfig('route_names.home'), array_merge([
             'shop' => $shop->getDomain()->toNative(),
+        ], Util::useNativeAppBridge() ? [] : [
             'host' => base64_encode($shop->getDomain()->toNative().'/admin'),
             'billing' => $result ? 'success' : 'failure',
-        ])->with(
+        ]))->with(
             $result ? 'success' : 'failure',
             'billing'
         );

Diff for: tests/Traits/BillingControllerTest.php

@@ -51,14 +51,16 @@ public function testSendsShopToBillingScreen(): void
         );
     }
 
-    public function testShopAcceptsBilling(): void
+    public function testReactFrontendShopAcceptsBilling(): void
     {
         // Stub the responses
         ApiStub::stubResponses([
             'post_recurring_application_charges',
             'post_recurring_application_charges_activate',
         ]);
 
+        config(['shopify-app.frontend_engine' => 'REACT']);
+
         // Create the shop and log them in
         $shop = factory($this->model)->create();
         $this->auth->login($shop);
@@ -87,6 +89,44 @@ public function testShopAcceptsBilling(): void
         $this->assertNotNull($shop->plan);
     }
 
+    public function testBladeFrontendShopAcceptsBilling(): void
+    {
+        // Stub the responses
+        ApiStub::stubResponses([
+            'post_recurring_application_charges',
+            'post_recurring_application_charges_activate',
+        ]);
+
+        config(['shopify-app.frontend_engine' => 'BLADE']);
+
+        // Create the shop and log them in
+        $shop = factory($this->model)->create();
+        $this->auth->login($shop);
+
+        // Make the plan
+        $plan = factory(Util::getShopifyConfig('models.plan', Plan::class))->states('type_recurring')->create();
+
+        // Run the call
+        $response = $this->call(
+            'get',
+            "/billing/process/{$plan->id}",
+            [
+                'charge_id' => 1,
+                'shop' => $shop->getDomain()->toNative(),
+            ]
+        );
+
+        // Refresh the model
+        $shop->refresh();
+
+        $hostValue = urlencode(base64_encode($shop->getDomain()->toNative().'/admin'));
+        // Assert we've redirected and shop has been updated
+        $response->assertRedirect();
+        $this->assertFalse(Str::contains($response->headers->get('Location'), '&host='.$hostValue));
+        $this->assertFalse(Str::contains($response->headers->get('Location'), '&billing=success'));
+        $this->assertNotNull($shop->plan);
+    }
+
     public function testUsageChargeSuccess(): void
     {
         // Stub the responses