Adjustment to routes

Author: gnikyt

src/ShopifyApp/Traits/AuthControllerTrait.php

@@ -44,7 +44,7 @@ public function authenticate(AuthShop $request)
         $authHandler = new AuthShopHandler($shopDomain);
         $authHandler->storeSession();
 
-        if (!isset($request['code'])) {
+        if (!$request->has('code')) {
             // Handle a request without a code, do a fullpage redirect
             $authUrl = $authHandler->buildAuthUrl();
 

src/ShopifyApp/Traits/BillingControllerTrait.php

@@ -21,14 +21,19 @@ trait BillingControllerTrait
     /**
      * Redirects to billing screen for Shopify.
      *
-     * @param \OhMyBrew\ShopifyApp\Models\Plan $billingPlan The plan.
+     * @param \OhMyBrew\ShopifyApp\Models\Plan|null $plan The plan.
      *
      * @return \Illuminate\View\View
      */
-    public function index(Plan $billingPlan)
+    public function index(Plan $plan = null)
     {
+        // If the plan is null, get a plan
+        if (is_null($plan)) {
+            $plan = Plan::where('on_install', true)->first();
+        }
+
         // Get the confirmation URL
-        $bp = new BillingPlan(ShopifyApp::shop(), $billingPlan);
+        $bp = new BillingPlan(ShopifyApp::shop(), $plan);
         $url = $bp->confirmationUrl();
 
         // Do a fullpage redirect
@@ -38,23 +43,23 @@ public function index(Plan $billingPlan)
     /**
      * Processes the response from the customer.
      *
-     * @param \OhMyBrew\ShopifyApp\Models\Plan $billingPlan The plan.
+     * @param \OhMyBrew\ShopifyApp\Models\Plan $plan The plan.
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function process(Plan $billingPlan)
+    public function process(Plan $plan)
     {
         // Activate the plan and save
         $shop = ShopifyApp::shop();
-        $bp = new BillingPlan($shop, $billingPlan);
+        $bp = new BillingPlan($shop, $plan);
         $bp->setChargeId(Request::query('charge_id'));
         $bp->activate();
         $bp->save();
 
         // All good, update the shop's plan and take them off freemium (if applicable)
         $shop->update([
             'freemium' => false,
-            'plan_id'  => $billingPlan->id,
+            'plan_id'  => $plan->id,
         ]);
 
         // Go to homepage of app

src/ShopifyApp/resources/routes.php

@@ -11,17 +11,6 @@
 |
 */
 
-// Bind the billing plan to an actual plan
-Route::bind('billingPlan', function ($value) {
-    if ($value === null) {
-        // Find the on-install plan
-        return Plan::where('on_install', true)->first();
-    }
-
-    // Find the plan passed to the method
-    return Plan::where('id', $value)->first();
-});
-
 Route::group(['middleware' => ['web']], function () {
     /*
     |--------------------------------------------------------------------------
@@ -80,10 +69,10 @@
     */
 
     Route::get(
-        '/billing/{billingPlan?}',
+        '/billing/{plan?}',
         'OhMyBrew\ShopifyApp\Controllers\BillingController@index'
     )
-    ->where('billingPlan', '^([0-9]+|)$')
+    ->where('plan', '^([0-9]+|)$')
     ->name('billing');
 
     /*
@@ -96,10 +85,10 @@
     */
 
     Route::get(
-        '/billing/process/{billingPlan?}',
+        '/billing/process/{plan?}',
         'OhMyBrew\ShopifyApp\Controllers\BillingController@process'
     )
-    ->where('billingPlan', '^([0-9]+|)$')
+    ->where('plan', '^([0-9]+|)$')
     ->name('billing.process');
 
     /*