fix initial token CampaignsFirstLoad

app/Http/Controllers/TokensController.php

@@ -203,6 +203,9 @@ class TokensController extends Controller
                     'allow_retargeting_load' => ['nullable', 'boolean'],
                     'allow_retargeting_load' => ['nullable', 'boolean'],
                 ])
                 ])
             );
             );
+            if ($token->isMain()) {
+                Artisan::call(CampaignsFirstLoad::class);
+            }
         } else {
         } else {
             $token->update(
             $token->update(
                 Request::validate([
                 Request::validate([
@@ -212,10 +215,6 @@ class TokensController extends Controller
             );
             );
         }
         }
 
 
-        if ($token->isMain()) {
-            Artisan::call(CampaignsFirstLoad::class);
-        }
-
         return Redirect::back()->with('success', 'Token updated.');
         return Redirect::back()->with('success', 'Token updated.');
     }
     }
 
 

app/Models/Tokens.php

@@ -11,6 +11,7 @@ use App\Models\Pivots\GoalSitelink;
 use Carbon\Carbon;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
 
 
 /**
 /**
  * App\Models\Tokens
  * App\Models\Tokens
@@ -158,7 +159,15 @@ class Tokens extends Model
      */
      */
     public function scopeAllowedLimit($query)
     public function scopeAllowedLimit($query)
     {
     {
-        return $query->whereColumn('limit_to_run', '<', 'limit');
+        return $query->where(function ($query) {
+            $query->whereColumn('limit_to_run', '<', 'limit')->orWhere(function ($query) {
+                $query->whereNotExists(function ($query) {
+                    $query->select(DB::raw(1))
+                        ->from('limits')
+                        ->whereColumn('limits.token', 'tokens.id');
+                });
+            });
+        });
     }
     }
 
 
     /**
     /**