Fix check for billing was missing after shop auth

codelayerhq · Apr 29, 2024 · dbfc6b3 · dbfc6b3
1 parent 79ba8f4
commit dbfc6b3
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/Http/Middleware/EnsureShopifyInstalled.php b/src/Http/Middleware/EnsureShopifyInstalled.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Codelayer\LaravelShopifyIntegration\Events\ShopifyAppInstalled;
+use Codelayer\LaravelShopifyIntegration\Lib\EnsureBilling;
 use Codelayer\LaravelShopifyIntegration\Lib\ShopifyOAuth;
 use Codelayer\LaravelShopifyIntegration\Models\ShopifySession;
 use Illuminate\Http\Request;
@@ -28,10 +29,21 @@ public function handle(Request $request, Closure $next)
             return $next($request);
         }
 
-        ShopifyOAuth::authorizeFromRequest($request);
+        $session = ShopifyOAuth::authorizeFromRequest($request);
 
         event(new ShopifyAppInstalled($shop));
 
+        if (config('shopify-integration.billing.required')) {
+            [$hasPayment, $confirmationUrl] = EnsureBilling::check(
+                $session,
+                config('shopify-integration.billing')
+            );
+
+            if (! $hasPayment) {
+                return $next($confirmationUrl);
+            }
+        }
+
         return $next($request);
     }
 }