From 483ce7aff9d272a6f0410a5cc51614f5772a03cd Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Jul 2023 12:33:54 +1000 Subject: [PATCH 01/11] Fixes for static analysis --- app/Models/ClientContact.php | 34 ------- app/Models/Expense.php | 58 +----------- app/Models/Invoice.php | 164 +-------------------------------- app/Models/QuoteInvitation.php | 19 ---- app/Models/Scheduler.php | 29 ------ 5 files changed, 3 insertions(+), 301 deletions(-) diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php index 4c0c054b8e1e..8c9d40d8c4ab 100644 --- a/app/Models/ClientContact.php +++ b/app/Models/ClientContact.php @@ -87,40 +87,6 @@ use Laracasts\Presenter\PresentableTrait; * @method static \Illuminate\Database\Eloquent\Builder|ClientContact newQuery() * @method static \Illuminate\Database\Eloquent\Builder|ClientContact onlyTrashed() * @method static \Illuminate\Database\Eloquent\Builder|ClientContact query() - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereAcceptedTermsVersion($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereAvatar($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereAvatarSize($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereAvatarType($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereClientId($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereCompanyId($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereConfirmationCode($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereConfirmed($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereContactKey($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereCreatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereCustomValue1($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereCustomValue2($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereCustomValue3($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereCustomValue4($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereDeletedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereEmail($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereEmailVerifiedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereFailedLogins($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereFirstName($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereGoogle2faSecret($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereIsLocked($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereIsPrimary($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereLastLogin($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereLastName($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereOauthProviderId($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereOauthUserId($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact wherePassword($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact wherePhone($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereRememberToken($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereSendEmail($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereToken($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereUpdatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|ClientContact withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|ClientContact withoutTrashed() * @property-read \Illuminate\Database\Eloquent\Collection $credit_invitations diff --git a/app/Models/Expense.php b/app/Models/Expense.php index 3bb6ff894ba4..fd2cea88c6d6 100644 --- a/app/Models/Expense.php +++ b/app/Models/Expense.php @@ -83,66 +83,12 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|Expense onlyTrashed() * @method static \Illuminate\Database\Eloquent\Builder|Expense query() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope() - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereAmount($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereAssignedUserId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereBankId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereCalculateTaxByAmount($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereCategoryId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereClientId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereCompanyId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereCreatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereCurrencyId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereCustomValue1($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereCustomValue2($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereCustomValue3($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereCustomValue4($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereDate($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereDeletedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereExchangeRate($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereForeignAmount($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereInvoiceCurrencyId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereInvoiceDocuments($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereInvoiceId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereIsDeleted($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereNumber($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense wherePaymentDate($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense wherePaymentTypeId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense wherePrivateNotes($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereProjectId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense wherePublicNotes($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereRecurringExpenseId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereShouldBeInvoiced($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxAmount1($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxAmount2($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxAmount3($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxName1($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxName2($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxName3($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxRate1($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxRate2($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxRate3($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereTransactionId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereTransactionReference($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereUpdatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereUserId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereUsesInclusiveTaxes($value) - * @method static \Illuminate\Database\Eloquent\Builder|Expense whereVendorId($value) * @method static \Illuminate\Database\Eloquent\Builder|Expense withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|Expense withoutTrashed() * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $documents + * @property-read \Illuminate\Database\Eloquent\Collection $client + * @property-read \Illuminate\Database\Eloquent\Collection $invoice * @property-read \App\Models\BankTransaction|null $transaction - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $documents * @mixin \Eloquent */ class Expense extends BaseModel diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index 4c0a19f0862b..6d7c1539a74d 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -139,69 +139,6 @@ use App\Events\Invoice\InvoiceReminderWasEmailed; * @method static \Illuminate\Database\Eloquent\Builder|Invoice onlyTrashed() * @method static \Illuminate\Database\Eloquent\Builder|Invoice query() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope() - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereAmount($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereAssignedUserId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereAutoBillEnabled($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereAutoBillTries($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereBackup($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereBalance($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereClientId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCompanyId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCreatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurcharge1($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurcharge2($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurcharge3($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurcharge4($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurchargeTax1($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurchargeTax2($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurchargeTax3($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurchargeTax4($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomValue1($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomValue2($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomValue3($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomValue4($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereDate($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereDeletedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereDesignId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereDiscount($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereDueDate($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereExchangeRate($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereFooter($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereIsAmountDiscount($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereIsDeleted($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereIsProforma($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereLastSentDate($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereLastViewed($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereLineItems($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereNextSendDate($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereNumber($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice wherePaidToDate($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice wherePartial($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice wherePartialDueDate($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice wherePoNumber($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice wherePrivateNotes($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereProjectId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice wherePublicNotes($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereRecurringId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereReminder1Sent($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereReminder2Sent($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereReminder3Sent($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereReminderLastSent($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereStatusId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereSubscriptionId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxName1($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxName2($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxName3($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxRate1($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxRate2($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxRate3($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTerms($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTotalTaxes($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereUpdatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereUserId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereUsesInclusiveTaxes($value) - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereVendorId($value) * @method static \Illuminate\Database\Eloquent\Builder|Invoice withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|Invoice withoutTrashed() * @property-read \Illuminate\Database\Eloquent\Collection $activities @@ -213,107 +150,8 @@ use App\Events\Invoice\InvoiceReminderWasEmailed; * @property-read \Illuminate\Database\Eloquent\Collection $invitations * @property-read \Illuminate\Database\Eloquent\Collection $payments * @property-read \Illuminate\Database\Eloquent\Collection $tasks + * @property-read \Illuminate\Database\Eloquent\Collection $invoice * @property object|null $tax_data - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $company_ledger - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $history - * @property-read \Illuminate\Database\Eloquent\Collection $invitations - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxData($value) - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $company_ledger - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $history - * @property-read \Illuminate\Database\Eloquent\Collection $invitations - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $company_ledger - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $history - * @property-read \Illuminate\Database\Eloquent\Collection $invitations - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $company_ledger - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $history - * @property-read \Illuminate\Database\Eloquent\Collection $invitations - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $company_ledger - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $history - * @property-read \Illuminate\Database\Eloquent\Collection $invitations - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $company_ledger - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $history - * @property-read \Illuminate\Database\Eloquent\Collection $invitations - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $company_ledger - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $history - * @property-read \Illuminate\Database\Eloquent\Collection $invitations - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $company_ledger - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $history - * @property-read \Illuminate\Database\Eloquent\Collection $invitations - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $company_ledger - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $history - * @property-read \Illuminate\Database\Eloquent\Collection $invitations - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $company_ledger - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $history - * @property-read \Illuminate\Database\Eloquent\Collection $invitations - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $company_ledger - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $history - * @property-read \Illuminate\Database\Eloquent\Collection $invitations - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $tasks * @mixin \Eloquent */ class Invoice extends BaseModel diff --git a/app/Models/QuoteInvitation.php b/app/Models/QuoteInvitation.php index f3b4199a9c3e..fcd20852f77c 100644 --- a/app/Models/QuoteInvitation.php +++ b/app/Models/QuoteInvitation.php @@ -54,25 +54,6 @@ use Illuminate\Support\Facades\Storage; * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation onlyTrashed() * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation query() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope() - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereClientContactId($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereCompanyId($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereCreatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereDeletedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereEmailError($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereEmailStatus($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereKey($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereMessageId($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereOpenedDate($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereQuoteId($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereSentDate($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereSignatureBase64($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereSignatureDate($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereSignatureIp($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereTransactionReference($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereUpdatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereUserId($value) - * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereViewedDate($value) * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation withoutTrashed() * @mixin \Eloquent diff --git a/app/Models/Scheduler.php b/app/Models/Scheduler.php index ed58d0bea43f..dccd68bb4fab 100644 --- a/app/Models/Scheduler.php +++ b/app/Models/Scheduler.php @@ -20,19 +20,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * App\Models\Scheduler * - * @property bool paused - * @property bool is_deleted - * @property \Carbon\Carbon|mixed start_from - * @property int frequency_id - * @property \Carbon\Carbon|mixed next_run - * @property int company_id - * @property int updated_at - * @property int created_at - * @property int deleted_at - * @property string action_name - * @property mixed company - * @property array parameters - * @property string action_class * @property int $id * @property bool $is_deleted * @property int|null $created_at @@ -42,7 +29,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property int $company_id * @property bool $is_paused * @property int|null $frequency_id - * @property \Illuminate\Support\Carbon|null $next_run * @property \Illuminate\Support\Carbon|null $next_run_client * @property int $user_id * @property string $name @@ -59,21 +45,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|Scheduler onlyTrashed() * @method static \Illuminate\Database\Eloquent\Builder|Scheduler query() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope() - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereCompanyId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereCreatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereDeletedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereFrequencyId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereIsDeleted($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereIsPaused($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereName($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereNextRun($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereNextRunClient($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereParameters($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereRemainingCycles($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereTemplate($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereUpdatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|Scheduler withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|Scheduler withoutTrashed() * @property-read \App\Models\User $user From 47ba507c1b6664a4dd37c45db0f3e9af55446360 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Jul 2023 12:59:36 +1000 Subject: [PATCH 02/11] Fixes for static analysis --- app/Filters/BankTransactionFilters.php | 2 +- app/Filters/BankTransactionRuleFilters.php | 2 +- app/Filters/QueryFilters.php | 1 - app/Filters/QuoteFilters.php | 2 +- app/Filters/RecurringExpenseFilters.php | 2 +- .../BankTransactionRuleController.php | 29 ++++++------ app/Http/Controllers/ClientController.php | 4 +- .../ClientPortal/PaymentController.php | 2 +- .../ClientPortal/PaymentMethodController.php | 4 +- .../ClientPortal/QuoteController.php | 1 - .../ClientPortal/StatementController.php | 2 +- .../ConnectedAccountController.php | 2 +- .../Controllers/Contact/LoginController.php | 2 +- app/Http/Controllers/CreditController.php | 2 +- app/Http/Controllers/InvoiceController.php | 2 +- app/Http/Controllers/PaymentController.php | 2 +- .../Controllers/PaymentTermController.php | 2 +- app/Http/Controllers/ProductController.php | 2 +- .../Controllers/PurchaseOrderController.php | 2 +- app/Http/Controllers/QuoteController.php | 2 +- .../Controllers/RecurringQuoteController.php | 2 +- .../Controllers/SubscriptionController.php | 16 +++---- app/Http/Controllers/UserController.php | 2 +- app/Http/Controllers/WebCronController.php | 2 +- .../Quotes/ProcessQuotesInBulkRequest.php | 1 + .../UpdateGroupSettingRequest.php | 2 +- app/Jobs/Company/CompanyExport.php | 2 +- app/Libraries/OAuth/OAuth.php | 2 +- app/Models/ClientContact.php | 9 ---- app/Models/CompanyGateway.php | 44 +------------------ app/Models/CompanyToken.php | 11 ----- app/Models/Invoice.php | 10 ----- app/Models/Scheduler.php | 3 +- app/Models/Traits/Excludable.php | 4 +- .../CheckoutComPaymentDriver.php | 4 +- app/PaymentDrivers/GoCardless/ACH.php | 2 +- app/PaymentDrivers/GoCardless/DirectDebit.php | 2 +- app/PaymentDrivers/GoCardless/SEPA.php | 2 +- app/PaymentDrivers/Mollie/Bancontact.php | 2 +- app/PaymentDrivers/Mollie/BankTransfer.php | 2 +- app/PaymentDrivers/Mollie/IDEAL.php | 2 +- app/PaymentDrivers/Mollie/KBC.php | 2 +- app/PaymentDrivers/Razorpay/Hosted.php | 4 +- app/PaymentDrivers/Square/CreditCard.php | 2 +- app/PaymentDrivers/WePayPaymentDriver.php | 2 +- app/Services/Credit/CreditService.php | 2 +- app/Transformers/ClientTransformer.php | 4 +- app/Transformers/ProductTransformer.php | 4 +- app/Transformers/VendorTransformer.php | 4 +- 49 files changed, 74 insertions(+), 145 deletions(-) diff --git a/app/Filters/BankTransactionFilters.php b/app/Filters/BankTransactionFilters.php index 41a558931e99..15c02a7b9768 100644 --- a/app/Filters/BankTransactionFilters.php +++ b/app/Filters/BankTransactionFilters.php @@ -151,7 +151,7 @@ class BankTransactionFilters extends QueryFilters /** * Filters the query by the users company ID. * - * @return Illuminate\Database\Query\Builder + * @return \Illuminate\Database\Eloquent\Builder */ public function entityFilter() { diff --git a/app/Filters/BankTransactionRuleFilters.php b/app/Filters/BankTransactionRuleFilters.php index d19e49371474..d7c4a83bb387 100644 --- a/app/Filters/BankTransactionRuleFilters.php +++ b/app/Filters/BankTransactionRuleFilters.php @@ -71,7 +71,7 @@ class BankTransactionRuleFilters extends QueryFilters /** * Filters the query by the users company ID. * - * @return Illuminate\Database\Query\Builder + * @return \Illuminate\Database\Eloquent\Builder */ public function entityFilter() { diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php index 036b7a892ed0..e0da087a8442 100644 --- a/app/Filters/QueryFilters.php +++ b/app/Filters/QueryFilters.php @@ -11,7 +11,6 @@ namespace App\Filters; -//use Illuminate\Database\Query\Builder; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php index 2befad099495..1cb0bed3a999 100644 --- a/app/Filters/QuoteFilters.php +++ b/app/Filters/QuoteFilters.php @@ -152,7 +152,7 @@ class QuoteFilters extends QueryFilters /** * Filters the query by the users company ID. * - * @return Illuminate\Eloquent\Query\Builder + * @return \Illuminate\Database\Eloquent\Builder */ public function entityFilter(): Builder { diff --git a/app/Filters/RecurringExpenseFilters.php b/app/Filters/RecurringExpenseFilters.php index 95a293c5274b..35d2afd0c99a 100644 --- a/app/Filters/RecurringExpenseFilters.php +++ b/app/Filters/RecurringExpenseFilters.php @@ -69,7 +69,7 @@ class RecurringExpenseFilters extends QueryFilters /** * Filters the query by the users company ID. * - * @return Illuminate\Eloquent\Builder + * @return \Illuminate\Database\Eloquent\Builder */ public function entityFilter(): Builder { diff --git a/app/Http/Controllers/BankTransactionRuleController.php b/app/Http/Controllers/BankTransactionRuleController.php index 822a3cdc5165..a5a918743138 100644 --- a/app/Http/Controllers/BankTransactionRuleController.php +++ b/app/Http/Controllers/BankTransactionRuleController.php @@ -11,20 +11,21 @@ namespace App\Http\Controllers; -use App\Factory\BankTransactionRuleFactory; +use App\Utils\Traits\MakesHash; +use Illuminate\Support\Collection; +use App\Models\BankTransactionRule; use App\Filters\BankTransactionFilters; +use App\Factory\BankTransactionRuleFactory; use App\Filters\BankTransactionRuleFilters; +use App\Repositories\BankTransactionRuleRepository; +use App\Transformers\BankTransactionRuleTransformer; use App\Http\Requests\BankTransactionRule\BulkBankTransactionRuleRequest; -use App\Http\Requests\BankTransactionRule\CreateBankTransactionRuleRequest; -use App\Http\Requests\BankTransactionRule\DestroyBankTransactionRuleRequest; use App\Http\Requests\BankTransactionRule\EditBankTransactionRuleRequest; use App\Http\Requests\BankTransactionRule\ShowBankTransactionRuleRequest; use App\Http\Requests\BankTransactionRule\StoreBankTransactionRuleRequest; +use App\Http\Requests\BankTransactionRule\CreateBankTransactionRuleRequest; use App\Http\Requests\BankTransactionRule\UpdateBankTransactionRuleRequest; -use App\Models\BankTransactionRule; -use App\Repositories\BankTransactionRuleRepository; -use App\Transformers\BankTransactionRuleTransformer; -use App\Utils\Traits\MakesHash; +use App\Http\Requests\BankTransactionRule\DestroyBankTransactionRuleRequest; class BankTransactionRuleController extends BaseController { @@ -99,7 +100,7 @@ class BankTransactionRuleController extends BaseController * * @param ShowBankTransactionRuleRequest $request * @param BankTransactionRule $bank_transaction_rule - * @return Response + * @return \Illuminate\Http\JsonResponse * * * @OA\Get( @@ -154,7 +155,7 @@ class BankTransactionRuleController extends BaseController * * @param EditBankTransactionRuleRequest $request * @param BankTransactionRule $bank_transaction_rule - * @return Response + * @return \Illuminate\Http\JsonResponse * * * @OA\Get( @@ -208,7 +209,7 @@ class BankTransactionRuleController extends BaseController * * @param UpdateBankTransactionRuleRequest $request * @param BankTransactionRule $bank_transaction_rule - * @return Response + * @return \Illuminate\Http\JsonResponse * * * @@ -265,7 +266,7 @@ class BankTransactionRuleController extends BaseController * Show the form for creating a new resource. * * @param CreateBankTransactionRuleRequest $request - * @return Response + * @return \Illuminate\Http\JsonResponse * * * @@ -310,7 +311,7 @@ class BankTransactionRuleController extends BaseController * Store a newly created resource in storage. * * @param StoreBankTransactionRuleRequest $request - * @return Response + * @return \Illuminate\Http\JsonResponse * * * @@ -357,7 +358,7 @@ class BankTransactionRuleController extends BaseController * * @param DestroyBankTransactionRuleRequest $request * @param BankTransactionRule $bank_transaction_rule - * @return Response + * @return \Illuminate\Http\JsonResponse * * * @throws \Exception @@ -412,7 +413,7 @@ class BankTransactionRuleController extends BaseController /** * Perform bulk actions on the list view. * - * @return Collection + * @return \Illuminate\Support\Collection * * @OA\Post( * path="/api/v1/bank_transation_rules/bulk", diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index f86e69f3f27c..59c6d5c576dd 100644 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -238,7 +238,7 @@ class ClientController extends BaseController * * @param PurgeClientRequest $request * @param Client $client - * @return Response + * @return \Illuminate\Http\JsonResponse * */ public function purge(PurgeClientRequest $request, Client $client) @@ -266,7 +266,7 @@ class ClientController extends BaseController * @param PurgeClientRequest $request * @param Client $client * @param string $mergeable_client - * @return Response + * @return \Illuminate\Http\JsonResponse * */ diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php index 8c726b97dec0..826fb9fb15ff 100644 --- a/app/Http/Controllers/ClientPortal/PaymentController.php +++ b/app/Http/Controllers/ClientPortal/PaymentController.php @@ -143,7 +143,7 @@ class PaymentController extends Controller * Pay for invoice/s using credits only. * * @param Request $request The request object - * @return Response The response view + * @return \Response The response view */ public function credit_response(Request $request) { diff --git a/app/Http/Controllers/ClientPortal/PaymentMethodController.php b/app/Http/Controllers/ClientPortal/PaymentMethodController.php index a590276c8a0d..9e63cf22cd7c 100644 --- a/app/Http/Controllers/ClientPortal/PaymentMethodController.php +++ b/app/Http/Controllers/ClientPortal/PaymentMethodController.php @@ -48,7 +48,7 @@ class PaymentMethodController extends Controller * Show the form for creating a new resource. * * @param CreatePaymentMethodRequest $request - * @return Response + * @return \Illuminate\View\View */ public function create(CreatePaymentMethodRequest $request) { @@ -67,7 +67,7 @@ class PaymentMethodController extends Controller * Store a newly created resource in storage. * * @param Request $request - * @return Response + * @return \Illuminate\View\View */ public function store(Request $request) { diff --git a/app/Http/Controllers/ClientPortal/QuoteController.php b/app/Http/Controllers/ClientPortal/QuoteController.php index dd56ca5edd0e..1b36166538d4 100644 --- a/app/Http/Controllers/ClientPortal/QuoteController.php +++ b/app/Http/Controllers/ClientPortal/QuoteController.php @@ -78,7 +78,6 @@ class QuoteController extends Controller public function bulk(ProcessQuotesInBulkRequest $request) { $transformed_ids = $this->transformKeys($request->quotes); - nlog(request()->all()); if ($request->action == 'download') { return $this->downloadQuotes((array) $transformed_ids); diff --git a/app/Http/Controllers/ClientPortal/StatementController.php b/app/Http/Controllers/ClientPortal/StatementController.php index 0720e8d52a1d..7ed81d48fed3 100644 --- a/app/Http/Controllers/ClientPortal/StatementController.php +++ b/app/Http/Controllers/ClientPortal/StatementController.php @@ -23,7 +23,7 @@ class StatementController extends Controller /** * Show the statement in the client portal. * - * @return View + * @return \Illuminate\View\View */ public function index(): View { diff --git a/app/Http/Controllers/ConnectedAccountController.php b/app/Http/Controllers/ConnectedAccountController.php index 892867e98078..6e2031587f48 100644 --- a/app/Http/Controllers/ConnectedAccountController.php +++ b/app/Http/Controllers/ConnectedAccountController.php @@ -38,7 +38,7 @@ class ConnectedAccountController extends BaseController * Connect an OAuth account to a regular email/password combination account * * @param Request $request - * @return JsonResponse. + * @return \Illuminate\Http\JsonResponse * * * @OA\Post( diff --git a/app/Http/Controllers/Contact/LoginController.php b/app/Http/Controllers/Contact/LoginController.php index 3ecc364402ba..3ab4ea8d78b3 100644 --- a/app/Http/Controllers/Contact/LoginController.php +++ b/app/Http/Controllers/Contact/LoginController.php @@ -58,7 +58,7 @@ class LoginController extends BaseController * * @param Request $request The request * - * @return Response|User Process user login. + * @return \Illuminate\Http\JsonResponse * @throws \Illuminate\Validation\ValidationException */ public function apiLogin(Request $request) diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php index bff1ac302f19..1e33151d3af5 100644 --- a/app/Http/Controllers/CreditController.php +++ b/app/Http/Controllers/CreditController.php @@ -447,7 +447,7 @@ class CreditController extends BaseController /** * Perform bulk actions on the list view. * - * @return Collection + * @return \Illuminate\Support\Collection * * @OA\Post( * path="/api/v1/credits/bulk", diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 81556fc531af..636f0479531b 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -476,7 +476,7 @@ class InvoiceController extends BaseController /** * Perform bulk actions on the list view. * - * @return Collection + * @return \Illuminate\Support\Collection * * @OA\Post( * path="/api/v1/invoices/bulk", diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index ea9838358515..f747741342fb 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -445,7 +445,7 @@ class PaymentController extends BaseController /** * Perform bulk actions on the list view. * - * @return Collection + * @return \Illuminate\Support\Collection * * * @OA\Post( diff --git a/app/Http/Controllers/PaymentTermController.php b/app/Http/Controllers/PaymentTermController.php index 6cf732a885d7..0864dc9e4ee4 100644 --- a/app/Http/Controllers/PaymentTermController.php +++ b/app/Http/Controllers/PaymentTermController.php @@ -397,7 +397,7 @@ class PaymentTermController extends BaseController /** * Perform bulk actions on the list view. * - * @return Collection + * @return \Illuminate\Support\Collection * * * @OA\Post( diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index f747d25a967d..5f4a4b38f150 100644 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -408,7 +408,7 @@ class ProductController extends BaseController /** * Perform bulk actions on the list view. * - * @return Collection + * @return \Illuminate\Support\Collection * * * @OA\Post( diff --git a/app/Http/Controllers/PurchaseOrderController.php b/app/Http/Controllers/PurchaseOrderController.php index c6892f89a69d..0355355781d6 100644 --- a/app/Http/Controllers/PurchaseOrderController.php +++ b/app/Http/Controllers/PurchaseOrderController.php @@ -427,7 +427,7 @@ class PurchaseOrderController extends BaseController /** * Perform bulk actions on the list view. * - * @return Collection + * @return \Illuminate\Support\Collection * * @OA\Post( * path="/api/v1/purchase_orders/bulk", diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php index bfee11be5a57..1e53d2d46189 100644 --- a/app/Http/Controllers/QuoteController.php +++ b/app/Http/Controllers/QuoteController.php @@ -459,7 +459,7 @@ class QuoteController extends BaseController /** * Perform bulk actions on the list view. * - * @return Collection + * @return \Illuminate\Support\Collection * * * @OA\Post( diff --git a/app/Http/Controllers/RecurringQuoteController.php b/app/Http/Controllers/RecurringQuoteController.php index 114bcf329809..141f8ecf92eb 100644 --- a/app/Http/Controllers/RecurringQuoteController.php +++ b/app/Http/Controllers/RecurringQuoteController.php @@ -429,7 +429,7 @@ class RecurringQuoteController extends BaseController /** * Perform bulk actions on the list view. * - * @return Collection + * @return \Illuminate\Support\Collection * * * @OA\Post( diff --git a/app/Http/Controllers/SubscriptionController.php b/app/Http/Controllers/SubscriptionController.php index 12b855722281..55b3ea375756 100644 --- a/app/Http/Controllers/SubscriptionController.php +++ b/app/Http/Controllers/SubscriptionController.php @@ -48,7 +48,7 @@ class SubscriptionController extends BaseController /** * Show the list of Subscriptions. * - * @return Response + * @return \Illuminate\Http\JsonResponse * * @OA\Get( * path="/api/v1/subscriptions", @@ -92,7 +92,7 @@ class SubscriptionController extends BaseController * * @param CreateSubscriptionRequest $request The request * - * @return Response + * @return \Illuminate\Http\JsonResponse * * * @OA\Get( @@ -137,7 +137,7 @@ class SubscriptionController extends BaseController * * @param StoreSubscriptionRequest $request The request * - * @return Response + * @return \Illuminate\Http\JsonResponse * * * @OA\Post( @@ -185,7 +185,7 @@ class SubscriptionController extends BaseController * @param ShowSubscriptionRequest $request The request * @param Invoice $subscription The invoice * - * @return Response + * @return \Illuminate\Http\JsonResponse * * * @OA\Get( @@ -240,7 +240,7 @@ class SubscriptionController extends BaseController * @param EditSubscriptionRequest $request The request * @param Invoice $subscription The invoice * - * @return Response + * @return \Illuminate\Http\JsonResponse * * @OA\Get( * path="/api/v1/subscriptions/{id}/edit", @@ -294,7 +294,7 @@ class SubscriptionController extends BaseController * @param UpdateSubscriptionRequest $request The request * @param Subscription $subscription The invoice * - * @return Response + * @return \Illuminate\Http\JsonResponse * * * @OA\Put( @@ -357,7 +357,7 @@ class SubscriptionController extends BaseController * @param DestroySubscriptionRequest $request * @param Subscription $invoice * - * @return Response + * @return \Illuminate\Http\JsonResponse * * @throws \Exception * @OA\Delete( @@ -410,7 +410,7 @@ class SubscriptionController extends BaseController /** * Perform bulk actions on the list view. * - * @return Response + * @return \Illuminate\Support\Collection * * * @OA\Post( diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 0e8d01b9527e..9541d785c6e1 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -189,7 +189,7 @@ class UserController extends BaseController * * @param DestroyUserRequest $request * @param User $user - * @return JsonResponse | Response + * @return \Illuminate\Http\JsonResponse * */ public function destroy(DestroyUserRequest $request, User $user) diff --git a/app/Http/Controllers/WebCronController.php b/app/Http/Controllers/WebCronController.php index c9607ba4fdec..9c774c62f80d 100644 --- a/app/Http/Controllers/WebCronController.php +++ b/app/Http/Controllers/WebCronController.php @@ -23,7 +23,7 @@ class WebCronController extends Controller /** * Store a newly created resource in storage. * - * @return Response + * @return \Illuminate\Http\JsonResponse * * @OA\Get( * path="/webcron", diff --git a/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php b/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php index 74ae621895ea..f827d7beb9d3 100644 --- a/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php +++ b/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php @@ -27,6 +27,7 @@ class ProcessQuotesInBulkRequest extends FormRequest { return [ 'quotes' => ['array'], + 'action' => 'sometimes', ]; } } diff --git a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php index 1c429fc40e94..09540e878026 100644 --- a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php @@ -55,7 +55,7 @@ class UpdateGroupSettingRequest extends Request * are saveable * * @param object $settings - * @return stdClass $settings + * @return array $settings */ private function filterSaveableSettings($settings) { diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php index 2b89028e8a1c..080ef471c8b3 100644 --- a/app/Jobs/Company/CompanyExport.php +++ b/app/Jobs/Company/CompanyExport.php @@ -59,7 +59,7 @@ class CompanyExport implements ShouldQueue /** * Execute the job. * - * @return CompanyToken|null + * @return void */ public function handle() { diff --git a/app/Libraries/OAuth/OAuth.php b/app/Libraries/OAuth/OAuth.php index 9b75ebc7d967..59582bad187f 100644 --- a/app/Libraries/OAuth/OAuth.php +++ b/app/Libraries/OAuth/OAuth.php @@ -41,7 +41,7 @@ class OAuth /** * @param Socialite $user - * @return bool|\App\Models\User|\App\Libraries\App\Models\User|null + * @return bool | \App\Models\User | \App\Models\User | null */ public static function handleAuth($socialite_user, $provider) { diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php index 8c9d40d8c4ab..8dc2cf9d41ab 100644 --- a/app/Models/ClientContact.php +++ b/app/Models/ClientContact.php @@ -68,17 +68,12 @@ use Laracasts\Presenter\PresentableTrait; * @property int|null $deleted_at * @property-read \App\Models\Client $client * @property-read \App\Models\Company $company - * @property-read \Illuminate\Database\Eloquent\Collection $credit_invitations * @property-read int|null $credit_invitations_count * @property-read mixed $contact_id * @property-read mixed $hashed_id - * @property-read \Illuminate\Database\Eloquent\Collection $invoice_invitations * @property-read int|null $invoice_invitations_count - * @property-read \Illuminate\Notifications\DatabaseNotificationCollection $notifications * @property-read int|null $notifications_count - * @property-read \Illuminate\Database\Eloquent\Collection $quote_invitations * @property-read int|null $quote_invitations_count - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoice_invitations * @property-read int|null $recurring_invoice_invitations_count * @property-read \App\Models\User $user * @method static \Illuminate\Database\Eloquent\Builder|ClientContact company() @@ -89,15 +84,11 @@ use Laracasts\Presenter\PresentableTrait; * @method static \Illuminate\Database\Eloquent\Builder|ClientContact query() * @method static \Illuminate\Database\Eloquent\Builder|ClientContact withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|ClientContact withoutTrashed() - * @property-read \Illuminate\Database\Eloquent\Collection $credit_invitations - * @property-read \Illuminate\Database\Eloquent\Collection $invoice_invitations * @property-read \Illuminate\Notifications\DatabaseNotificationCollection $notifications * @property-read \Illuminate\Database\Eloquent\Collection $quote_invitations * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoice_invitations * @property-read \Illuminate\Database\Eloquent\Collection $credit_invitations * @property-read \Illuminate\Database\Eloquent\Collection $invoice_invitations - * @property-read \Illuminate\Database\Eloquent\Collection $client - * @mixin \Eloquent */ class ClientContact extends Authenticatable implements HasLocalePreference diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php index fa5de69aee3a..79d5b133798f 100644 --- a/app/Models/CompanyGateway.php +++ b/app/Models/CompanyGateway.php @@ -28,7 +28,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property int|null $update_details * @property int $is_deleted * @property string $config - * @property mixed $fees_and_limits + * @property object $fees_and_limits * @property string|null $custom_value1 * @property string|null $custom_value2 * @property string|null $custom_value3 @@ -47,7 +47,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property int $require_custom_value2 * @property int $require_custom_value3 * @property int $require_custom_value4 - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens * @property-read int|null $client_gateway_tokens_count * @property-read \App\Models\Company $company * @property-read \App\Models\Gateway $gateway @@ -60,51 +59,10 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway onlyTrashed() * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway query() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope() - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereAcceptedCreditCards($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCompanyId($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereConfig($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCreatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCustomValue1($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCustomValue2($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCustomValue3($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCustomValue4($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereDeletedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereFeesAndLimits($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereGatewayKey($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereIsDeleted($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereLabel($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireBillingAddress($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireClientName($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireClientPhone($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireContactEmail($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireContactName($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCustomValue1($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCustomValue2($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCustomValue3($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCustomValue4($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCvv($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequirePostalCode($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireShippingAddress($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereTokenBilling($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereUpdateDetails($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereUpdatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway withoutTrashed() * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway find() * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens * @mixin \Eloquent */ class CompanyGateway extends BaseModel diff --git a/app/Models/CompanyToken.php b/app/Models/CompanyToken.php index d4b879a9eb23..9366310cb784 100644 --- a/app/Models/CompanyToken.php +++ b/app/Models/CompanyToken.php @@ -40,17 +40,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken onlyTrashed() * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken query() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope() - * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereAccountId($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereCompanyId($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereCreatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereDeletedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereIsDeleted($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereIsSystem($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereName($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereToken($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereUpdatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken withoutTrashed() * @mixin \Eloquent diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index 6d7c1539a74d..57660005f644 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -97,36 +97,27 @@ use App\Events\Invoice\InvoiceReminderWasEmailed; * @property int|null $subscription_id * @property int $auto_bill_tries * @property bool $is_proforma - * @property-read \Illuminate\Database\Eloquent\Collection $activities * @property-read int|null $activities_count * @property-read \App\Models\User|null $assigned_user * @property-read \App\Models\Client $client * @property-read \App\Models\Company $company - * @property-read \Illuminate\Database\Eloquent\Collection $company_ledger * @property-read int|null $company_ledger_count - * @property-read \Illuminate\Database\Eloquent\Collection $credits * @property-read int|null $credits_count * @property-read \App\Models\Design|null $design - * @property-read \Illuminate\Database\Eloquent\Collection $documents * @property-read int|null $documents_count * @property-read \App\Models\Expense|null $expense - * @property-read \Illuminate\Database\Eloquent\Collection $expenses * @property-read int|null $expenses_count * @property-read mixed $balance_due * @property-read mixed $hashed_id * @property-read mixed $status * @property-read mixed $total - * @property-read \Illuminate\Database\Eloquent\Collection $history * @property-read int|null $history_count - * @property-read \Illuminate\Database\Eloquent\Collection $invitations * @property-read int|null $invitations_count - * @property-read \Illuminate\Database\Eloquent\Collection $payments * @property-read int|null $payments_count * @property-read \App\Models\Project|null $project * @property-read \App\Models\RecurringInvoice|null $recurring_invoice * @property-read \App\Models\Subscription|null $subscription * @property-read \App\Models\Task|null $task - * @property-read \Illuminate\Database\Eloquent\Collection $tasks * @property-read int|null $tasks_count * @property-read \App\Models\User $user * @property-read \App\Models\Vendor|null $vendor @@ -150,7 +141,6 @@ use App\Events\Invoice\InvoiceReminderWasEmailed; * @property-read \Illuminate\Database\Eloquent\Collection $invitations * @property-read \Illuminate\Database\Eloquent\Collection $payments * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $invoice * @property object|null $tax_data * @mixin \Eloquent */ diff --git a/app/Models/Scheduler.php b/app/Models/Scheduler.php index dccd68bb4fab..76f17cf55259 100644 --- a/app/Models/Scheduler.php +++ b/app/Models/Scheduler.php @@ -29,7 +29,8 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property int $company_id * @property bool $is_paused * @property int|null $frequency_id - * @property \Illuminate\Support\Carbon|null $next_run_client + * @property \Carbon\Carbon|\Illuminate\Support\Carbon|null $next_run_client + * @property \Carbon\Carbon|\Illuminate\Support\Carbon|null $next_run * @property int $user_id * @property string $name * @property string $template diff --git a/app/Models/Traits/Excludable.php b/app/Models/Traits/Excludable.php index 55249c56dede..272c5e7cc8c4 100644 --- a/app/Models/Traits/Excludable.php +++ b/app/Models/Traits/Excludable.php @@ -33,10 +33,10 @@ trait Excludable /** * Exclude an array of elements from the result. - * @param Builder $query + * @param \Illuminate\Database\Eloquent\Builder $query * @param array $columns * - * @return Builder + * @return \Illuminate\Database\Eloquent\Builder */ public function scopeExclude($query, $columns): \Illuminate\Database\Eloquent\Builder { diff --git a/app/PaymentDrivers/CheckoutComPaymentDriver.php b/app/PaymentDrivers/CheckoutComPaymentDriver.php index 6306ec230fa5..719e0119c42b 100644 --- a/app/PaymentDrivers/CheckoutComPaymentDriver.php +++ b/app/PaymentDrivers/CheckoutComPaymentDriver.php @@ -168,7 +168,7 @@ class CheckoutComPaymentDriver extends BaseDriver * Payment View * * @param array $data Payment data array - * @return view The payment view + * @return \Illuminate\View\View */ public function processPaymentView(array $data) { @@ -179,7 +179,7 @@ class CheckoutComPaymentDriver extends BaseDriver * Process the payment response * * @param Request $request The payment request - * @return view The payment response view + * @return \Illuminate\View\View */ public function processPaymentResponse($request) { diff --git a/app/PaymentDrivers/GoCardless/ACH.php b/app/PaymentDrivers/GoCardless/ACH.php index 66e24ba2dc3e..9819a08b4fc8 100644 --- a/app/PaymentDrivers/GoCardless/ACH.php +++ b/app/PaymentDrivers/GoCardless/ACH.php @@ -142,7 +142,7 @@ class ACH implements MethodInterface * Show the payment page for ACH. * * @param array $data - * @return View + * @return \Illuminate\View\View */ public function paymentView(array $data): View { diff --git a/app/PaymentDrivers/GoCardless/DirectDebit.php b/app/PaymentDrivers/GoCardless/DirectDebit.php index c7e6d04b0876..94328a537e5c 100644 --- a/app/PaymentDrivers/GoCardless/DirectDebit.php +++ b/app/PaymentDrivers/GoCardless/DirectDebit.php @@ -242,7 +242,7 @@ class DirectDebit implements MethodInterface * Payment view for Direct Debit. * * @param array $data - * @return View + * @return \Illuminate\View\View */ public function paymentView(array $data): View { diff --git a/app/PaymentDrivers/GoCardless/SEPA.php b/app/PaymentDrivers/GoCardless/SEPA.php index 1a96bcc9fcde..4ea488618282 100644 --- a/app/PaymentDrivers/GoCardless/SEPA.php +++ b/app/PaymentDrivers/GoCardless/SEPA.php @@ -141,7 +141,7 @@ class SEPA implements MethodInterface * Payment view for SEPA. * * @param array $data - * @return View + * @return \Illuminate\View\View */ public function paymentView(array $data): View { diff --git a/app/PaymentDrivers/Mollie/Bancontact.php b/app/PaymentDrivers/Mollie/Bancontact.php index 444578ad7cf4..8aaed1bd615a 100644 --- a/app/PaymentDrivers/Mollie/Bancontact.php +++ b/app/PaymentDrivers/Mollie/Bancontact.php @@ -40,7 +40,7 @@ class Bancontact implements MethodInterface * Show the authorization page for Bancontact. * * @param array $data - * @return View + * @return \Illuminate\View\View */ public function authorizeView(array $data): View { diff --git a/app/PaymentDrivers/Mollie/BankTransfer.php b/app/PaymentDrivers/Mollie/BankTransfer.php index d61df46806a7..01cfc9c3c718 100644 --- a/app/PaymentDrivers/Mollie/BankTransfer.php +++ b/app/PaymentDrivers/Mollie/BankTransfer.php @@ -43,7 +43,7 @@ class BankTransfer implements MethodInterface * Show the authorization page for bank transfer. * * @param array $data - * @return View + * @return \Illuminate\View\View */ public function authorizeView(array $data): View { diff --git a/app/PaymentDrivers/Mollie/IDEAL.php b/app/PaymentDrivers/Mollie/IDEAL.php index 1efd1397f1f8..3e40df10b049 100644 --- a/app/PaymentDrivers/Mollie/IDEAL.php +++ b/app/PaymentDrivers/Mollie/IDEAL.php @@ -40,7 +40,7 @@ class IDEAL implements MethodInterface * Show the authorization page for iDEAL. * * @param array $data - * @return View + * @return \Illuminate\View\View */ public function authorizeView(array $data): View { diff --git a/app/PaymentDrivers/Mollie/KBC.php b/app/PaymentDrivers/Mollie/KBC.php index 75cb0dcac86e..6d34591064bc 100644 --- a/app/PaymentDrivers/Mollie/KBC.php +++ b/app/PaymentDrivers/Mollie/KBC.php @@ -40,7 +40,7 @@ class KBC implements MethodInterface * Show the authorization page for KBC. * * @param array $data - * @return View + * @return \Illuminate\View\View */ public function authorizeView(array $data): View { diff --git a/app/PaymentDrivers/Razorpay/Hosted.php b/app/PaymentDrivers/Razorpay/Hosted.php index 24493c780b22..1d5b42358a7d 100644 --- a/app/PaymentDrivers/Razorpay/Hosted.php +++ b/app/PaymentDrivers/Razorpay/Hosted.php @@ -41,7 +41,7 @@ class Hosted implements MethodInterface * Show the authorization page for Razorpay. * * @param array $data - * @return View + * @return \Illuminate\View\View */ public function authorizeView(array $data): View { @@ -63,7 +63,7 @@ class Hosted implements MethodInterface * Payment view for the Razorpay. * * @param array $data - * @return View + * @return \Illuminate\View\View */ public function paymentView(array $data): View { diff --git a/app/PaymentDrivers/Square/CreditCard.php b/app/PaymentDrivers/Square/CreditCard.php index 923d47eb4483..1cec62101c90 100644 --- a/app/PaymentDrivers/Square/CreditCard.php +++ b/app/PaymentDrivers/Square/CreditCard.php @@ -43,7 +43,7 @@ class CreditCard implements MethodInterface * Authorization page for credit card. * * @param array $data - * @return View + * @return \Illuminate\View\View */ public function authorizeView($data): View { diff --git a/app/PaymentDrivers/WePayPaymentDriver.php b/app/PaymentDrivers/WePayPaymentDriver.php index fde608b67937..199a48303ae8 100644 --- a/app/PaymentDrivers/WePayPaymentDriver.php +++ b/app/PaymentDrivers/WePayPaymentDriver.php @@ -89,7 +89,7 @@ class WePayPaymentDriver extends BaseDriver * Setup the gateway * * @param array $data user_id + company - * @return view + * @return \Illuminate\View\View */ public function setup(array $data) { diff --git a/app/Services/Credit/CreditService.php b/app/Services/Credit/CreditService.php index 811ea7e4cf45..648bed322e1c 100644 --- a/app/Services/Credit/CreditService.php +++ b/app/Services/Credit/CreditService.php @@ -183,7 +183,7 @@ class CreditService /** * Sometimes we need to refresh the * PDF when it is updated etc. - * @return InvoiceService + * @return self */ public function touchPdf($force = false) { diff --git a/app/Transformers/ClientTransformer.php b/app/Transformers/ClientTransformer.php index 047df00a3cf9..07b683fa8f34 100644 --- a/app/Transformers/ClientTransformer.php +++ b/app/Transformers/ClientTransformer.php @@ -47,7 +47,7 @@ class ClientTransformer extends EntityTransformer /** * @param Client $client * - * @return Collection + * @return \Illuminate\Support\Collection */ public function includeActivities(Client $client) { @@ -66,7 +66,7 @@ class ClientTransformer extends EntityTransformer /** * @param Client $client * - * @return Collection + * @return \Illuminate\Support\Collection */ public function includeContacts(Client $client) { diff --git a/app/Transformers/ProductTransformer.php b/app/Transformers/ProductTransformer.php index 797c3408fbe2..7ed02a233736 100644 --- a/app/Transformers/ProductTransformer.php +++ b/app/Transformers/ProductTransformer.php @@ -37,7 +37,7 @@ class ProductTransformer extends EntityTransformer /** * @param Product $product * - * @return Collection + * @return \Illuminate\Support\Collection */ public function includeUser(Product $product) { @@ -49,7 +49,7 @@ class ProductTransformer extends EntityTransformer /** * @param Product $product * - * @return Collection + * @return \Illuminate\Support\Collection */ public function includeCompany(Product $product) { diff --git a/app/Transformers/VendorTransformer.php b/app/Transformers/VendorTransformer.php index 029ad416e6ca..f2acf862afcd 100644 --- a/app/Transformers/VendorTransformer.php +++ b/app/Transformers/VendorTransformer.php @@ -40,7 +40,7 @@ class VendorTransformer extends EntityTransformer /** * @param Vendor $vendor * - * @return Collection + * @return \Illuminate\Support\Collection */ public function includeActivities(Vendor $vendor) { @@ -52,7 +52,7 @@ class VendorTransformer extends EntityTransformer /** * @param Vendor $vendor * - * @return Collection + * @return \Illuminate\Support\Collection */ public function includeContacts(Vendor $vendor) { From adc72af6ff8f6c6bc17fd972db25707330435bd8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Jul 2023 13:13:16 +1000 Subject: [PATCH 03/11] Remove references to file paths --- .../ClientPortal/EntityViewController.php | 4 ---- .../ninja2020/components/pdf-viewer.blade.php | 18 ------------------ .../credits/show-fullscreen.blade.php | 4 +--- .../portal/ninja2020/credits/show.blade.php | 11 ++--------- .../invoices/show-fullscreen.blade.php | 3 +-- .../purchase_orders/show-fullscreen.blade.php | 3 +-- .../ninja2020/quotes/show-fullscreen.blade.php | 4 +--- .../portal/ninja2020/quotes/show.blade.php | 6 ------ 8 files changed, 6 insertions(+), 47 deletions(-) diff --git a/app/Http/Controllers/ClientPortal/EntityViewController.php b/app/Http/Controllers/ClientPortal/EntityViewController.php index 0d56a4d5666a..e46cf1a8178d 100644 --- a/app/Http/Controllers/ClientPortal/EntityViewController.php +++ b/app/Http/Controllers/ClientPortal/EntityViewController.php @@ -49,10 +49,6 @@ class EntityViewController extends Controller ->with('contact.client') ->firstOrFail(); - // $invitation = $invitation_entity::whereRaw('BINARY `key`= ?', [$invitation_key]) - // ->with('contact.client') - // ->firstOrFail(); - $contact = $invitation->contact; $client = $contact->client; $entity = $invitation->{$entity_type}; diff --git a/resources/views/portal/ninja2020/components/pdf-viewer.blade.php b/resources/views/portal/ninja2020/components/pdf-viewer.blade.php index 8bf2d69be1dd..9c31effb6d11 100644 --- a/resources/views/portal/ninja2020/components/pdf-viewer.blade.php +++ b/resources/views/portal/ninja2020/components/pdf-viewer.blade.php @@ -1,13 +1,3 @@ -@php - //$mobile = stripos(request()->server('HTTP_USER_AGENT'), 'Android') || stripos(request()->server('HTTP_USER_AGENT'), 'iPhone') || stripos(request()->server('HTTP_USER_AGENT'), 'iPod') || stripos(request()->server('HTTP_USER_AGENT'), 'iPad'); - $mobile = false; -@endphp - -@push('head') - -@endpush -
@@ -56,15 +46,7 @@
- @livewire('pdf-slot', ['entity' => $entity, 'invitation' => $invitation, 'db' => $invitation->company->db]) - - - @if($mobile) @push('footer') diff --git a/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php b/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php index 3655bf8f68e4..085e787ee04b 100644 --- a/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php +++ b/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/resources/views/portal/ninja2020/credits/show.blade.php b/resources/views/portal/ninja2020/credits/show.blade.php index 2960a301e3c0..47b093a299f7 100644 --- a/resources/views/portal/ninja2020/credits/show.blade.php +++ b/resources/views/portal/ninja2020/credits/show.blade.php @@ -1,13 +1,6 @@ @extends('portal.ninja2020.layout.app') @section('meta_title', ctrans('texts.view_credit')) -@push('head') - - @include('portal.ninja2020.components.no-cache') - - -@endpush - @section('body')
@@ -31,8 +24,8 @@
- @include('portal.ninja2020.components.entity-documents', ['entity' => $credit]) - @livewire('pdf-slot', ['entity' => $credit, 'invitation' => $invitation, 'db' => $invitation->company->db]) +@include('portal.ninja2020.components.entity-documents', ['entity' => $credit]) +@livewire('pdf-slot', ['entity' => $credit, 'invitation' => $invitation, 'db' => $invitation->company->db]) @endsection diff --git a/resources/views/portal/ninja2020/invoices/show-fullscreen.blade.php b/resources/views/portal/ninja2020/invoices/show-fullscreen.blade.php index 8de82110754e..bedbdd2d2de2 100644 --- a/resources/views/portal/ninja2020/invoices/show-fullscreen.blade.php +++ b/resources/views/portal/ninja2020/invoices/show-fullscreen.blade.php @@ -1,2 +1 @@ - - + \ No newline at end of file diff --git a/resources/views/portal/ninja2020/purchase_orders/show-fullscreen.blade.php b/resources/views/portal/ninja2020/purchase_orders/show-fullscreen.blade.php index 2aa2bf4b229b..b7805f506e30 100644 --- a/resources/views/portal/ninja2020/purchase_orders/show-fullscreen.blade.php +++ b/resources/views/portal/ninja2020/purchase_orders/show-fullscreen.blade.php @@ -1,2 +1 @@ - - + \ No newline at end of file diff --git a/resources/views/portal/ninja2020/quotes/show-fullscreen.blade.php b/resources/views/portal/ninja2020/quotes/show-fullscreen.blade.php index 22043d045fe8..18d480091a4a 100644 --- a/resources/views/portal/ninja2020/quotes/show-fullscreen.blade.php +++ b/resources/views/portal/ninja2020/quotes/show-fullscreen.blade.php @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/resources/views/portal/ninja2020/quotes/show.blade.php b/resources/views/portal/ninja2020/quotes/show.blade.php index 7a0b9f2c3340..4b981fb5d4c2 100644 --- a/resources/views/portal/ninja2020/quotes/show.blade.php +++ b/resources/views/portal/ninja2020/quotes/show.blade.php @@ -2,15 +2,9 @@ @section('meta_title', ctrans('texts.entity_number_placeholder', ['entity' => ctrans('texts.quote'), 'entity_number' => $quote->number])) @push('head') - - - - - @include('portal.ninja2020.components.no-cache') - @endpush From 2a3c652b0c087f5c180e567bc1cb4706426ccab6 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Jul 2023 13:18:31 +1000 Subject: [PATCH 04/11] Static analysis cleanup --- .../ClientPortal/PaymentController.php | 1 - app/Http/Controllers/InvoiceController.php | 5 -- app/Jobs/RecurringInvoice/SendRecurring.php | 3 -- app/Jobs/Util/ReminderJob.php | 6 --- app/Models/User.php | 54 ------------------- app/Services/Invoice/ApplyPaymentAmount.php | 1 - app/Services/Invoice/MarkSent.php | 1 - 7 files changed, 71 deletions(-) diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php index 826fb9fb15ff..ef3eb52c87ec 100644 --- a/app/Http/Controllers/ClientPortal/PaymentController.php +++ b/app/Http/Controllers/ClientPortal/PaymentController.php @@ -177,7 +177,6 @@ class PaymentController extends Controller if ($invoices->sum('balance') > 0) { $invoice = $invoices->first(); - $invoice->service()->touchPdf(true); return redirect()->route('client.invoice.show', ['invoice' => $invoice->hashed_id, 'hash' => $request->input('hash')]); } diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 636f0479531b..d52068faa310 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -683,7 +683,6 @@ class InvoiceController extends BaseController return $this->itemResponse($quote); - break; case 'history': // code... break; @@ -717,7 +716,6 @@ class InvoiceController extends BaseController echo Storage::get($file); }, basename($file), ['Content-Type' => 'application/pdf']); - break; case 'restore': $this->invoice_repo->restore($invoice); @@ -742,8 +740,6 @@ class InvoiceController extends BaseController break; case 'cancel': $invoice = $invoice->service()->handleCancellation()->deletePdf()->save(); - // $invoice = $invoice->service()->handleCancellation()->touchPdf()->save(); - if (! $bulk) { $this->itemResponse($invoice); } @@ -765,7 +761,6 @@ class InvoiceController extends BaseController default: return response()->json(['message' => ctrans('texts.action_unavailable', ['action' => $action])], 400); - break; } } diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php index 808580736484..c398f0f2d363 100644 --- a/app/Jobs/RecurringInvoice/SendRecurring.php +++ b/app/Jobs/RecurringInvoice/SendRecurring.php @@ -91,9 +91,6 @@ class SendRecurring implements ShouldQueue $invoice = $this->createRecurringInvitations($invoice); - /* 09-01-2022 ensure we create the PDFs at this point in time! */ - $invoice->service()->touchPdf(true); - /* Set next date here to prevent a recurring loop forming */ $this->recurring_invoice->next_send_date = $this->recurring_invoice->nextSendDate(); $this->recurring_invoice->next_send_date_client = $this->recurring_invoice->nextSendDateClient(); diff --git a/app/Jobs/Util/ReminderJob.php b/app/Jobs/Util/ReminderJob.php index 1c10a0a3d5c4..2f80eeb6c628 100644 --- a/app/Jobs/Util/ReminderJob.php +++ b/app/Jobs/Util/ReminderJob.php @@ -205,9 +205,6 @@ class ReminderJob implements ShouldQueue ->markSent() ->save(); - //30-6-2023 - fix for duplicate touching - // $invoice->service()->touchPdf(true); - $enabled_reminder = 'enable_'.$reminder_template; if ($reminder_template == 'endless_reminder') { $enabled_reminder = 'enable_reminder_endless'; @@ -308,14 +305,11 @@ class ReminderJob implements ShouldQueue /**Refresh Invoice values*/ $invoice = $invoice->calc()->getInvoice(); - // $invoice->service()->deletePdf(); 24-11-2022 no need to delete here because we regenerate later anyway nlog('adjusting client balance and invoice balance by #'.$invoice->number.' '.($invoice->balance - $temp_invoice_balance)); $invoice->client->service()->updateBalance($invoice->balance - $temp_invoice_balance); $invoice->ledger()->updateInvoiceBalance($invoice->balance - $temp_invoice_balance, "Late Fee Adjustment for invoice {$invoice->number}"); - $invoice->service()->touchPdf(true); - return $invoice; } } diff --git a/app/Models/User.php b/app/Models/User.php index 9ceb5f9ad2f3..814d501052a1 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -77,16 +77,6 @@ use Illuminate\Foundation\Auth\User as Authenticatable; * @property int $verified_phone_number * @property-read \App\Models\Account $account * @property-read \App\Models\Company $company - * @property-read \Illuminate\Database\Eloquent\Collection $clients - * @property-read int|null $clients_count - * @property-read \Illuminate\Database\Eloquent\Collection $companies - * @property-read int|null $companies_count - * @property-read \Illuminate\Database\Eloquent\Collection $company_users - * @property-read int|null $company_users_count - * @property-read \Illuminate\Database\Eloquent\Collection $contacts - * @property-read int|null $contacts_count - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read int|null $documents_count * @property-read mixed $hashed_id * @property-read \Illuminate\Notifications\DatabaseNotificationCollection $notifications * @property-read int|null $notifications_count @@ -99,53 +89,9 @@ use Illuminate\Foundation\Auth\User as Authenticatable; * @method static \Illuminate\Database\Eloquent\Builder|User onlyTrashed() * @method static \Illuminate\Database\Eloquent\Builder|User query() * @method static \Illuminate\Database\Eloquent\Builder|User where($column, $value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereAcceptedTermsVersion($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereAccountId($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereAvatar($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereAvatarHeight($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereAvatarSize($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereAvatarWidth($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereConfirmationCode($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereCustomValue1($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereCustomValue2($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereCustomValue3($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereCustomValue4($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereDeletedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereDeviceToken($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereEmail($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereEmailVerifiedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereFailedLogins($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereFirstName($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereGoogle2faSecret($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereHasPassword($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereIp($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereIsDeleted($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereLastConfirmedEmailAddress($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereLastLogin($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereLastName($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereOauthProviderId($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereOauthUserId($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereOauthUserRefreshToken($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereOauthUserToken($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereOauthUserTokenExpiry($value) - * @method static \Illuminate\Database\Eloquent\Builder|User wherePassword($value) - * @method static \Illuminate\Database\Eloquent\Builder|User wherePhone($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereReferralCode($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereRememberToken($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereSignature($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereSmsVerificationCode($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereThemeId($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereVerifiedPhoneNumber($value) * @method static \Illuminate\Database\Eloquent\Builder|User withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|User withoutTrashed() - * @property-read \Illuminate\Database\Eloquent\Collection $clients - * @property-read \Illuminate\Database\Eloquent\Collection $companies * @property-read \Illuminate\Database\Eloquent\Collection $company_users - * @property-read \Illuminate\Database\Eloquent\Collection $contacts - * @property-read \Illuminate\Database\Eloquent\Collection $documents * @property-read \Illuminate\Notifications\DatabaseNotificationCollection $notifications * @property-read \Illuminate\Database\Eloquent\Collection $tokens * @method bool hasPermissionTo(string $permission) diff --git a/app/Services/Invoice/ApplyPaymentAmount.php b/app/Services/Invoice/ApplyPaymentAmount.php index 59f7269d9a57..f075a3992b28 100644 --- a/app/Services/Invoice/ApplyPaymentAmount.php +++ b/app/Services/Invoice/ApplyPaymentAmount.php @@ -73,7 +73,6 @@ class ApplyPaymentAmount extends AbstractService ->updatePaidToDate($payment->amount) ->setCalculatedStatus() ->applyNumber() - ->touchPdf() ->save(); $this->invoice diff --git a/app/Services/Invoice/MarkSent.php b/app/Services/Invoice/MarkSent.php index 87c3a89f0664..79c2fa3fbd82 100644 --- a/app/Services/Invoice/MarkSent.php +++ b/app/Services/Invoice/MarkSent.php @@ -50,7 +50,6 @@ class MarkSent extends AbstractService ->service() ->applyNumber() ->setDueDate() - ->touchPdf() ->setReminder() ->save(); From c5071296571729db2ae4e050511a1f62c89aaf91 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Jul 2023 13:19:13 +1000 Subject: [PATCH 05/11] Static analysis cleanup --- app/Services/Payment/DeletePayment.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Services/Payment/DeletePayment.php b/app/Services/Payment/DeletePayment.php index 98242ecb8543..d1fd931b1cb2 100644 --- a/app/Services/Payment/DeletePayment.php +++ b/app/Services/Payment/DeletePayment.php @@ -21,7 +21,7 @@ class DeletePayment private float $_paid_to_date_deleted = 0; /** - * @param mixed $payment + * @param Payment $payment * @return void */ public function __construct(public Payment $payment, private bool $update_client_paid_to_date) @@ -29,7 +29,7 @@ class DeletePayment } /** - * @return mixed + * @return Payment * @throws BindingResolutionException */ public function run() From 0d067cad7da2f9d5f4bb2d2a5d767e44825b04cc Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Jul 2023 13:50:56 +1000 Subject: [PATCH 06/11] Cleanly force payment and verification of ach payments --- app/Models/PaymentHash.php | 11 +---------- app/PaymentDrivers/Stripe/ACH.php | 10 ++++++++++ app/Services/Payment/SendEmail.php | 1 - 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/Models/PaymentHash.php b/app/Models/PaymentHash.php index 555eae5e6558..875e412bd1c4 100644 --- a/app/Models/PaymentHash.php +++ b/app/Models/PaymentHash.php @@ -20,23 +20,14 @@ use Illuminate\Database\Eloquent\Model; * @property string $hash * @property string $fee_total * @property int|null $fee_invoice_id - * @property object $data + * @property object|array $data * @property int|null $payment_id * @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $updated_at * @property-read \App\Models\Invoice|null $fee_invoice * @property-read \App\Models\Payment|null $payment - * @method static \Illuminate\Database\Eloquent\Builder|PaymentHash newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|PaymentHash newQuery() * @method static \Illuminate\Database\Eloquent\Builder|PaymentHash query() - * @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereCreatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereData($value) - * @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereFeeInvoiceId($value) - * @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereFeeTotal($value) - * @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereHash($value) - * @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|PaymentHash wherePaymentId($value) - * @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereUpdatedAt($value) * @mixin \Eloquent */ class PaymentHash extends Model diff --git a/app/PaymentDrivers/Stripe/ACH.php b/app/PaymentDrivers/Stripe/ACH.php index 10bb0e8c42a5..b68d4e120ed8 100644 --- a/app/PaymentDrivers/Stripe/ACH.php +++ b/app/PaymentDrivers/Stripe/ACH.php @@ -187,6 +187,16 @@ class ACH $intent = false; + if (count($data['tokens']) == 1) { + + $token = $data['tokens'][0]; + + $meta = $token->meta; + + if(isset($meta->state) && $meta->state == 'unauthorized') + return redirect()->route('client.payment_methods.show', $token->hashed_id); + } + if (count($data['tokens']) == 0) { $intent = $this->stripe->createPaymentIntent( diff --git a/app/Services/Payment/SendEmail.php b/app/Services/Payment/SendEmail.php index 6253911dac9c..8b9a56499562 100644 --- a/app/Services/Payment/SendEmail.php +++ b/app/Services/Payment/SendEmail.php @@ -23,7 +23,6 @@ class SendEmail /** * Builds the correct template to send. - * @return void */ public function run() { From 67c34f80a96ddb04025ceef72d377e3bbbb90d17 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Jul 2023 14:31:40 +1000 Subject: [PATCH 07/11] Set todays date on a new expense --- app/Factory/ExpenseFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Factory/ExpenseFactory.php b/app/Factory/ExpenseFactory.php index f43d71260a6f..89ccfc3c4c50 100644 --- a/app/Factory/ExpenseFactory.php +++ b/app/Factory/ExpenseFactory.php @@ -28,7 +28,7 @@ class ExpenseFactory $expense->tax_rate2 = 0; $expense->tax_name3 = ''; $expense->tax_rate3 = 0; - $expense->date = null; + $expense->date = now()->format('Y-m-d'); $expense->payment_date = null; $expense->amount = 0; $expense->foreign_amount = 0; From 84885837ab23341c0e69dd7039050bb9b11e3d51 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Jul 2023 14:44:39 +1000 Subject: [PATCH 08/11] Fixes for string delimiters --- app/Http/Controllers/ImportController.php | 15 +++++++++++---- app/Http/Requests/Import/PreImportRequest.php | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index c8aa9c70dbdf..ee953dcf35eb 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -170,20 +170,27 @@ class ImportController extends Controller return $data; } - public function detectDelimiter($csvfile) + /** + * Returns the best delimiter + * + * @param string $csvfile + * @return string + */ + public function detectDelimiter($csvfile): string { $delimiters = [',', '.', ';']; $bestDelimiter = ' '; $count = 0; foreach ($delimiters as $delimiter) { - + if (substr_count(strstr($csvfile, "\n", true), $delimiter) >= $count) { - $count = substr_count($csvfile, $delimiter); - $bestDelimiter = $delimiter; + $count = substr_count(strstr($csvfile, "\n", true), $delimiter); + $bestDelimiter = $delimiter; } } + return $bestDelimiter; } } diff --git a/app/Http/Requests/Import/PreImportRequest.php b/app/Http/Requests/Import/PreImportRequest.php index 7f23b64fcfe4..9e959ac882db 100644 --- a/app/Http/Requests/Import/PreImportRequest.php +++ b/app/Http/Requests/Import/PreImportRequest.php @@ -28,9 +28,10 @@ class PreImportRequest extends Request public function rules() { return [ - 'files.*' => 'file|mimes:csv,txt', + 'files.*' => 'file|mimetypes:text/csv,text/plain,application/octet-stream', 'files' => 'required|array|min:1|max:6', 'import_type' => 'required', ]; } + } From 2dbf6cc4ff6e47b09363f571f06f4dff502530a8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Jul 2023 18:02:12 +1000 Subject: [PATCH 09/11] restrict length of reference for e-invoice --- app/Services/Invoice/EInvoice/FacturaEInvoice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/Invoice/EInvoice/FacturaEInvoice.php b/app/Services/Invoice/EInvoice/FacturaEInvoice.php index 039d4aebf7a5..b497dffa9d8c 100644 --- a/app/Services/Invoice/EInvoice/FacturaEInvoice.php +++ b/app/Services/Invoice/EInvoice/FacturaEInvoice.php @@ -214,7 +214,7 @@ class FacturaEInvoice extends AbstractService { $po = $this->invoice->po_number ?? ''; - $this->fac->setReferences($po, $this->invoice->custom_value1, $this->invoice->custom_value2); + $this->fac->setReferences($po, substr($this->invoice->custom_value1, 0, 20), $this->invoice->custom_value2); return $this; } From e3d5abe5b50d4554017fe7e6ab502cbb8a8e5b4c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Jul 2023 19:00:47 +1000 Subject: [PATCH 10/11] Fixes for client country exports --- app/Export/CSV/ClientExport.php | 4 +- app/Jobs/Cron/UpdateCalculatedFields.php | 8 +++- app/Models/Project.php | 47 ------------------------ app/Models/Task.php | 4 +- 4 files changed, 10 insertions(+), 53 deletions(-) diff --git a/app/Export/CSV/ClientExport.php b/app/Export/CSV/ClientExport.php index 32f42ba807b7..6e4dded88159 100644 --- a/app/Export/CSV/ClientExport.php +++ b/app/Export/CSV/ClientExport.php @@ -163,11 +163,11 @@ class ClientExport extends BaseExport } if (in_array('client.country_id', $this->input['report_keys'])) { - $entity['country'] = $client->country ? ctrans("texts.country_{$client->country->name}") : ''; + $entity['client.country_id'] = $client->country ? ctrans("texts.country_{$client->country->name}") : ''; } if (in_array('client.shipping_country_id', $this->input['report_keys'])) { - $entity['shipping_country'] = $client->shipping_country ? ctrans("texts.country_{$client->shipping_country->name}") : ''; + $entity['client.shipping_country_id'] = $client->shipping_country ? ctrans("texts.country_{$client->shipping_country->name}") : ''; } if (in_array('client.currency_id', $this->input['report_keys'])) { diff --git a/app/Jobs/Cron/UpdateCalculatedFields.php b/app/Jobs/Cron/UpdateCalculatedFields.php index dcfdb6d48e90..62ace5ac7d70 100644 --- a/app/Jobs/Cron/UpdateCalculatedFields.php +++ b/app/Jobs/Cron/UpdateCalculatedFields.php @@ -43,7 +43,9 @@ class UpdateCalculatedFields if (! config('ninja.db.multi_db_enabled')) { - Project::with('tasks')->where('updated_at', '>', now()->subHours(2)) + Project::with('tasks')->whereHas('tasks', function ($query){ + $query->where('updated_at', '>', now()->subHours(2)); + }) ->cursor() ->each(function ($project) { @@ -59,7 +61,9 @@ class UpdateCalculatedFields MultiDB::setDB($db); - Project::with('tasks')->where('updated_at', '>', now()->subHours(2)) + Project::with('tasks')->whereHas('tasks', function ($query){ + $query->where('updated_at', '>', now()->subHours(2)); + }) ->cursor() ->each(function ($project) { $project->current_hours = $this->calculateDuration($project); diff --git a/app/Models/Project.php b/app/Models/Project.php index 03f33215041b..d25bd23630c6 100644 --- a/app/Models/Project.php +++ b/app/Models/Project.php @@ -32,11 +32,9 @@ use Laracasts\Presenter\PresentableTrait; * @property string $color * @property-read \App\Models\Client|null $client * @property-read \App\Models\Company $company - * @property-read \Illuminate\Database\Eloquent\Collection $documents * @property-read int|null $documents_count * @property-read mixed $hashed_id * @property-read Project|null $project - * @property-read \Illuminate\Database\Eloquent\Collection $tasks * @property-read int|null $tasks_count * @property-read \App\Models\User $user * @property-read \App\Models\Vendor|null $vendor @@ -49,55 +47,10 @@ use Laracasts\Presenter\PresentableTrait; * @method static \Illuminate\Database\Eloquent\Builder|Project onlyTrashed() * @method static \Illuminate\Database\Eloquent\Builder|Project query() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope() - * @method static \Illuminate\Database\Eloquent\Builder|Project whereAssignedUserId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereBudgetedHours($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereClientId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereColor($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereCompanyId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereCreatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereCustomValue1($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereCustomValue2($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereCustomValue3($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereCustomValue4($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereDeletedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereDueDate($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereIsDeleted($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereName($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereNumber($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project wherePrivateNotes($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project wherePublicNotes($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereTaskRate($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereUpdatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|Project whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|Project withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|Project withoutTrashed() * @property-read \Illuminate\Database\Eloquent\Collection $documents * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property int|null $current_hours - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @method static \Illuminate\Database\Eloquent\Builder|Project whereCurrentHours($value) - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $tasks * @mixin \Eloquent */ class Project extends BaseModel diff --git a/app/Models/Task.php b/app/Models/Task.php index d27221ebd68b..caee4ca8a374 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -36,8 +36,8 @@ use Illuminate\Support\Carbon; * @property string|null $custom_value4 * @property int|null $duration * @property string|null $description - * @property int $is_deleted - * @property int $is_running + * @property bool $is_deleted + * @property bool $is_running * @property string|null $time_log * @property string|null $number * @property string $rate From 69b4253c25a3ab70dc541c198b399c419475fd49 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Jul 2023 19:08:42 +1000 Subject: [PATCH 11/11] v5.6.22 --- VERSION.txt | 2 +- app/Services/Invoice/EInvoice/FacturaEInvoice.php | 4 ++-- config/ninja.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 1d9b417168bf..29a1e2867ec1 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.6.21 \ No newline at end of file +5.6.22 \ No newline at end of file diff --git a/app/Services/Invoice/EInvoice/FacturaEInvoice.php b/app/Services/Invoice/EInvoice/FacturaEInvoice.php index b497dffa9d8c..4f995ddafa80 100644 --- a/app/Services/Invoice/EInvoice/FacturaEInvoice.php +++ b/app/Services/Invoice/EInvoice/FacturaEInvoice.php @@ -233,8 +233,8 @@ class FacturaEInvoice extends AbstractService foreach($this->invoice->line_items as $item) { $this->fac->addItem(new FacturaeItem([ - 'name' => $item->notes, - 'description' => $item->product_key, + 'name' => $item->product_key, + 'description' => $item->notes, 'quantity' => $item->quantity, 'unitPriceWithoutTax' => $item->cost, 'discountsAndRebates' => $item->discount, diff --git a/config/ninja.php b/config/ninja.php index 086fae76a203..f36da4e8a710 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => env('APP_VERSION','5.6.21'), - 'app_tag' => env('APP_TAG','5.6.21'), + 'app_version' => env('APP_VERSION','5.6.22'), + 'app_tag' => env('APP_TAG','5.6.22'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),