Compare commits

..

No commits in common. "28f28be1b87f1fac413dfa27cef3b3582e43379d" and "ebf9f29200ea3d04b187cd0392dbdce660a18ff3" have entirely different histories.

2 changed files with 1 additions and 3 deletions

View File

@ -6,12 +6,10 @@
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes;
class Account extends Model class Account extends Model
{ {
/** @use HasFactory<\Database\Factories\Person/AccountFactory> */ /** @use HasFactory<\Database\Factories\Person/AccountFactory> */
use SoftDeletes;
use HasFactory; use HasFactory;
protected $fillable = [ protected $fillable = [

View File

@ -1633,7 +1633,7 @@ private function upsertAccount(Import $import, array $mapped, $mappings, bool $h
$existing = Account::query() $existing = Account::query()
->where('contract_id', $contractId) ->where('contract_id', $contractId)
//->where('reference', $reference) ->where('reference', $reference)
->where('active', 1) ->where('active', 1)
->first(); ->first();