add more progress ...

Author: fico7489

src/SortJoinTrait.php

@@ -14,16 +14,16 @@ trait SortJoinTrait
 
     public function scopeWhereJoin(Builder $builder, $column, $operator = null, $value = null, $boolean = 'and')
     {
-        $column = $this->performJoin($builder, $column);
         $this->relationClauses[] = ['column' => $column, 'operator' => $operator, 'value' => $value, 'boolean' => $boolean];
+        $column = $this->performJoin($builder, $column);
 
         return $builder->where($column, $operator, $value, $boolean);
     }
 
     public function scopeOrWhereJoin(Builder $builder, $column, $operator = null, $value)
     {
-        $column = $this->performJoin($builder, $column);
         $this->relationClauses[] = ['column' => $column, 'operator' => $operator, 'value' => $value, 'boolean' => 'and'];
+        $column = $this->performJoin($builder, $column);
 
         return $builder->orWhere($column, $operator, $value);
     }
@@ -69,8 +69,10 @@ private function performJoin($builder, $relations){
                     $builder->leftJoin($relatedTable . ' as ' . $relatedTableAlias, $relatedTableAlias . '.' . $keyRelated, '=', $currentTable . '.' . $relatedPrimaryKey);
                 }
 
-                //apply where deleted_at is null is model using soft deletes
-                if(method_exists($relatedModel, 'getQualifiedDeletedAtColumn')){
+                $columnsWhere = collect($relatedModel->relationClauses)->pluck('column')->toArray();
+
+                //by default apply where deleted_at is null if model is using soft deletes, if any where clause have deleted_at columnn do not apply
+                if(method_exists($relatedModel, 'getQualifiedDeletedAtColumn') &&  ! in_array('deleted_at', $columnsWhere)){
                     $builder->where([$relatedTableAlias . '.deleted_at' => null]);
                 }
             }

tests/Models/Location.php

@@ -10,10 +10,10 @@ class Location extends BaseModel
 
     protected $table = 'locations';
 
-    protected $fillable = ['address', 'seller_id'];
+    protected $fillable = ['address', 'seller_id', 'is_primary', 'is_secondary'];
 
     public function seller()
     {
-        return $this->belongsTo(sSeller::class);
+        return $this->belongsTo(Seller::class);
     }
 }

tests/Models/Seller.php

@@ -12,4 +12,16 @@ public function location()
     {
         return $this->hasOne(Location::class);
     }
+
+    public function locationPrimary()
+    {
+        return $this->hasOne(Location::class)
+            ->whereJoin('is_primary', '=', 1);
+    }
+
+    public function locationSecondary()
+    {
+        return $this->hasOne(Location::class)
+            ->whereJoin('is_secondary', '=', 1);
+    }
 }

tests/database/migrations/2017_11_04_163552_create_database.php

@@ -48,13 +48,15 @@ public function up()
             $table->softDeletes();
         });
 
-		Schema::create('locations', function (Blueprint $table) {
-			$table->increments('id');
-			$table->string('address')->nullable();
-			$table->integer('seller_id')->unsigned()->index()->nullable();
+        Schema::create('locations', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('address')->nullable();
+            $table->boolean('is_primary')->default(0);
+            $table->boolean('is_secondary')->default(0);
+            $table->integer('seller_id')->unsigned()->index()->nullable();
 
-			$table->foreign('seller_id')->references('id')->on('sellers')
-				->onUpdate('cascade')->onDelete('cascade');
+            $table->foreign('seller_id')->references('id')->on('sellers')
+                ->onUpdate('cascade')->onDelete('cascade');
 
             $table->timestamps();
             $table->softDeletes();