Fix join for dtt

RoboJackets · Jan 17, 2019 · 3e502e4 · 3e502e4
1 parent 296b861
commit 3e502e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/app/Nova/Filters/DuesTransactionTeam.php b/app/Nova/Filters/DuesTransactionTeam.php
@@ -33,12 +33,8 @@ class DuesTransactionTeam extends Filter
      */
     public function apply(Request $request, $query, $value)
     {
-        return $query->whereExists(function ($query) use ($value) {
-            $query->select(DB::raw(1))
-                  ->from('team_user')
-                  ->where('dues_transactions.user_id', '=', 'team_user.user_id')
-                  ->where('team_user.team_id', '=', $value);
-        });
+        return $query->join('team_user', 'dues_transactions.user_id', 'team_user.user_id')
+            ->where('team_user.team_id', '=', $value);
     }
 
     /**

diff --git a/pre-deploy-hook.sh b/pre-deploy-hook.sh
@@ -2,4 +2,4 @@
 
 cd "${0%/*}"
 
-php artisan down --message="Application upgrade in progress. Please retry in a few minutes." --retry=60
+php artisan down --message="An app upgrade is in progress. Please try again in a few minutes." --retry=60