From 4574c48985bab7aa0392e1afc59b3b4ed4ba582f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 25 Jul 2023 20:24:33 +1000 Subject: [PATCH] Static analysis cleanup --- app/Filters/BankTransactionFilters.php | 4 +- app/Filters/BankTransactionRuleFilters.php | 4 +- app/Filters/PaymentTermFilters.php | 4 +- app/Filters/QuoteFilters.php | 4 +- app/Filters/RecurringExpenseFilters.php | 4 +- app/Filters/SubscriptionFilters.php | 4 +- app/Filters/SystemLogFilters.php | 4 +- app/Filters/TaskFilters.php | 4 +- app/Filters/TaskStatusFilters.php | 4 +- app/Filters/TaxRateFilters.php | 4 +- app/Filters/TokenFilters.php | 4 +- app/Filters/UserFilters.php | 4 +- app/Filters/VendorFilters.php | 4 +- app/Filters/WebhookFilters.php | 4 +- app/Helpers/ClientPortal.php | 4 +- app/Helpers/Epc/EpcQrGenerator.php | 5 +- app/Models/Activity.php | 82 ++++++---------------- app/Models/BankAccount.php | 6 -- app/Models/BaseModel.php | 3 +- app/Models/Client.php | 2 +- app/Models/ClientGatewayToken.php | 23 ------ app/Models/Company.php | 38 +++++----- app/Models/CompanyGateway.php | 13 ++-- app/Models/Gateway.php | 1 - app/Models/GatewayType.php | 1 - app/Models/PaymentTerm.php | 3 - app/Models/Presenters/CompanyPresenter.php | 2 - app/Models/Presenters/InvoicePresenter.php | 4 +- app/Models/Project.php | 6 -- app/Observers/SubscriptionObserver.php | 20 +++--- 30 files changed, 93 insertions(+), 176 deletions(-) diff --git a/app/Filters/BankTransactionFilters.php b/app/Filters/BankTransactionFilters.php index a1aab56902..41a558931e 100644 --- a/app/Filters/BankTransactionFilters.php +++ b/app/Filters/BankTransactionFilters.php @@ -37,7 +37,7 @@ class BankTransactionFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -118,7 +118,7 @@ class BankTransactionFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Filters/BankTransactionRuleFilters.php b/app/Filters/BankTransactionRuleFilters.php index ee8496f579..d19e493714 100644 --- a/app/Filters/BankTransactionRuleFilters.php +++ b/app/Filters/BankTransactionRuleFilters.php @@ -36,7 +36,7 @@ class BankTransactionRuleFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -54,7 +54,7 @@ class BankTransactionRuleFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Filters/PaymentTermFilters.php b/app/Filters/PaymentTermFilters.php index 26400394c9..54cfeeea47 100644 --- a/app/Filters/PaymentTermFilters.php +++ b/app/Filters/PaymentTermFilters.php @@ -21,7 +21,7 @@ class PaymentTermFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -39,7 +39,7 @@ class PaymentTermFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php index d906f2bd1c..2befad0994 100644 --- a/app/Filters/QuoteFilters.php +++ b/app/Filters/QuoteFilters.php @@ -22,7 +22,7 @@ class QuoteFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -124,7 +124,7 @@ class QuoteFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Filters/RecurringExpenseFilters.php b/app/Filters/RecurringExpenseFilters.php index f8e0c2ba66..95a293c527 100644 --- a/app/Filters/RecurringExpenseFilters.php +++ b/app/Filters/RecurringExpenseFilters.php @@ -21,7 +21,7 @@ class RecurringExpenseFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -52,7 +52,7 @@ class RecurringExpenseFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Filters/SubscriptionFilters.php b/app/Filters/SubscriptionFilters.php index d9722e46ce..b32f692acf 100644 --- a/app/Filters/SubscriptionFilters.php +++ b/app/Filters/SubscriptionFilters.php @@ -21,7 +21,7 @@ class SubscriptionFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -39,7 +39,7 @@ class SubscriptionFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Filters/SystemLogFilters.php b/app/Filters/SystemLogFilters.php index 3fb6c80b08..62b63f8b76 100644 --- a/app/Filters/SystemLogFilters.php +++ b/app/Filters/SystemLogFilters.php @@ -48,7 +48,7 @@ class SystemLogFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -64,7 +64,7 @@ class SystemLogFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php index 8b3abcdb82..f0b3a1afc2 100644 --- a/app/Filters/TaskFilters.php +++ b/app/Filters/TaskFilters.php @@ -24,7 +24,7 @@ class TaskFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -99,7 +99,7 @@ class TaskFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Filters/TaskStatusFilters.php b/app/Filters/TaskStatusFilters.php index 35ef91a028..2487a9f5a9 100644 --- a/app/Filters/TaskStatusFilters.php +++ b/app/Filters/TaskStatusFilters.php @@ -21,7 +21,7 @@ class TaskStatusFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -39,7 +39,7 @@ class TaskStatusFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Filters/TaxRateFilters.php b/app/Filters/TaxRateFilters.php index 8d225d3db2..ada581887f 100644 --- a/app/Filters/TaxRateFilters.php +++ b/app/Filters/TaxRateFilters.php @@ -21,7 +21,7 @@ class TaxRateFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -39,7 +39,7 @@ class TaxRateFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Filters/TokenFilters.php b/app/Filters/TokenFilters.php index 2037d768ad..0093ac4f41 100644 --- a/app/Filters/TokenFilters.php +++ b/app/Filters/TokenFilters.php @@ -21,7 +21,7 @@ class TokenFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -45,7 +45,7 @@ class TokenFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Filters/UserFilters.php b/app/Filters/UserFilters.php index 9998d74a7c..12a26d27a6 100644 --- a/app/Filters/UserFilters.php +++ b/app/Filters/UserFilters.php @@ -21,7 +21,7 @@ class UserFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -43,7 +43,7 @@ class UserFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Filters/VendorFilters.php b/app/Filters/VendorFilters.php index 4937a75133..1f3adf6d4d 100644 --- a/app/Filters/VendorFilters.php +++ b/app/Filters/VendorFilters.php @@ -21,7 +21,7 @@ class VendorFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -58,7 +58,7 @@ class VendorFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Filters/WebhookFilters.php b/app/Filters/WebhookFilters.php index 6ab0927495..1401b3ad1b 100644 --- a/app/Filters/WebhookFilters.php +++ b/app/Filters/WebhookFilters.php @@ -21,7 +21,7 @@ class WebhookFilters extends QueryFilters /** * Filter based on search text. * - * @param string query filter + * @param string $filter * @return Builder * @deprecated */ @@ -39,7 +39,7 @@ class WebhookFilters extends QueryFilters /** * Sorts the list based on $sort. * - * @param string sort formatted as column|asc + * @param string $sort formatted as column|asc * @return Builder */ public function sort(string $sort = ''): Builder diff --git a/app/Helpers/ClientPortal.php b/app/Helpers/ClientPortal.php index 25f7706344..f4d1a2fb89 100644 --- a/app/Helpers/ClientPortal.php +++ b/app/Helpers/ClientPortal.php @@ -19,7 +19,7 @@ use Illuminate\View\View; * * @param $page * @param bool $boolean - * @return bool + * @return bool | string */ function isActive($page, bool $boolean = false) { @@ -40,8 +40,6 @@ function isActive($page, bool $boolean = false) return true; } - - return false; } diff --git a/app/Helpers/Epc/EpcQrGenerator.php b/app/Helpers/Epc/EpcQrGenerator.php index 2da19d1da6..100e9a2cca 100644 --- a/app/Helpers/Epc/EpcQrGenerator.php +++ b/app/Helpers/Epc/EpcQrGenerator.php @@ -53,9 +53,8 @@ class EpcQrGenerator $qr = $writer->writeString($this->encodeMessage(), 'utf-8'); } catch(\Throwable $e) { return ''; - } catch(\Exception $e) { - return ''; - } + } + return " {$qr}"; } diff --git a/app/Models/Activity.php b/app/Models/Activity.php index d0edf254e2..17cfcb872d 100644 --- a/app/Models/Activity.php +++ b/app/Models/Activity.php @@ -13,6 +13,7 @@ namespace App\Models; use App\Utils\Number; use App\Utils\Traits\MakesHash; +use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * App\Models\Activity @@ -302,161 +303,120 @@ class Activity extends StaticModel 'backup', ]; - /** - * @return mixed - */ + public function getHashedIdAttribute() { return $this->encodePrimaryKey($this->id); } - /** - * @return mixed - */ + public function getEntityType() { return self::class; } - /** - * @return mixed - */ + public function backup() { return $this->hasOne(Backup::class); } - /** - * @return mixed - */ + public function history() { return $this->hasOne(Backup::class); } - /** - * @return mixed - */ - public function user() + public function user() :BelongsTo { return $this->belongsTo(User::class)->withTrashed(); } - /** - * @return mixed - */ + public function contact() { return $this->belongsTo(ClientContact::class, 'client_contact_id', 'id')->withTrashed(); } - /** - * @return mixed - */ + public function client() { return $this->belongsTo(Client::class)->withTrashed(); } - /** - * @return mixed - */ + public function invoice() { return $this->belongsTo(Invoice::class)->withTrashed(); } - /** - * @return mixed - */ + public function vendor() { return $this->belongsTo(Vendor::class)->withTrashed(); } - /** - * @return mixed - */ + public function recurring_invoice() { return $this->belongsTo(RecurringInvoice::class)->withTrashed(); } - /** - * @return mixed - */ + public function credit() { return $this->belongsTo(Credit::class)->withTrashed(); } - /** - * @return mixed - */ + public function quote() { return $this->belongsTo(Quote::class)->withTrashed(); } - /** - * @return mixed - */ + public function subscription() { return $this->belongsTo(Subscription::class)->withTrashed(); } - /** - * @return mixed - */ + public function payment() { return $this->belongsTo(Payment::class)->withTrashed(); } - /** - * @return mixed - */ + public function expense() { return $this->belongsTo(Expense::class)->withTrashed(); } - /** - * @return mixed - */ + public function recurring_expense() { return $this->belongsTo(RecurringExpense::class)->withTrashed(); } - /** - * @return mixed - */ + public function purchase_order() { return $this->belongsTo(PurchaseOrder::class)->withTrashed(); } - /** - * @return mixed - */ + public function vendor_contact() { return $this->belongsTo(VendorContact::class)->withTrashed(); } - /** - * @return mixed - */ + public function task() { return $this->belongsTo(Task::class)->withTrashed(); } - /** - * @return mixed - */ + public function company() { return $this->belongsTo(Company::class); diff --git a/app/Models/BankAccount.php b/app/Models/BankAccount.php index 5b4abddc9a..8152c94d53 100644 --- a/app/Models/BankAccount.php +++ b/app/Models/BankAccount.php @@ -50,12 +50,6 @@ class BankAccount extends BaseModel { use SoftDeletes; - /** - * @var array - */ - /** - * @var array - */ protected $fillable = [ 'bank_id', 'app_version', diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php index ac6d73168a..62bcabefa8 100644 --- a/app/Models/BaseModel.php +++ b/app/Models/BaseModel.php @@ -39,7 +39,7 @@ use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundExceptio * @method static \Illuminate\Database\Eloquent\Builder|BaseModel with($value) * @method static \Illuminate\Database\Eloquent\Builder|BaseModel newModelQuery($query) * @method static \Illuminate\Database\Eloquent\Builder|BaseModel newQuery($query) - * @method static \Illuminate\Database\Eloquent\Builder|BaseModel query($query) + * @method static \Illuminate\Database\Eloquent\Builder|BaseModel query() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel exclude(array $excludeable) * @method static \Illuminate\Database\Eloquent\Builder|BaseModel withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel scopeExclude($query) @@ -59,6 +59,7 @@ use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundExceptio * * @method \App\Models\Company company() * @method int companyId() + * @method createInvitations() * @method Builder|static exclude($columns) * @method static \Illuminate\Database\Eloquent\Builder exclude(array $columns) * @mixin \Eloquent diff --git a/app/Models/Client.php b/app/Models/Client.php index 135fd4d5e9..f8687eef61 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -377,7 +377,7 @@ class Client extends BaseModel implements HasLocalePreference return $this->hasMany(SystemLog::class)->take(50)->orderBy('id', 'desc'); } - public function timezone() :TimeZone + public function timezone() :Timezone { return Timezone::find($this->getSetting('timezone_id')); } diff --git a/app/Models/ClientGatewayToken.php b/app/Models/ClientGatewayToken.php index cf5c6d3247..2b6950048d 100644 --- a/app/Models/ClientGatewayToken.php +++ b/app/Models/ClientGatewayToken.php @@ -37,29 +37,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property-read \App\Models\GatewayType|null $gateway_type * @property-read mixed $hashed_id * @property-read \App\Models\User $user - * @method static \Illuminate\Database\Eloquent\Builder|BaseModel company() - * @method static \Illuminate\Database\Eloquent\Builder|BaseModel exclude($columns) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken newModelQuery() - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken newQuery() - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken onlyTrashed() - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken query() - * @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope() - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereClientId($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereCompanyGatewayId($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereCompanyId($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereCreatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereDeletedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereGatewayCustomerReference($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereGatewayTypeId($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereIsDefault($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereIsDeleted($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereMeta($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereRoutingNumber($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereToken($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken whereUpdatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken withTrashed() - * @method static \Illuminate\Database\Eloquent\Builder|ClientGatewayToken withoutTrashed() * @mixin \Eloquent */ class ClientGatewayToken extends BaseModel diff --git a/app/Models/Company.php b/app/Models/Company.php index cce115b25c..d8c0c9172a 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -393,17 +393,17 @@ class Company extends BaseModel return $this->morphMany(Document::class, 'documentable'); } - public function schedulers() + public function schedulers() :HasMany { return $this->hasMany(Scheduler::class); } - public function task_schedulers() //alias for schedulers + public function task_schedulers() :HasMany { return $this->hasMany(Scheduler::class); } - public function all_documents() + public function all_documents() :HasMany { return $this->hasMany(Document::class); } @@ -413,22 +413,22 @@ class Company extends BaseModel return self::class; } - public function ledger() + public function ledger() :HasMany { return $this->hasMany(CompanyLedger::class); } - public function bank_integrations() + public function bank_integrations() :HasMany { return $this->hasMany(BankIntegration::class); } - public function bank_transactions() + public function bank_transactions() :HasMany { return $this->hasMany(BankTransaction::class); } - public function bank_transaction_rules() + public function bank_transaction_rules() :HasMany { return $this->hasMany(BankTransactionRule::class); } @@ -443,7 +443,7 @@ class Company extends BaseModel return $this->belongsTo(Account::class); } - public function client_contacts() + public function client_contacts() :HasMany { return $this->hasMany(ClientContact::class)->withTrashed(); } @@ -453,27 +453,27 @@ class Company extends BaseModel return $this->hasManyThrough(User::class, CompanyUser::class, 'company_id', 'id', 'id', 'user_id')->withTrashed(); } - public function expense_categories() + public function expense_categories() :HasMany { return $this->hasMany(ExpenseCategory::class)->withTrashed(); } - public function subscriptions() + public function subscriptions() :HasMany { return $this->hasMany(Subscription::class)->withTrashed(); } - public function purchase_orders() + public function purchase_orders() :HasMany { return $this->hasMany(PurchaseOrder::class)->withTrashed(); } - public function task_statuses() + public function task_statuses() :HasMany { return $this->hasMany(TaskStatus::class)->withTrashed(); } - public function clients() + public function clients() :HasMany { return $this->hasMany(Client::class)->withTrashed(); } @@ -481,12 +481,12 @@ class Company extends BaseModel /** * @return HasMany */ - public function tasks() + public function tasks() :HasMany { return $this->hasMany(Task::class)->withTrashed(); } - public function webhooks() + public function webhooks() :HasMany { return $this->hasMany(Webhook::class); } @@ -494,7 +494,7 @@ class Company extends BaseModel /** * @return HasMany */ - public function projects() + public function projects() :HasMany { return $this->hasMany(Project::class)->withTrashed(); } @@ -502,17 +502,17 @@ class Company extends BaseModel /** * @return HasMany */ - public function vendors() + public function vendors() :HasMany { return $this->hasMany(Vendor::class)->withTrashed(); } - public function all_activities() + public function all_activities() :HasMany { return $this->hasMany(Activity::class); } - public function activities() + public function activities() :HasMany { return $this->hasMany(Activity::class)->orderBy('id', 'DESC')->take(50); } diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php index b104cbccda..fa5de69aee 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 object $fees_and_limits + * @property mixed $fees_and_limits * @property string|null $custom_value1 * @property string|null $custom_value2 * @property string|null $custom_value3 @@ -232,7 +232,8 @@ class CompanyGateway extends BaseModel /* This is the public entry point into the payment superclass */ public function driver(Client $client = null) { - $class = static::driver_class(); +// $class = static::driver_class(); +$class = self::driver_class(); if (!$class) { return false; @@ -343,10 +344,10 @@ class CompanyGateway extends BaseModel return ! empty($this->getConfigField('enable_pay_pal')); } - public function feesEnabled() - { - return floatval($this->fee_amount) || floatval($this->fee_percent); - } + // public function feesEnabled() + // { + // return floatval($this->fee_amount) || floatval($this->fee_percent); + // } /** * Returns the current test mode of the gateway. diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php index 2d3107a141..79677bf45b 100644 --- a/app/Models/Gateway.php +++ b/app/Models/Gateway.php @@ -180,7 +180,6 @@ class Gateway extends StaticModel GatewayType::SEPA => ['refund' => false, 'token_billing' => true, 'webhooks' => [' ']], GatewayType::INSTANT_BANK_PAY => ['refund' => false, 'token_billing' => true, 'webhooks' => [' ']], ]; - break; case 58: return [ GatewayType::HOSTED_PAGE => ['refund' => false, 'token_billing' => false, 'webhooks' => [' ']], // Razorpay diff --git a/app/Models/GatewayType.php b/app/Models/GatewayType.php index cdbd079cda..bc207c4955 100644 --- a/app/Models/GatewayType.php +++ b/app/Models/GatewayType.php @@ -160,7 +160,6 @@ class GatewayType extends StaticModel return ctrans('texts.paypal_paylater'); default: return ' '; - break; } } } diff --git a/app/Models/PaymentTerm.php b/app/Models/PaymentTerm.php index d7edf3fa4a..8c107801c5 100644 --- a/app/Models/PaymentTerm.php +++ b/app/Models/PaymentTerm.php @@ -57,9 +57,6 @@ class PaymentTerm extends BaseModel */ public $timestamps = true; - /** - * @var array - */ protected $fillable = ['num_days']; public function getNumDays() diff --git a/app/Models/Presenters/CompanyPresenter.php b/app/Models/Presenters/CompanyPresenter.php index 395adfc4a5..c836091dc4 100644 --- a/app/Models/Presenters/CompanyPresenter.php +++ b/app/Models/Presenters/CompanyPresenter.php @@ -25,8 +25,6 @@ class CompanyPresenter extends EntityPresenter */ public function name() { - $settings = $this->entity->settings; - return $this->settings->name ?: ctrans('texts.untitled_account'); } diff --git a/app/Models/Presenters/InvoicePresenter.php b/app/Models/Presenters/InvoicePresenter.php index eaa34ad9e5..a7ce9222e3 100644 --- a/app/Models/Presenters/InvoicePresenter.php +++ b/app/Models/Presenters/InvoicePresenter.php @@ -53,7 +53,7 @@ class InvoicePresenter extends EntityPresenter $properties->itemized_receipt[] = $this->itemRbits($item); } - $data = new stdClass(); + $data = new \stdClass(); $data->receive_time = time(); $data->type = 'transaction_details'; $data->source = 'user'; @@ -64,7 +64,7 @@ class InvoicePresenter extends EntityPresenter public function itemRbits($item) { - $data = new stdClass(); + $data = new \stdClass(); $data->description = $item->notes; $data->item_price = floatval($item->cost); $data->quantity = floatval($item->quantity); diff --git a/app/Models/Project.php b/app/Models/Project.php index 7e88c88407..03f3321504 100644 --- a/app/Models/Project.php +++ b/app/Models/Project.php @@ -106,12 +106,6 @@ class Project extends BaseModel use PresentableTrait; use Filterable; - /** - * @var array - */ - /** - * @var array - */ protected $fillable = [ 'name', 'client_id', diff --git a/app/Observers/SubscriptionObserver.php b/app/Observers/SubscriptionObserver.php index 895ea59dfc..dece57bf88 100644 --- a/app/Observers/SubscriptionObserver.php +++ b/app/Observers/SubscriptionObserver.php @@ -16,9 +16,9 @@ use App\Models\Subscription; class SubscriptionObserver { /** - * Handle the billing_subscription "created" event. + * Handle the subscription "created" event. * - * @param Subscription $billing_subscription + * @param Subscription $subscription * @return void */ public function created(Subscription $subscription) @@ -27,9 +27,9 @@ class SubscriptionObserver } /** - * Handle the billing_subscription "updated" event. + * Handle the subscription "updated" event. * - * @param Subscription $billing_subscription + * @param Subscription $subscription * @return void */ public function updated(Subscription $subscription) @@ -38,9 +38,9 @@ class SubscriptionObserver } /** - * Handle the billing_subscription "deleted" event. + * Handle the subscription "deleted" event. * - * @param Subscription $billing_subscription + * @param Subscription $subscription * @return void */ public function deleted(Subscription $subscription) @@ -49,9 +49,9 @@ class SubscriptionObserver } /** - * Handle the billing_subscription "restored" event. + * Handle the subscription "restored" event. * - * @param Subscription $billing_subscription + * @param Subscription $subscription * @return void */ public function restored(Subscription $subscription) @@ -60,9 +60,9 @@ class SubscriptionObserver } /** - * Handle the billing_subscription "force deleted" event. + * Handle the subscription "force deleted" event. * - * @param Subscription $billing_subscription + * @param Subscription $subscription * @return void */ public function forceDeleted(Subscription $subscription)