diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 4ace36d167d6..bae27f44c5c0 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -100,10 +100,7 @@ class Import implements ShouldQueue use Uploadable; use SavesDocuments; - /** - * @var array - */ - private $file_path; //the file path - using a different JSON parser here. + private string $file_path; //the file path - using a different JSON parser here. /** * @var Company @@ -202,7 +199,11 @@ class Import implements ShouldQueue nlog($this->company->id); auth()->login($this->user, false); - auth()->user()->setCompany($this->company); + + /** @var \App\Models\User $user */ + $user = auth()->user(); + + $user->setCompany($this->company); $array = json_decode(file_get_contents($this->file_path), 1); $data = $array['data']; diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php index 2c38e4ba477c..8f1dfb3e19c6 100644 --- a/app/Models/BaseModel.php +++ b/app/Models/BaseModel.php @@ -40,7 +40,10 @@ use Illuminate\Support\Str; * @method static \Illuminate\Database\Eloquent\Builder|BaseModel scopeExclude() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel find() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel whereIn() - * @method static \Illuminate\Database\Eloquent\Builder|BankIntegration where() + * @method static \Illuminate\Database\Eloquent\Builder|BaseModel where() + * @method static \Illuminate\Database\Eloquent\Builder|BaseModel count() + * @method static \Illuminate\Database\Eloquent\Builder|BaseModel create() + * @method static \Illuminate\Database\Eloquent\Builder|BaseModel insert() * @method \App\Models\Company company() * @method int companyId() * @method Builder|static exclude($columns) diff --git a/app/Models/Client.php b/app/Models/Client.php index 9d5fb64bfa2c..a5b635960722 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -168,6 +168,7 @@ use Laracasts\Presenter\PresentableTrait; * @method static \Illuminate\Database\Eloquent\Builder|Client withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|Client withoutTrashed() * @method static \Illuminate\Database\Eloquent\Builder|Client with() + * @method static \Illuminate\Database\Eloquent\Builder|Client where() * @property string $payment_balance * @method static \Illuminate\Database\Eloquent\Builder|Client wherePaymentBalance($value) * @property mixed $tax_data diff --git a/app/Models/TaskStatus.php b/app/Models/TaskStatus.php index 3b23281de1c0..8a943af50325 100644 --- a/app/Models/TaskStatus.php +++ b/app/Models/TaskStatus.php @@ -37,6 +37,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|TaskStatus onlyTrashed() * @method static \Illuminate\Database\Eloquent\Builder|TaskStatus query() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope() + * @method static \Illuminate\Database\Eloquent\Builder|BaseModel insert() * @method static \Illuminate\Database\Eloquent\Builder|TaskStatus whereColor($value) * @method static \Illuminate\Database\Eloquent\Builder|TaskStatus whereCompanyId($value) * @method static \Illuminate\Database\Eloquent\Builder|TaskStatus whereCreatedAt($value) diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php index b4596f981cfa..ab5355a329bf 100644 --- a/app/Utils/Traits/GeneratesCounter.php +++ b/app/Utils/Traits/GeneratesCounter.php @@ -708,7 +708,8 @@ trait GeneratesCounter $replace[] = str_pad(($user_id), 2, '0', STR_PAD_LEFT); } - $matches = false; + $matches = []; + preg_match('/{\$date:(.*?)}/', $pattern, $matches); if (count($matches) > 1) { $format = $matches[1];