Add soft delete option to scopeWithTranslations method

Tihomir Banov · Tihomir Banov · commit b76118adce52 · 2015-05-29T10:37:03.000+03:00
diff --git a/src/Despark/LaravelDbLocalization/i18nModelTrait.php b/src/Despark/LaravelDbLocalization/i18nModelTrait.php
@@ -110,7 +110,7 @@ public function translate($locale = false)
         return $translation;
     }
 
-    public function scopeWithTranslations($query, $locale = null)
+    public function scopeWithTranslations($query, $locale = null, $softDelete = null)
     {
         $i18nId = $this->getI18nId($locale);
         $translatorTable = new $this->translator();
@@ -124,6 +124,10 @@ public function scopeWithTranslations($query, $locale = null)
             $query = $query->where($translatorTableName.'.'.$this->getLocaleField(), '=', $i18nId);
         }
 
+        if ($softDelete) {
+            $query = $query->whereNULL($translatorTableName.'.deleted_at');
+        }
+
         return $query;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function translate($locale = false)`
`110`	`110`	`return $translation;`
`111`	`111`	`}`
`112`	`112`
`113`		`- public function scopeWithTranslations($query, $locale = null)`
	`113`	`+ public function scopeWithTranslations($query, $locale = null, $softDelete = null)`
`114`	`114`	`{`
`115`	`115`	`$i18nId = $this->getI18nId($locale);`
`116`	`116`	`$translatorTable = new $this->translator();`
`@@ -124,6 +124,10 @@ public function scopeWithTranslations($query, $locale = null)`
`124`	`124`	`$query = $query->where($translatorTableName.'.'.$this->getLocaleField(), '=', $i18nId);`
`125`	`125`	`}`
`126`	`126`
	`127`	`+ if ($softDelete) {`
	`128`	`+ $query = $query->whereNULL($translatorTableName.'.deleted_at');`
	`129`	`+ }`
	`130`	`+`
`127`	`131`	`return $query;`
`128`	`132`	`}`
`129`	`133`