Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9640 from turbo124/v5-develop

Browse Source 
v5.9.6
This commit is contained in:
David Bomba 2024-06-16 08:31:35 +10:00 committed by GitHub
commit b4ab9a2e1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
380 changed files with 2868 additions and 2135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.9.5
5.9.6

3
app/Console/Commands/CheckData.php
View File

@ -480,8 +480,7 @@ class CheckData extends Command
try {
$entity->service()->createInvitations()->save();
}
catch(\Exception $e){
} catch(\Exception $e) {
}

61
app/DataMapper/Analytics/LoginMeta.php Normal file
View File

@ -0,0 +1,61 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://www.elastic.co/licensing/elastic-license
*/
namespace App\DataMapper\Analytics;
use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
class LoginMeta extends GenericMixedMetric
{
/**
* The type of Sample.
*
* Monotonically incrementing counter
*
* - counter
*
* @var string
*/
public $type = 'mixed_metric';
/**
* The name of the counter.
* @var string
*/
public $name = 'login.meta';
/**
* The datetime of the counter measurement.
*
* date("Y-m-d H:i:s")
*
*/
public $datetime;
/**
* The Class failure name
* set to 0.
*
* @var string
*/
public $string_metric5 = 'email';
public $string_metric6 = 'ip';
public $string_metric7 = 'result';
public $int_metric1 = 1;
public function __construct($string_metric5, $string_metric6, $string_metric7)
{
$this->string_metric7 = $string_metric7;
$this->string_metric6 = $string_metric6;
$this->string_metric5 = $string_metric5;
}
}

19
app/DataMapper/Sources/PayPalBalanceAffecting.php
View File

@ -15,7 +15,6 @@ use App\DataMapper\InvoiceItem;
class PayPalBalanceAffecting
{
private array $key_map = [
'Date' => 'date',
'Time' => 'time',
@ -106,7 +105,9 @@ class PayPalBalanceAffecting
public $creditTransactionalFee;
public $originalInvoiceId;
public function __construct(private array $import_row){}
public function __construct(private array $import_row)
{
}
public function run(): self
{
@ -154,7 +155,7 @@ class PayPalBalanceAffecting
public function getInvoice(): array
{
$item = new InvoiceItem;
$item = new InvoiceItem();
$item->cost = $this->gross ?? 0;
$item->product_key = $this->itemId ?? '';
$item->notes = $this->subject ?? $this->itemDetails;
@ -174,12 +175,10 @@ class PayPalBalanceAffecting
{
$name_parts = explode(" ", $this->name ?? '');
if(count($name_parts) == 2)
{
if(count($name_parts) == 2) {
$contact['first_name'] = $name_parts[0];
$contact['last_name'] = $name_parts[1];
}
else {
} else {
$contact['first_name'] = $this->name ?? '';
}
@ -203,13 +202,15 @@ class PayPalBalanceAffecting
private function returnShippingAddress(): array
{
if(strlen($this->shippingAddress ?? '') <3)
if(strlen($this->shippingAddress ?? '') < 3) {
return [];
}
$ship_parts = explode(",", $this->shippingAddress);
if(count($ship_parts) != 7)
if(count($ship_parts) != 7) {
return [];
}
return [
'shipping_address1' => $ship_parts[2],

3
app/Export/CSV/ClientExport.php
View File

@ -127,8 +127,9 @@ class ClientExport extends BaseExport
->withTrashed()
->where('company_id', $this->company->id);
if(!$this->input['include_deleted'] ?? false)
if(!$this->input['include_deleted'] ?? false) {
$query->where('is_deleted', 0);
}
$query = $this->addDateRange($query);

15
app/Export/CSV/ProductSalesExport.php
View File

@ -25,6 +25,7 @@ class ProductSalesExport extends BaseExport
{
public string $date_key = 'created_at';
/** @var Collection<\App\Models\Product> $products*/
protected Collection $products;
public Writer $csv;
@ -146,12 +147,11 @@ class ProductSalesExport extends BaseExport
->each(function ($invoice) use ($product_keys) {
foreach ($invoice->line_items as $item) {
if($product_keys)
{
if(in_array($item->product_key, $product_keys))
if($product_keys) {
if(in_array($item->product_key, $product_keys)) {
$this->csv->insertOne($this->buildRow($invoice, $item));
}
else {
} else {
$this->csv->insertOne($this->buildRow($invoice, $item));
}
@ -185,7 +185,8 @@ class ProductSalesExport extends BaseExport
})->reject(function ($value) {
return $value === false;
});;
});
;
$this->csv->insertOne([]);
$this->csv->insertOne([]);
@ -327,9 +328,9 @@ class ProductSalesExport extends BaseExport
* getProduct
*
* @param string $product_key
* @return Product
* @return ?\Illuminate\Database\Eloquent\Model
*/
private function getProduct(string $product_key): ?Product
private function getProduct(string $product_key)
{
return $this->products->firstWhere('product_key', $product_key);
}

3
app/Export/CSV/PurchaseOrderExport.php
View File

@ -72,8 +72,9 @@ class PurchaseOrderExport extends BaseExport
$clients = &$this->input['client_id'];
if($clients)
if($clients) {
$query = $this->addClientFilter($query, $clients);
}
$query = $this->addPurchaseOrderStatusFilter($query, $this->input['status'] ?? '');

6
app/Export/CSV/TaskExport.php
View File

@ -78,13 +78,15 @@ class TaskExport extends BaseExport
$clients = &$this->input['client_id'];
if($clients)
if($clients) {
$query = $this->addClientFilter($query, $clients);
}
$document_attachments = &$this->input['document_email_attachment'];
if($document_attachments)
if($document_attachments) {
$this->queueDocuments($query);
}
return $query;

3
app/Factory/BankIntegrationFactory.php
View File

@ -23,14 +23,13 @@ class BankIntegrationFactory
$bank_integration->company_id = $company_id;
$bank_integration->provider_name = '';
$bank_integration->bank_account_id = '';
$bank_integration->bank_account_name = '';
$bank_integration->bank_account_number = '';
$bank_integration->bank_account_status = '';
$bank_integration->bank_account_type = '';
$bank_integration->balance = 0;
$bank_integration->currency = '';
$bank_integration->auto_sync = 1;
$bank_integration->auto_sync = true;
return $bank_integration;
}

2
app/Factory/ClientFactory.php
View File

@ -29,7 +29,7 @@ class ClientFactory
$client->balance = 0;
$client->paid_to_date = 0;
$client->country_id = null;
$client->is_deleted = 0;
$client->is_deleted = false;
$client->client_hash = Str::random(40);
$client->settings = ClientSettings::defaults();
$client->classification = '';

2
app/Factory/CloneQuoteToProjectFactory.php
View File

@ -33,7 +33,7 @@ class CloneQuoteToProjectFactory
$project->custom_value2 = '';
$project->custom_value3 = '';
$project->custom_value4 = '';
$project->is_deleted = 0;
$project->is_deleted = false;
return $project;
}

2
app/Factory/CompanyFactory.php
View File

@ -48,7 +48,7 @@ class CompanyFactory
$company->markdown_email_enabled = true;
$company->markdown_enabled = false;
$company->tax_data = new TaxModel();
$company->first_month_of_year = 1;
$company->first_month_of_year = '1';
$company->smtp_encryption = 'tls';
$company->smtp_host = '';
$company->smtp_local_domain = '';

2
app/Factory/TaxRateFactory.php
View File

@ -20,7 +20,7 @@ class TaxRateFactory
$tax_rate = new TaxRate();
$tax_rate->name = '';
$tax_rate->rate = '';
$tax_rate->rate = 0;
$tax_rate->company_id = $company_id;
$tax_rate->user_id = $user_id;

2
app/Factory/VendorFactory.php
View File

@ -26,7 +26,7 @@ class VendorFactory
$vendor->private_notes = '';
$vendor->public_notes = '';
$vendor->country_id = 4;
$vendor->is_deleted = 0;
$vendor->is_deleted = false;
$vendor->vendor_hash = Str::random(40);
// $vendor->classification = '';

23
app/Filters/BankTransactionFilters.php
View File

@ -115,6 +115,29 @@ class BankTransactionFilters extends QueryFilters
return $this->builder;
}
/**
* Filters the list based on Bank Accounts.
*
* @param string $ids Comma Separated List of bank account ids
* @return Builder
*/
public function bank_integration_ids(string $ids = ''): Builder
{
if(strlen($ids) == 0) {
return $this->builder;
}
$ids = $this->transformKeys(explode(",", $ids));
$this->builder->where(function ($query) use ($ids) {
$query->whereIn('bank_integration_id', $ids);
});
return $this->builder;
}
/**
* Sorts the list based on $sort.
*

3
app/Filters/ClientFilters.php
View File

@ -160,8 +160,9 @@ class ClientFilters extends QueryFilters
return $this->builder;
}
if($sort_col[0] == 'documents')
if($sort_col[0] == 'documents') {
return $this->builder;
}
if ($sort_col[0] == 'display_name') {
$sort_col[0] = 'name';

3
app/Filters/DesignFilters.php
View File

@ -59,8 +59,9 @@ class DesignFilters extends QueryFilters
public function entities(string $entities = ''): Builder
{
if(stripos($entities, 'statement') !== false)
if(stripos($entities, 'statement') !== false) {
$entities = 'client';
}
if (strlen($entities) == 0 || str_contains($entities, ',')) {
return $this->builder;

3
app/Filters/DocumentFilters.php
View File

@ -74,8 +74,7 @@ class DocumentFilters extends QueryFilters
{
$types = explode(',', $types);
foreach ($types as $type)
{
foreach ($types as $type) {
match($type) {
'private' => $this->builder->where('is_public', 0),
'public' => $this->builder->where('is_public', 1),

3
app/Filters/InvoiceFilters.php
View File

@ -230,8 +230,7 @@ class InvoiceFilters extends QueryFilters
try {
$date = Carbon::parse($date);
}
catch(\Exception $e){
} catch(\Exception $e) {
return $this->builder;
}
}

3
app/Helpers/Bank/Nordigen/Nordigen.php
View File

@ -152,8 +152,9 @@ class Nordigen
{
$cache_key = "email_quota:{$bank_integration->company->company_key}:{$bank_integration->id}";
if(Cache::has($cache_key))
if(Cache::has($cache_key)) {
return;
}
App::setLocale($bank_integration->company->getLocale());

2
app/Helpers/Bank/Nordigen/Transformer/TransactionTransformer.php
View File

@ -71,7 +71,7 @@ class TransactionTransformer implements BankRevenueInterface
private Company $company;
function __construct(Company $company)
public function __construct(Company $company)
{
$this->company = $company;
}

3
app/Helpers/Invoice/CustomValuer.php
View File

@ -35,7 +35,8 @@ trait CustomValuer
return 0;
}
public function multiInclusiveTax($custom_value, $has_custom_invoice_taxes) {
public function multiInclusiveTax($custom_value, $has_custom_invoice_taxes)
{
if (isset($custom_value) && is_numeric($custom_value) && $has_custom_invoice_taxes !== false) {

5
app/Helpers/Invoice/InvoiceSum.php
View File

@ -247,8 +247,7 @@ class InvoiceSum
{
if($this->invoice->status_id == Invoice::STATUS_CANCELLED) {
$this->invoice->balance = 0;
}
elseif ($this->invoice->status_id != Invoice::STATUS_DRAFT) {
} elseif ($this->invoice->status_id != Invoice::STATUS_DRAFT) {
if ($this->invoice->amount != $this->invoice->balance) {
$this->invoice->balance = Number::roundValue($this->getTotal(), $this->precision) - $this->invoice->paid_to_date; //21-02-2024 cannot use the calculated $paid_to_date here as it could send the balance backward.
} else {
@ -269,7 +268,7 @@ class InvoiceSum
}
function roundRappen($value): float
public function roundRappen($value): float
{
return round($value / .05, 0) * .05;
}

5
app/Helpers/Invoice/InvoiceSumInclusive.php
View File

@ -281,8 +281,7 @@ class InvoiceSumInclusive
/* If amount != balance then some money has been paid on the invoice, need to subtract this difference from the total to set the new balance */
if($this->invoice->status_id == Invoice::STATUS_CANCELLED) {
$this->invoice->balance = 0;
}
elseif ($this->invoice->status_id != Invoice::STATUS_DRAFT) {
} elseif ($this->invoice->status_id != Invoice::STATUS_DRAFT) {
if ($this->invoice->amount != $this->invoice->balance) {
$this->invoice->balance = $this->formatValue($this->getTotal(), $this->precision) - $this->invoice->paid_to_date;
} else {
@ -303,7 +302,7 @@ class InvoiceSumInclusive
return $this;
}
function roundRappen($value): float
public function roundRappen($value): float
{
return round($value / .05, 0) * .05;
}

5
app/Helpers/Mail/GmailTransport.php
View File

@ -34,7 +34,7 @@ class GmailTransport extends AbstractTransport
$message = MessageConverter::toEmail($message->getOriginalMessage());
/** @phpstan-ignore-next-line **/
$token = $message->getHeaders()->get('gmailtoken')->getValue();
$token = $message->getHeaders()->get('gmailtoken')->getValue(); // @phpstan-ignore-line
$message->getHeaders()->remove('gmailtoken');
$client = new Client();
@ -53,9 +53,8 @@ class GmailTransport extends AbstractTransport
if ($bccs) {
$bcc_list = 'Bcc: ';
/** @phpstan-ignore-next-line **/
foreach ($bccs->getAddresses() as $address) {
$bcc_list .= $address->getAddress() .',';
}

2
app/Http/Controllers/AccountController.php
View File

@ -61,7 +61,7 @@ class AccountController extends BaseController
* Store a newly created resource in storage.
*
* @param CreateAccountRequest $request
* @return Response
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*
*/
public function store(CreateAccountRequest $request)

8
app/Http/Controllers/ActivityController.php
View File

@ -105,6 +105,14 @@ class ActivityController extends BaseController
}
/**
* downloadHistoricalEntity
*
* @param DownloadHistoricalEntityRequest $request
* @param Activity $activity
* @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse
*/
public function downloadHistoricalEntity(DownloadHistoricalEntityRequest $request, Activity $activity)
{
$backup = $activity->backup;

2
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@ -46,7 +46,7 @@ class ForgotPasswordController extends Controller
/**
* @param Request $request
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
* @throws \Illuminate\Validation\ValidationException
*/
public function sendResetLinkEmail(Request $request)

15
app/Http/Controllers/Auth/LoginController.php
View File

@ -13,6 +13,7 @@
namespace App\Http\Controllers\Auth;
use App\DataMapper\Analytics\LoginFailure;
use App\DataMapper\Analytics\LoginMeta;
use App\DataMapper\Analytics\LoginSuccess;
use App\Events\User\UserLoggedIn;
use App\Http\Controllers\BaseController;
@ -111,6 +112,9 @@ class LoginController extends BaseController
->increment()
->batch();
LightLogs::create(new LoginMeta($request->email, $request->ip, 'success'))
->batch();
/** @var \App\Models\User $user */
$user = $this->guard()->user();
@ -159,6 +163,9 @@ class LoginController extends BaseController
->increment()
->batch();
LightLogs::create(new LoginMeta($request->email, $request->ip, 'failure'))
->batch();
$this->incrementLoginAttempts($request);
return response()
@ -172,7 +179,7 @@ class LoginController extends BaseController
* Refreshes the data feed with the current Company User.
*
* @param Request $request
* @return Response|JsonResponse
* @return \Illuminate\Http\Response|JsonResponse
*/
public function refresh(Request $request)
{
@ -481,7 +488,7 @@ class LoginController extends BaseController
* send login response to oauthed users
*
* @param \App\Models\User $existing_user
* @return Response | JsonResponse
* @return Response| \Illuminate\Http\JsonResponse | JsonResponse
*/
private function existingOauthUser($existing_user)
{
@ -651,7 +658,9 @@ class LoginController extends BaseController
}
if(request()->hasHeader('X-REACT') || request()->query('react')) {
Cache::put("react_redir:".auth()->user()?->account->key, 'true', 300);
/**@var \App\Models\User $user */
$user = auth()->user();
Cache::put("react_redir:".$user?->account->key, 'true', 300);
}
if (request()->has('code')) {

2
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@ -78,7 +78,7 @@ class ResetPasswordController extends Controller
* Reset the given user's password.
*
* @param Request $request
* @return RedirectResponse|JsonResponse
* @return \Illuminate\Http\RedirectResponse | \Illuminate\Http\RedirectResponse|JsonResponse
* @throws \Illuminate\Validation\ValidationException
*/
public function reset(Request $request)

2
app/Http/Controllers/Bank/YodleeController.php
View File

@ -310,7 +310,7 @@ class YodleeController extends BaseController
private function transformSummary($summary): array
{
$dto = new \stdClass;
$dto = new \stdClass();
$dto->id = $summary['id'] ?? 0;
$dto->account_type = $summary['CONTAINER'] ?? '';

18
app/Http/Controllers/BankIntegrationController.php
View File

@ -55,7 +55,7 @@ class BankIntegrationController extends BaseController
/**
* @param BankIntegrationFilters $filters
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function index(BankIntegrationFilters $filters)
{
@ -69,7 +69,7 @@ class BankIntegrationController extends BaseController
*
* @param ShowBankIntegrationRequest $request
* @param BankIntegration $bank_integration
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function show(ShowBankIntegrationRequest $request, BankIntegration $bank_integration)
@ -83,7 +83,7 @@ class BankIntegrationController extends BaseController
*
* @param EditBankIntegrationRequest $request
* @param BankIntegration $bank_integration
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function edit(EditBankIntegrationRequest $request, BankIntegration $bank_integration)
@ -96,7 +96,7 @@ class BankIntegrationController extends BaseController
*
* @param UpdateBankIntegrationRequest $request
* @param BankIntegration $bank_integration
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function update(UpdateBankIntegrationRequest $request, BankIntegration $bank_integration)
@ -111,7 +111,7 @@ class BankIntegrationController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateBankIntegrationRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*/
@ -130,7 +130,7 @@ class BankIntegrationController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreBankIntegrationRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function store(StoreBankIntegrationRequest $request)
@ -150,7 +150,7 @@ class BankIntegrationController extends BaseController
*
* @param DestroyBankIntegrationRequest $request
* @param BankIntegration $bank_integration
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @throws \Exception
*/
@ -165,7 +165,7 @@ class BankIntegrationController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function bulk(BulkBankIntegrationRequest $request)
@ -295,7 +295,7 @@ class BankIntegrationController extends BaseController
* Return the remote list of accounts stored on the third party provider
* and update our local cache.
*
* @return Response | JsonResponse
* @return Response| \Illuminate\Http\JsonResponse | JsonResponse
*
*/

16
app/Http/Controllers/BankTransactionRuleController.php
View File

@ -85,7 +85,7 @@ class BankTransactionRuleController extends BaseController
* ),
* )
* @param BankTransactionRuleFilters $filters
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function index(BankTransactionRuleFilters $filters)
{
@ -99,7 +99,7 @@ class BankTransactionRuleController extends BaseController
*
* @param ShowBankTransactionRuleRequest $request
* @param BankTransactionRule $bank_transaction_rule
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response|\Illuminate\Http\Response
*
*
* @OA\Get(
@ -154,7 +154,7 @@ class BankTransactionRuleController extends BaseController
*
* @param EditBankTransactionRuleRequest $request
* @param BankTransactionRule $bank_transaction_rule
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*
*
* @OA\Get(
@ -208,7 +208,7 @@ class BankTransactionRuleController extends BaseController
*
* @param UpdateBankTransactionRuleRequest $request
* @param BankTransactionRule $bank_transaction_rule
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*
*
*
@ -269,7 +269,7 @@ class BankTransactionRuleController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateBankTransactionRuleRequest $request
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*
*
*
@ -317,7 +317,7 @@ class BankTransactionRuleController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreBankTransactionRuleRequest $request
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*
*
*
@ -369,7 +369,7 @@ class BankTransactionRuleController extends BaseController
*
* @param DestroyBankTransactionRuleRequest $request
* @param BankTransactionRule $bank_transaction_rule
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*
*
* @throws \Exception
@ -424,7 +424,7 @@ class BankTransactionRuleController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return \Illuminate\Support\Collection
* @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
*
* @OA\Post(
* path="/api/v1/bank_transation_rules/bulk",

10
app/Http/Controllers/BaseController.php
View File

@ -262,7 +262,7 @@ class BaseController extends Controller
/**
* 404 for the client portal.
* @return Response 404 response
* @return Response| \Illuminate\Http\JsonResponse 404 response
*/
public function notFoundClient()
{
@ -279,7 +279,7 @@ class BaseController extends Controller
*
* @param string|array $message The return error message
* @param int $httpErrorCode 404/401/403 etc
* @return Response The JSON response
* @return Response| \Illuminate\Http\JsonResponse The JSON response
* @throws BindingResolutionException
*/
protected function errorResponse($message, $httpErrorCode = 400)
@ -297,7 +297,7 @@ class BaseController extends Controller
* Refresh API response with latest cahnges
*
* @param Builder $query
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
protected function refreshResponse($query)
{
@ -969,7 +969,7 @@ class BaseController extends Controller
* Sorts the response by keys
*
* @param mixed $response
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
protected function response($response)
{
@ -1020,7 +1020,7 @@ class BaseController extends Controller
* Item Response
*
* @param mixed $item
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
protected function itemResponse($item)
{

29
app/Http/Controllers/ClientController.php
View File

@ -89,7 +89,7 @@ class ClientController extends BaseController
/**
*
* @param ClientFilters $filters
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function index(ClientFilters $filters)
@ -106,7 +106,7 @@ class ClientController extends BaseController
*
* @param ShowClientRequest $request
* @param Client $client
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function show(ShowClientRequest $request, Client $client)
@ -119,7 +119,7 @@ class ClientController extends BaseController
*
* @param EditClientRequest $request
* @param Client $client
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function edit(EditClientRequest $request, Client $client)
@ -132,7 +132,7 @@ class ClientController extends BaseController
*
* @param UpdateClientRequest $request
* @param Client $client
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function update(UpdateClientRequest $request, Client $client)
@ -157,7 +157,7 @@ class ClientController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateClientRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function create(CreateClientRequest $request)
@ -174,7 +174,7 @@ class ClientController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreClientRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function store(StoreClientRequest $request)
@ -203,7 +203,7 @@ class ClientController extends BaseController
*
* @param DestroyClientRequest $request
* @param Client $client
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @throws \Exception
*/
@ -217,7 +217,7 @@ class ClientController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function bulk(BulkClientRequest $request)
@ -284,7 +284,7 @@ class ClientController extends BaseController
*
* @param UploadClientRequest $request
* @param Client $client
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function upload(UploadClientRequest $request, Client $client)
@ -305,7 +305,7 @@ class ClientController extends BaseController
*
* @param PurgeClientRequest $request
* @param Client $client
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*
*/
public function purge(PurgeClientRequest $request, Client $client)
@ -333,7 +333,7 @@ class ClientController extends BaseController
* @param PurgeClientRequest $request
* @param Client $client
* @param string $mergeable_client
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*
*/
@ -351,8 +351,9 @@ class ClientController extends BaseController
return response()->json(['message' => "Client not found"], 400);
}
if($m_client->id == $client->id)
if($m_client->id == $client->id) {
return response()->json(['message' => "Attempting to merge the same client is not possible."], 400);
}
$merged_client = $client->service()->merge($m_client)->save();
@ -364,7 +365,7 @@ class ClientController extends BaseController
*
* @param PurgeClientRequest $request
* @param Client $client
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*/
public function updateTaxData(PurgeClientRequest $request, Client $client)
{
@ -380,7 +381,7 @@ class ClientController extends BaseController
*
* @param ReactivateClientEmailRequest $request
* @param string $bounce_id //could also be the invitationId
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*/
public function reactivateEmail(ReactivateClientEmailRequest $request, string $bounce_id)
{

14
app/Http/Controllers/ClientGatewayTokenController.php
View File

@ -89,7 +89,7 @@ class ClientGatewayTokenController extends BaseController
* ),
* )
* @param ListClientGatewayTokenRequest $request
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function index(ListClientGatewayTokenRequest $request)
{
@ -103,7 +103,7 @@ class ClientGatewayTokenController extends BaseController
*
* @param ShowClientGatewayTokenRequest $request
* @param ClientGatewayToken $client_gateway_token
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -157,7 +157,7 @@ class ClientGatewayTokenController extends BaseController
*
* @param EditClientGatewayTokenRequest $request
* @param ClientGatewayToken $client_gateway_token
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -211,7 +211,7 @@ class ClientGatewayTokenController extends BaseController
*
* @param UpdateClientGatewayTokenRequest $request
* @param ClientGatewayToken $client_gateway_token
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -267,7 +267,7 @@ class ClientGatewayTokenController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateClientGatewayTokenRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -317,7 +317,7 @@ class ClientGatewayTokenController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreClientGatewayTokenRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -369,7 +369,7 @@ class ClientGatewayTokenController extends BaseController
*
* @param DestroyClientGatewayTokenRequest $request
* @param ClientGatewayToken $client_gateway_token
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception

4
app/Http/Controllers/ClientPortal/ContactHashLoginController.php
View File

@ -21,7 +21,7 @@ class ContactHashLoginController extends Controller
/**
* Logs a user into the client portal using their contact_key
* @param string $contact_key The contact key
* @return Redirect
* @return \Illuminate\Http\RedirectResponse
*/
public function login(string $contact_key)
{
@ -50,7 +50,7 @@ class ContactHashLoginController extends Controller
/**
* Generic error page for client portal.
*
* @return void
* @return \Illuminate\View\View
*/
public function errorPage()
{

4
app/Http/Controllers/ClientPortal/PaymentController.php
View File

@ -103,7 +103,7 @@ class PaymentController extends Controller
* and invoice ids for reference.
*
* @param Request $request
* @return RedirectResponse|mixed
* @return \Illuminate\Http\RedirectResponse|mixed
*/
public function process(Request $request)
{
@ -157,7 +157,7 @@ class PaymentController extends Controller
* Pay for invoice/s using credits only.
*
* @param Request $request The request object
* @return \Response The response view
* @return \Illuminate\Http\RedirectResponse The response view
*/
public function credit_response(Request $request)
{

2
app/Http/Controllers/ClientPortal/PaymentMethodController.php
View File

@ -127,7 +127,7 @@ class PaymentMethodController extends Controller
* Remove the specified resource from storage.
*
* @param ClientGatewayToken $payment_method
* @return RedirectResponse
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy(ClientGatewayToken $payment_method)
{

2
app/Http/Controllers/ClientPortal/ProfileController.php
View File

@ -38,7 +38,7 @@ class ProfileController extends Controller
*
* @param UpdateContactRequest $request
* @param ClientContact $client_contact
* @return RedirectResponse
* @return \Illuminate\Http\RedirectResponse
*/
public function update(UpdateContactRequest $request, ClientContact $client_contact)
{

2
app/Http/Controllers/ClientPortal/RecurringInvoiceController.php
View File

@ -66,7 +66,7 @@ class RecurringInvoiceController extends Controller
* @param RequestCancellationRequest $request [description]
* @param RecurringInvoice $recurring_invoice [description]
*
* @return \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse
* @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
*/
public function requestCancellation(RequestCancellationRequest $request, RecurringInvoice $recurring_invoice)
{

3
app/Http/Controllers/ClientPortal/TempRouteController.php
View File

@ -13,14 +13,13 @@ namespace App\Http\Controllers\ClientPortal;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Redirect;
class TempRouteController extends Controller
{
/**
* Logs a user into the client portal using their contact_key
* @param string $hash The hash
* @return Redirect
* @return \Illuminate\View\View
*/
public function index(string $hash)
{

2
app/Http/Controllers/ClientPortal/UploadController.php
View File

@ -26,7 +26,7 @@ class UploadController extends Controller
* Main logic behind uploading the files.
*
* @param StoreUploadRequest $request
* @return Response|ResponseFactory
* @return Response| \Illuminate\Http\JsonResponse|ResponseFactory
*/
public function __invoke(StoreUploadRequest $request)
{

2
app/Http/Controllers/ClientStatementController.php
View File

@ -33,7 +33,7 @@ class ClientStatementController extends BaseController
* Update the specified resource in storage.
*
* @param CreateStatementRequest $request
* @return Response
* @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse
*/
public function statement(CreateStatementRequest $request)
{

29
app/Http/Controllers/CompanyController.php
View File

@ -78,7 +78,7 @@ class CompanyController extends BaseController
/**
* Display a listing of the resource.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/companies",
@ -136,7 +136,7 @@ class CompanyController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateCompanyRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -186,7 +186,7 @@ class CompanyController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreCompanyRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -272,7 +272,7 @@ class CompanyController extends BaseController
*
* @param ShowCompanyRequest $request
* @param Company $company
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -326,7 +326,7 @@ class CompanyController extends BaseController
*
* @param EditCompanyRequest $request
* @param Company $company
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -380,7 +380,7 @@ class CompanyController extends BaseController
*
* @param UpdateCompanyRequest $request
* @param Company $company
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Put(
@ -457,7 +457,7 @@ class CompanyController extends BaseController
*
* @param DestroyCompanyRequest $request
* @param Company $company
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -573,7 +573,7 @@ class CompanyController extends BaseController
*
* @param UploadCompanyRequest $request
* @param Company $company
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -636,7 +636,7 @@ class CompanyController extends BaseController
*
* @param DefaultCompanyRequest $request
* @param Company $company
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -706,6 +706,11 @@ class CompanyController extends BaseController
return $this->itemResponse($company->fresh());
}
/**
*
*
* @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse
*/
public function logo()
{
@ -720,13 +725,11 @@ class CompanyController extends BaseController
if ($response->successful()) {
$logo = $response->body();
}
else {
} else {
$logo = base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=');
}
}
catch(\Exception $e){
} catch(\Exception $e) {
$logo = base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=');

19
app/Http/Controllers/CompanyGatewayController.php
View File

@ -72,7 +72,7 @@ class CompanyGatewayController extends BaseController
/**
* Display a listing of the resource.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -119,7 +119,7 @@ class CompanyGatewayController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateCompanyGatewayRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -168,7 +168,7 @@ class CompanyGatewayController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreCompanyGatewayRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -248,7 +248,7 @@ class CompanyGatewayController extends BaseController
*
* @param ShowCompanyGatewayRequest $request
* @param CompanyGateway $company_gateway
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -302,7 +302,7 @@ class CompanyGatewayController extends BaseController
*
* @param EditCompanyGatewayRequest $request
* @param CompanyGateway $company_gateway
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -356,7 +356,7 @@ class CompanyGatewayController extends BaseController
*
* @param UpdateCompanyGatewayRequest $request
* @param CompanyGateway $company_gateway
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Put(
@ -437,7 +437,7 @@ class CompanyGatewayController extends BaseController
*
* @param DestroyCompanyGatewayRequest $request
* @param CompanyGateway $company_gateway
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -494,7 +494,7 @@ class CompanyGatewayController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -567,8 +567,9 @@ class CompanyGatewayController extends BaseController
{
//Throttle here
if (Cache::has("throttle_polling:import_customers:{$company_gateway->company->company_key}:{$company_gateway->hashed_id}"))
if (Cache::has("throttle_polling:import_customers:{$company_gateway->company->company_key}:{$company_gateway->hashed_id}")) {
return response()->json(['message' => 'Please wait whilst your previous attempts complete.'], 200);
}
dispatch(function () use ($company_gateway) {
MultiDB::setDb($company_gateway->company->db);

2
app/Http/Controllers/CompanyLedgerController.php
View File

@ -31,7 +31,7 @@ class CompanyLedgerController extends BaseController
* Store a newly created resource in storage.
*
* @param ShowCompanyLedgerRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/company_ledger",

2
app/Http/Controllers/CompanyUserController.php
View File

@ -107,7 +107,7 @@ class CompanyUserController extends BaseController
* )
* @param UpdateCompanyUserRequest $request
* @param User $user
* @return Response|mixed|void
* @return Response| \Illuminate\Http\JsonResponse|mixed|void
*/
public function update(UpdateCompanyUserRequest $request, User $user)
{

2
app/Http/Controllers/ConnectedAccountController.php
View File

@ -38,7 +38,7 @@ class ConnectedAccountController extends BaseController
* Connect an OAuth account to a regular email/password combination account
*
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*
*
* @OA\Post(

2
app/Http/Controllers/Contact/InvoiceController.php
View File

@ -36,7 +36,7 @@ class InvoiceController extends BaseController
*
* @param InvoiceFilters $filters The filters
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function index(InvoiceFilters $filters)
{

4
app/Http/Controllers/Contact/LoginController.php
View File

@ -58,7 +58,7 @@ class LoginController extends BaseController
*
* @param Request $request The request
*
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
* @throws \Illuminate\Validation\ValidationException
*/
public function apiLogin(Request $request)
@ -86,7 +86,7 @@ class LoginController extends BaseController
* Redirect the user to the provider authentication page.
*
* @param string $provider
* @return void
* @return mixed
*/
public function redirectToProvider(string $provider)
{

18
app/Http/Controllers/CreditController.php
View File

@ -69,7 +69,7 @@ class CreditController extends BaseController
*
* @param CreditFilters $filters The filters
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/credits",
@ -115,7 +115,7 @@ class CreditController extends BaseController
*
* @param CreateCreditRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -164,7 +164,7 @@ class CreditController extends BaseController
*
* @param StoreCreditRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -226,7 +226,7 @@ class CreditController extends BaseController
* @param ShowCreditRequest $request The request
* @param Credit $credit The credit
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -281,7 +281,7 @@ class CreditController extends BaseController
* @param EditCreditRequest $request The request
* @param Credit $credit The credit
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/credits/{id}/edit",
@ -334,7 +334,7 @@ class CreditController extends BaseController
*
* @param UpdateCreditRequest $request The request
* @param Credit $credit
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \ReflectionException
@ -458,7 +458,7 @@ class CreditController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return \Illuminate\Support\Collection
* @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse
*
* @OA\Post(
* path="/api/v1/credits/bulk",
@ -700,7 +700,7 @@ class CreditController extends BaseController
* ),
* )
* @param $invitation_key
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
* @return \Symfony\Component\HttpFoundation\StreamedResponse
*/
public function downloadPdf($invitation_key)
{
@ -801,7 +801,7 @@ class CreditController extends BaseController
*
* @param UploadCreditRequest $request
* @param Credit $credit
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*

16
app/Http/Controllers/DesignController.php
View File

@ -82,7 +82,7 @@ class DesignController extends BaseController
* ),
* )
* @param DesignFilters $filters
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function index(DesignFilters $filters)
{
@ -96,7 +96,7 @@ class DesignController extends BaseController
*
* @param ShowDesignRequest $request
* @param Design $design
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -150,7 +150,7 @@ class DesignController extends BaseController
*
* @param EditDesignRequest $request
* @param Design $design
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -204,7 +204,7 @@ class DesignController extends BaseController
*
* @param UpdateDesignRequest $request
* @param Design $design
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -265,7 +265,7 @@ class DesignController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateDesignRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -313,7 +313,7 @@ class DesignController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreDesignRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -415,7 +415,7 @@ class DesignController extends BaseController
*
* @param DestroyDesignRequest $request
* @param Design $design
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -473,7 +473,7 @@ class DesignController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(

10
app/Http/Controllers/DocumentController.php
View File

@ -70,7 +70,7 @@ class DocumentController extends BaseController
* ),
* )
* @param DocumentFilters $filters
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function index(DocumentFilters $filters)
{
@ -105,7 +105,7 @@ class DocumentController extends BaseController
*
* @param ShowDocumentRequest $request
* @param Document $document
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function show(ShowDocumentRequest $request, Document $document)
{
@ -131,7 +131,7 @@ class DocumentController extends BaseController
*
* @param EditDocumentRequest $request
* @param Document $document
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function edit(EditDocumentRequest $request, Document $document)
{
@ -143,7 +143,7 @@ class DocumentController extends BaseController
*
* @param UpdateDocumentRequest $request
* @param Document $document
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function update(UpdateDocumentRequest $request, Document $document)
{
@ -158,7 +158,7 @@ class DocumentController extends BaseController
*
* @param DestroyDocumentRequest $request
* @param Document $document
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function destroy(DestroyDocumentRequest $request, Document $document)
{

16
app/Http/Controllers/ExpenseCategoryController.php
View File

@ -78,7 +78,7 @@ class ExpenseCategoryController extends BaseController
*
* Display a listing of the resource.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function index(ExpenseCategoryFilters $filters)
{
@ -93,7 +93,7 @@ class ExpenseCategoryController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateExpenseCategoryRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -142,7 +142,7 @@ class ExpenseCategoryController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreExpenseCategoryRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -192,7 +192,7 @@ class ExpenseCategoryController extends BaseController
*
* @param ShowExpenseCategoryRequest $request
* @param ExpenseCategory $expense_category
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -245,7 +245,7 @@ class ExpenseCategoryController extends BaseController
*
* @param EditExpenseCategoryRequest $request
* @param ExpenseCategory $expense_category
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -298,7 +298,7 @@ class ExpenseCategoryController extends BaseController
*
* @param UpdateExpenseCategoryRequest $request
* @param ExpenseCategory $expense_category
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -355,7 +355,7 @@ class ExpenseCategoryController extends BaseController
*
* @param DestroyExpenseCategoryRequest $request
* @param ExpenseCategory $expense_category
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -410,7 +410,7 @@ class ExpenseCategoryController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(

18
app/Http/Controllers/ExpenseController.php
View File

@ -98,7 +98,7 @@ class ExpenseController extends BaseController
* ),
* )
* @param ExpenseFilters $filters
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function index(ExpenseFilters $filters)
{
@ -112,7 +112,7 @@ class ExpenseController extends BaseController
*
* @param ShowExpenseRequest $request
* @param Expense $expense
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -166,7 +166,7 @@ class ExpenseController extends BaseController
*
* @param EditExpenseRequest $request
* @param Expense $expense
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -220,7 +220,7 @@ class ExpenseController extends BaseController
*
* @param UpdateExpenseRequest $request
* @param Expense $expense
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -286,7 +286,7 @@ class ExpenseController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateExpenseRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -334,7 +334,7 @@ class ExpenseController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreExpenseRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -387,7 +387,7 @@ class ExpenseController extends BaseController
*
* @param DestroyExpenseRequest $request
* @param Expense $expense
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -441,7 +441,7 @@ class ExpenseController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -524,7 +524,7 @@ class ExpenseController extends BaseController
*
* @param UploadExpenseRequest $request
* @param Expense $expense
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*

18
app/Http/Controllers/GroupSettingController.php
View File

@ -55,7 +55,7 @@ class GroupSettingController extends BaseController
* Show the form for creating a new resource.
*
* @param GroupSettingFilters $filters
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function index(GroupSettingFilters $filters)
@ -69,7 +69,7 @@ class GroupSettingController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateGroupSettingRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function create(CreateGroupSettingRequest $request)
@ -86,7 +86,7 @@ class GroupSettingController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreGroupSettingRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function store(StoreGroupSettingRequest $request)
@ -108,7 +108,7 @@ class GroupSettingController extends BaseController
*
* @param ShowGroupSettingRequest $request
* @param GroupSetting $group_setting
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function show(ShowGroupSettingRequest $request, GroupSetting $group_setting)
@ -121,7 +121,7 @@ class GroupSettingController extends BaseController
*
* @param EditGroupSettingRequest $request
* @param GroupSetting $group_setting
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function edit(EditGroupSettingRequest $request, GroupSetting $group_setting)
@ -134,7 +134,7 @@ class GroupSettingController extends BaseController
*
* @param UpdateGroupSettingRequest $request
* @param GroupSetting $group_setting
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function update(UpdateGroupSettingRequest $request, GroupSetting $group_setting)
@ -158,7 +158,7 @@ class GroupSettingController extends BaseController
*
* @param DestroyGroupSettingRequest $request
* @param GroupSetting $group_setting
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -173,7 +173,7 @@ class GroupSettingController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function bulk()
@ -210,7 +210,7 @@ class GroupSettingController extends BaseController
*
* @param UploadGroupSettingRequest $request
* @param GroupSetting $group_setting
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function upload(UploadGroupSettingRequest $request, GroupSetting $group_setting)

2
app/Http/Controllers/ImportController.php
View File

@ -27,7 +27,7 @@ class ImportController extends Controller
*
* @param PreImportRequest $request
*
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*
* @OA\Post(
* path="/api/v1/preimport",

14
app/Http/Controllers/InvoiceController.php
View File

@ -81,7 +81,7 @@ class InvoiceController extends BaseController
*
* @param InvoiceFilters $filters The filters
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/invoices",
@ -128,7 +128,7 @@ class InvoiceController extends BaseController
*
* @param CreateInvoiceRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -176,7 +176,7 @@ class InvoiceController extends BaseController
*
* @param StoreInvoiceRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -248,7 +248,7 @@ class InvoiceController extends BaseController
* @param ShowInvoiceRequest $request The request
* @param Invoice $invoice The invoice
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -303,7 +303,7 @@ class InvoiceController extends BaseController
* @param EditInvoiceRequest $request The request
* @param Invoice $invoice The invoice
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/invoices/{id}/edit",
@ -357,7 +357,7 @@ class InvoiceController extends BaseController
* @param UpdateInvoiceRequest $request The request
* @param Invoice $invoice The invoice
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Put(
@ -954,7 +954,7 @@ class InvoiceController extends BaseController
*
* @param UploadInvoiceRequest $request
* @param Invoice $invoice
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*

2
app/Http/Controllers/LicenseController.php
View File

@ -28,7 +28,7 @@ class LicenseController extends BaseController
/**
* Claim a white label license.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/claim_license",

2
app/Http/Controllers/LogoutController.php
View File

@ -52,7 +52,7 @@ class LogoutController extends BaseController
* ),
* )
* @param Request $request
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function index(Request $request)
{

6
app/Http/Controllers/MigrationController.php
View File

@ -80,7 +80,7 @@ class MigrationController extends BaseController
* ),
* )
* @param Company $company
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
* @throws \Exception
*/
public function purgeCompany(Company $company)
@ -171,7 +171,7 @@ class MigrationController extends BaseController
* )
* @param Request $request
* @param Company $company
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*/
public function purgeCompanySaveSettings(Request $request, Company $company)
{
@ -255,7 +255,7 @@ class MigrationController extends BaseController
* ),
* )
* @param Request $request
* @return \Illuminate\Http\JsonResponse|void
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response|void
*/
public function startMigration(Request $request)
{

2
app/Http/Controllers/OneTimeTokenController.php
View File

@ -34,7 +34,7 @@ class OneTimeTokenController extends BaseController
* Store a newly created resource in storage.
*
* @param OneTimeTokenRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Post(
* path="/api/v1/one_time_token",

18
app/Http/Controllers/PaymentController.php
View File

@ -67,7 +67,7 @@ class PaymentController extends BaseController
*
* @param PaymentFilters $filters The filters
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -115,7 +115,7 @@ class PaymentController extends BaseController
*
* @param CreatePaymentRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -165,7 +165,7 @@ class PaymentController extends BaseController
*
* @param StorePaymentRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -222,7 +222,7 @@ class PaymentController extends BaseController
* @param ShowPaymentRequest $request The request
* @param Payment $payment The invoice
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -277,7 +277,7 @@ class PaymentController extends BaseController
* @param EditPaymentRequest $request The request
* @param Payment $payment The invoice
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -332,7 +332,7 @@ class PaymentController extends BaseController
* @param UpdatePaymentRequest $request The request
* @param Payment $payment The invoice
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Put(
@ -454,7 +454,7 @@ class PaymentController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return \Illuminate\Support\Collection
* @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -667,7 +667,7 @@ class PaymentController extends BaseController
*
* @param RefundPaymentRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -720,7 +720,7 @@ class PaymentController extends BaseController
*
* @param UploadPaymentRequest $request
* @param Payment $payment
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*

12
app/Http/Controllers/PaymentTermController.php
View File

@ -94,7 +94,7 @@ class PaymentTermController extends BaseController
*
* @param CreatePaymentTermRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -142,7 +142,7 @@ class PaymentTermController extends BaseController
*
* @param StorePaymentTermRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -236,7 +236,7 @@ class PaymentTermController extends BaseController
* )
* @param ShowPaymentTermRequest $request
* @param PaymentTerm $payment_term
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function show(ShowPaymentTermRequest $request, PaymentTerm $payment_term)
{
@ -286,7 +286,7 @@ class PaymentTermController extends BaseController
* )
* @param EditPaymentTermRequest $request
* @param PaymentTerm $payment_term
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function edit(EditPaymentTermRequest $request, PaymentTerm $payment_term)
{
@ -299,7 +299,7 @@ class PaymentTermController extends BaseController
* @param UpdatePaymentTermRequest $request The request
* @param PaymentTerm $payment_term The payment term
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Put(
@ -411,7 +411,7 @@ class PaymentTermController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return \Illuminate\Support\Collection
* @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
*
*
* @OA\Post(

4
app/Http/Controllers/PingController.php
View File

@ -20,7 +20,7 @@ class PingController extends BaseController
/**
* Get a ping response from the system.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/ping",
@ -55,7 +55,7 @@ class PingController extends BaseController
/**
* Get a health check of the system.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/health_check",

6
app/Http/Controllers/PreviewController.php
View File

@ -146,8 +146,7 @@ class PreviewController extends BaseController
if (request()->has('entity') &&
request()->has('entity_id') &&
! empty(request()->input('entity')) &&
! empty(request()->input('entity_id')))
{
! empty(request()->input('entity_id'))) {
$design_object = json_decode(json_encode(request()->input('design')));
@ -174,8 +173,7 @@ class PreviewController extends BaseController
if($entity_obj->client) {
$html = new HtmlEngine($entity_obj->invitations()->first());
}
else {
} else {
$html = new VendorHtmlEngine($entity_obj->invitations()->first());
}

18
app/Http/Controllers/ProductController.php
View File

@ -83,7 +83,7 @@ class ProductController extends BaseController
* ),
* )
* @param ProductFilters $filters
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function index(ProductFilters $filters)
{
@ -96,7 +96,7 @@ class ProductController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateProductRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -145,7 +145,7 @@ class ProductController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreProductRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -195,7 +195,7 @@ class ProductController extends BaseController
*
* @param ShowProductRequest $request
* @param Product $product
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -249,7 +249,7 @@ class ProductController extends BaseController
*
* @param EditProductRequest $request
* @param Product $product
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/products/{id}/edit",
@ -302,7 +302,7 @@ class ProductController extends BaseController
*
* @param UpdateProductRequest $request
* @param Product $product
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Put(
@ -362,7 +362,7 @@ class ProductController extends BaseController
*
* @param DestroyProductRequest $request
* @param Product $product
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -416,7 +416,7 @@ class ProductController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return \Illuminate\Support\Collection
* @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -498,7 +498,7 @@ class ProductController extends BaseController
*
* @param UploadProductRequest $request
* @param Product $product
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*

18
app/Http/Controllers/ProjectController.php
View File

@ -88,7 +88,7 @@ class ProjectController extends BaseController
* ),
* )
* @param ProjectFilters $filters
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function index(ProjectFilters $filters)
{
@ -102,7 +102,7 @@ class ProjectController extends BaseController
*
* @param ShowProjectRequest $request
* @param Project $project
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -156,7 +156,7 @@ class ProjectController extends BaseController
*
* @param EditProjectRequest $request
* @param Project $project
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -210,7 +210,7 @@ class ProjectController extends BaseController
*
* @param UpdateProjectRequest $request
* @param Project $project
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -278,7 +278,7 @@ class ProjectController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateProjectRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -326,7 +326,7 @@ class ProjectController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreProjectRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -388,7 +388,7 @@ class ProjectController extends BaseController
*
* @param DestroyProjectRequest $request
* @param Project $project
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -445,7 +445,7 @@ class ProjectController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -535,7 +535,7 @@ class ProjectController extends BaseController
*
* @param UploadProjectRequest $request
* @param Project $project
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Put(
* path="/api/v1/projects/{id}/upload",

16
app/Http/Controllers/PurchaseOrderController.php
View File

@ -60,7 +60,7 @@ class PurchaseOrderController extends BaseController
*
* @param \App\Filters\PurchaseOrderFilters $filters The filters
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/purchase_orders",
@ -105,7 +105,7 @@ class PurchaseOrderController extends BaseController
*
* @param CreatePurchaseOrderRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -153,7 +153,7 @@ class PurchaseOrderController extends BaseController
*
* @param StorePurchaseOrderRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -208,7 +208,7 @@ class PurchaseOrderController extends BaseController
* @param ShowPurchaseOrderRequest $request The request
* @param PurchaseOrder $purchase_order The purchase order
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -262,7 +262,7 @@ class PurchaseOrderController extends BaseController
* @param EditPurchaseOrderRequest $request The request
* @param PurchaseOrder $purchase_order The purchase order
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/purchase_orders/{id}/edit",
@ -314,7 +314,7 @@ class PurchaseOrderController extends BaseController
*
* @param UpdatePurchaseOrderRequest $request The request
* @param PurchaseOrder $purchase_order
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \ReflectionException
@ -434,7 +434,7 @@ class PurchaseOrderController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return \Illuminate\Support\Collection
* @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
*
* @OA\Post(
* path="/api/v1/purchase_orders/bulk",
@ -726,7 +726,7 @@ class PurchaseOrderController extends BaseController
*
* @param UploadPurchaseOrderRequest $request
* @param PurchaseOrder $purchase_order
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*

20
app/Http/Controllers/QuoteController.php
View File

@ -83,7 +83,7 @@ class QuoteController extends BaseController
* Display a listing of the resource.
*
* @param QuoteFilters $filters
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -128,7 +128,7 @@ class QuoteController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateQuoteRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -178,7 +178,7 @@ class QuoteController extends BaseController
*
* @param StoreQuoteRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -235,7 +235,7 @@ class QuoteController extends BaseController
* @param ShowQuoteRequest $request The request
* @param Quote $quote The quote
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -290,7 +290,7 @@ class QuoteController extends BaseController
* @param EditQuoteRequest $request The request
* @param Quote $quote The quote
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -345,7 +345,7 @@ class QuoteController extends BaseController
* @param UpdateQuoteRequest $request The request
* @param Quote $quote The quote
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Put(
@ -465,7 +465,7 @@ class QuoteController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return \Illuminate\Support\Collection
* @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -692,7 +692,7 @@ class QuoteController extends BaseController
* @param ActionQuoteRequest $request
* @param Quote $quote
* @param $action
* @return \Illuminate\Http\JsonResponse|Response|mixed|\Symfony\Component\HttpFoundation\StreamedResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response|Response|mixed|\Symfony\Component\HttpFoundation\StreamedResponse
*/
public function action(ActionQuoteRequest $request, Quote $quote, $action)
{
@ -901,7 +901,7 @@ class QuoteController extends BaseController
* ),
* )
* @param $invitation_key
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
* @return \Symfony\Component\HttpFoundation\StreamedResponse|\Illuminate\Http\JsonResponse
*/
public function downloadEQuote($invitation_key)
{
@ -934,7 +934,7 @@ class QuoteController extends BaseController
*
* @param UploadQuoteRequest $request
* @param Quote $quote
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*

18
app/Http/Controllers/RecurringExpenseController.php
View File

@ -97,7 +97,7 @@ class RecurringExpenseController extends BaseController
* ),
* )
* @param RecurringExpenseFilters $filters
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function index(RecurringExpenseFilters $filters)
{
@ -111,7 +111,7 @@ class RecurringExpenseController extends BaseController
*
* @param ShowRecurringExpenseRequest $request
* @param RecurringExpense $recurring_expense
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -165,7 +165,7 @@ class RecurringExpenseController extends BaseController
*
* @param EditRecurringExpenseRequest $request
* @param RecurringExpense $recurring_expense
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -219,7 +219,7 @@ class RecurringExpenseController extends BaseController
*
* @param UpdateRecurringExpenseRequest $request
* @param RecurringExpense $recurring_expense
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -284,7 +284,7 @@ class RecurringExpenseController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateRecurringExpenseRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -332,7 +332,7 @@ class RecurringExpenseController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreRecurringExpenseRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -384,7 +384,7 @@ class RecurringExpenseController extends BaseController
*
* @param DestroyRecurringExpenseRequest $request
* @param RecurringExpense $recurring_expense
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -438,7 +438,7 @@ class RecurringExpenseController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -557,7 +557,7 @@ class RecurringExpenseController extends BaseController
*
* @param UploadRecurringExpenseRequest $request
* @param RecurringExpense $recurring_expense
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*

16
app/Http/Controllers/RecurringInvoiceController.php
View File

@ -70,7 +70,7 @@ class RecurringInvoiceController extends BaseController
*
* @param RecurringInvoiceFilters $filters The filters
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -117,7 +117,7 @@ class RecurringInvoiceController extends BaseController
*
* @param CreateRecurringInvoiceRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -167,7 +167,7 @@ class RecurringInvoiceController extends BaseController
*
* @param StoreRecurringInvoiceRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -223,7 +223,7 @@ class RecurringInvoiceController extends BaseController
* @param ShowRecurringInvoiceRequest $request The request
* @param RecurringInvoice $recurring_invoice The RecurringInvoice
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -278,7 +278,7 @@ class RecurringInvoiceController extends BaseController
* @param EditRecurringInvoiceRequest $request The request
* @param RecurringInvoice $recurring_invoice The RecurringInvoice
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -333,7 +333,7 @@ class RecurringInvoiceController extends BaseController
* @param UpdateRecurringInvoiceRequest $request The request
* @param RecurringInvoice $recurring_invoice The RecurringInvoice
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Put(
@ -451,7 +451,7 @@ class RecurringInvoiceController extends BaseController
* @param ActionRecurringInvoiceRequest $request
* @param RecurringInvoice $recurring_invoice
* @param $action
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function action(ActionRecurringInvoiceRequest $request, RecurringInvoice $recurring_invoice, $action)
{
@ -520,7 +520,7 @@ class RecurringInvoiceController extends BaseController
*
* @param UploadRecurringInvoiceRequest $request
* @param RecurringInvoice $recurring_invoice
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*

14
app/Http/Controllers/RecurringQuoteController.php
View File

@ -66,7 +66,7 @@ class RecurringQuoteController extends BaseController
*
* @param RecurringQuoteFilters $filters The filters
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -113,7 +113,7 @@ class RecurringQuoteController extends BaseController
*
* @param CreateRecurringQuoteRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -161,7 +161,7 @@ class RecurringQuoteController extends BaseController
*
* @param StoreRecurringQuoteRequest $request The request
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -210,7 +210,7 @@ class RecurringQuoteController extends BaseController
* @param ShowRecurringQuoteRequest $request The request
* @param RecurringQuote $recurring_quote The RecurringQuote
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -265,7 +265,7 @@ class RecurringQuoteController extends BaseController
* @param EditRecurringQuoteRequest $request The request
* @param RecurringQuote $recurring_quote The RecurringQuote
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -320,7 +320,7 @@ class RecurringQuoteController extends BaseController
* @param UpdateRecurringQuoteRequest $request The request
* @param RecurringQuote $recurring_quote The RecurringQuote
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Put(
@ -435,7 +435,7 @@ class RecurringQuoteController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return \Illuminate\Support\Collection
* @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
*
*
* @OA\Post(

3
app/Http/Controllers/Reports/TaskReportController.php
View File

@ -66,8 +66,7 @@ class TaskReportController extends BaseController
/** @var \App\Models\User $user */
$user = auth()->user();
if ($request->has('send_email') && $request->get('send_email') && $request->missing('output'))
{
if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
SendToAdmin::dispatch($user->company(), $request->all(), TaskExport::class, $this->filename);
return response()->json(['message' => 'working...'], 200);

6
app/Http/Controllers/SelfUpdateController.php
View File

@ -62,8 +62,9 @@ class SelfUpdateController extends BaseController
$file_headers = @get_headers($this->getDownloadUrl());
if(!is_array($file_headers))
if(!is_array($file_headers)) {
return response()->json(['message' => 'There was a problem reaching the update server, please try again in a little while.'], 410);
}
if (stripos($file_headers[0], "404 Not Found") > 0 || (stripos($file_headers[0], "302 Found") > 0 && stripos($file_headers[7], "404 Not Found") > 0)) {
return response()->json(['message' => 'Download not yet available. Please try again shortly.'], 410);
@ -100,8 +101,9 @@ class SelfUpdateController extends BaseController
}
}
if(Storage::disk('base')->directoryExists('resources/lang'))
if(Storage::disk('base')->directoryExists('resources/lang')) {
Storage::disk('base')->deleteDirectory('resources/lang');
}
nlog('Removing cache files');

2
app/Http/Controllers/Shop/ProductController.php
View File

@ -32,7 +32,7 @@ class ProductController extends BaseController
* Display a listing of the resource.
*
* @param Request $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function index(Request $request)
{

1
app/Http/Controllers/SmtpController.php
View File

@ -18,7 +18,6 @@ use Illuminate\Support\Facades\Mail;
class SmtpController extends BaseController
{
public function __construct()
{
parent::__construct();

2
app/Http/Controllers/StaticController.php
View File

@ -20,7 +20,7 @@ class StaticController extends BaseController
/**
* Show the list of Invoices.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/statics",

2
app/Http/Controllers/SubscriptionController.php
View File

@ -420,7 +420,7 @@ class SubscriptionController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return \Illuminate\Support\Collection
* @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
*
*
* @OA\Post(

2
app/Http/Controllers/Support/Messages/SendingController.php
View File

@ -60,7 +60,7 @@ class SendingController extends Controller
* ),
* )
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*/
public function __invoke(Request $request)
{

14
app/Http/Controllers/SystemLogController.php
View File

@ -23,7 +23,7 @@ class SystemLogController extends BaseController
*
* @param SystemLogFilters $filters The filters
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/system_logs",
@ -73,7 +73,7 @@ class SystemLogController extends BaseController
/**
* Show the form for creating a new resource.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function create()
{
@ -89,7 +89,7 @@ class SystemLogController extends BaseController
* Store a newly created resource in storage.
*
* @param Request $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function store(Request $request)
{
@ -106,7 +106,7 @@ class SystemLogController extends BaseController
*
* @param Request $request The request
* @param SystemLog $system_log
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -159,7 +159,7 @@ class SystemLogController extends BaseController
* Show the form for editing the specified resource.
*
* @param int $id
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function edit($id)
{
@ -176,7 +176,7 @@ class SystemLogController extends BaseController
*
* @param Request $request
* @param int $id
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function update(Request $request, $id)
{
@ -192,7 +192,7 @@ class SystemLogController extends BaseController
* Remove the specified resource from storage.
*
* @param int $id
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function destroy($id)
{

20
app/Http/Controllers/TaskController.php
View File

@ -100,7 +100,7 @@ class TaskController extends BaseController
* ),
* )
* @param TaskFilters $filters
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function index(TaskFilters $filters)
{
@ -114,7 +114,7 @@ class TaskController extends BaseController
*
* @param ShowTaskRequest $request
* @param Task $task
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -168,7 +168,7 @@ class TaskController extends BaseController
*
* @param EditTaskRequest $request
* @param Task $task
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -222,7 +222,7 @@ class TaskController extends BaseController
*
* @param UpdateTaskRequest $request
* @param Task $task
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -294,7 +294,7 @@ class TaskController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateTaskRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -342,7 +342,7 @@ class TaskController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreTaskRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -397,7 +397,7 @@ class TaskController extends BaseController
*
* @param DestroyTaskRequest $request
* @param Task $task
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -452,7 +452,7 @@ class TaskController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -542,7 +542,7 @@ class TaskController extends BaseController
*
* @param UploadTaskRequest $request
* @param Task $task
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -604,7 +604,7 @@ class TaskController extends BaseController
* Store a newly created resource in storage.
*
* @param SortTaskRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*

16
app/Http/Controllers/TaskStatusController.php
View File

@ -55,7 +55,7 @@ class TaskStatusController extends BaseController
* index
*
* @param TaskStatusFilters $filters
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function index(TaskStatusFilters $filters)
{
@ -69,7 +69,7 @@ class TaskStatusController extends BaseController
* create
*
* @param CreateTaskStatusRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function create(CreateTaskStatusRequest $request)
{
@ -85,7 +85,7 @@ class TaskStatusController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreTaskStatusRequest $request The request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function store(StoreTaskStatusRequest $request)
@ -104,7 +104,7 @@ class TaskStatusController extends BaseController
/**
* @param ShowTaskStatusRequest $request
* @param TaskStatus $task_status
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function show(ShowTaskStatusRequest $request, TaskStatus $task_status)
{
@ -114,7 +114,7 @@ class TaskStatusController extends BaseController
/**
* @param EditTaskStatusRequest $request
* @param TaskStatus $payment
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function edit(EditTaskStatusRequest $request, TaskStatus $payment)
{
@ -126,7 +126,7 @@ class TaskStatusController extends BaseController
*
* @param UpdateTaskStatusRequest $request The request
* @param TaskStatus $task_status The payment term
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function update(UpdateTaskStatusRequest $request, TaskStatus $task_status)
{
@ -148,7 +148,7 @@ class TaskStatusController extends BaseController
*
* @param DestroyTaskStatusRequest $request
* @param TaskStatus $task_status
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @throws \Exception
*/
@ -162,7 +162,7 @@ class TaskStatusController extends BaseController
/**
* Perform bulk actions on the list view.
* @param ActionTaskStatusRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function bulk(ActionTaskStatusRequest $request)
{

16
app/Http/Controllers/TaxRateController.php
View File

@ -77,7 +77,7 @@ class TaxRateController extends BaseController
*
* Display a listing of the resource.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function index(TaxRateFilters $filters)
{
@ -90,7 +90,7 @@ class TaxRateController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateTaxRateRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -137,7 +137,7 @@ class TaxRateController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreTaxRateRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*/
public function store(StoreTaxRateRequest $request)
{
@ -156,7 +156,7 @@ class TaxRateController extends BaseController
*
* @param ShowTaxRateRequest $request
* @param TaxRate $tax_rate
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -209,7 +209,7 @@ class TaxRateController extends BaseController
*
* @param EditTaxRateRequest $request
* @param TaxRate $tax_rate
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -262,7 +262,7 @@ class TaxRateController extends BaseController
*
* @param UpdateTaxRateRequest $request
* @param TaxRate $tax_rate
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -319,7 +319,7 @@ class TaxRateController extends BaseController
*
* @param DestroyTaxRateRequest $request
* @param TaxRate $tax_rate
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -374,7 +374,7 @@ class TaxRateController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(

2
app/Http/Controllers/TemplateController.php
View File

@ -31,7 +31,7 @@ class TemplateController extends BaseController
/**
* Returns a template filled with entity variables.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
* @OA\Post(
* path="/api/v1/templates",

16
app/Http/Controllers/TokenController.php
View File

@ -87,7 +87,7 @@ class TokenController extends BaseController
* ),
* )
* @param TokenFilters $filters
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function index(TokenFilters $filters)
{
@ -103,7 +103,7 @@ class TokenController extends BaseController
*
* @param ShowTokenRequest $request
* @param CompanyToken $token
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -157,7 +157,7 @@ class TokenController extends BaseController
*
* @param EditTokenRequest $request
* @param CompanyToken $token
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -213,7 +213,7 @@ class TokenController extends BaseController
*
* @param UpdateTokenRequest $request
* @param CompanyToken $token
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -275,7 +275,7 @@ class TokenController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateTokenRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -324,7 +324,7 @@ class TokenController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreTokenRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -376,7 +376,7 @@ class TokenController extends BaseController
*
* @param DestroyTokenRequest $request
* @param CompanyToken $token
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -433,7 +433,7 @@ class TokenController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(

2
app/Http/Controllers/Traits/VerifiesUserEmail.php
View File

@ -28,7 +28,7 @@ trait VerifiesUserEmail
use MakesHash;
/**
* @return RedirectResponse
* @return \Illuminate\Http\RedirectResponse
*/
public function confirm()
{

8
app/Http/Controllers/TwilioController.php
View File

@ -34,7 +34,7 @@ class TwilioController extends BaseController
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\JsonResponse;
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response;
*/
public function generate(GenerateSmsRequest $request)
{
@ -94,7 +94,7 @@ class TwilioController extends BaseController
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\JsonResponse;
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response;
*/
public function confirm(ConfirmSmsRequest $request)
{
@ -143,7 +143,7 @@ class TwilioController extends BaseController
/**
* generate2faResetCode
*
* @return \Illuminate\Http\JsonResponse;
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response;
*/
public function generate2faResetCode(Generate2faRequest $request)
{
@ -193,7 +193,7 @@ class TwilioController extends BaseController
* confirm2faResetCode
*
* @param Confirm2faRequest $request
* @return \Illuminate\Http\JsonResponse;
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response;
*/
public function confirm2faResetCode(Confirm2faRequest $request)
{

22
app/Http/Controllers/UserController.php
View File

@ -67,7 +67,7 @@ class UserController extends BaseController
* Display a listing of the resource.
*
* @param UserFilters $filters
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function index(UserFilters $filters)
@ -81,7 +81,7 @@ class UserController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateUserRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function create(CreateUserRequest $request)
@ -95,7 +95,7 @@ class UserController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreUserRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function store(StoreUserRequest $request)
@ -126,7 +126,7 @@ class UserController extends BaseController
*
* @param ShowUserRequest $request
* @param User $user
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function show(ShowUserRequest $request, User $user)
@ -139,7 +139,7 @@ class UserController extends BaseController
*
* @param EditUserRequest $request
* @param User $user
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function edit(EditUserRequest $request, User $user)
@ -152,7 +152,7 @@ class UserController extends BaseController
*
* @param UpdateUserRequest $request
* @param User $user
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function update(UpdateUserRequest $request, User $user)
{
@ -191,7 +191,7 @@ class UserController extends BaseController
*
* @param DestroyUserRequest $request
* @param User $user
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*
*/
public function destroy(DestroyUserRequest $request, User $user)
@ -214,7 +214,7 @@ class UserController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*/
public function bulk(BulkUserRequest $request)
@ -253,7 +253,7 @@ class UserController extends BaseController
*
* @param DetachCompanyUserRequest $request
* @param User $user
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*/
public function detach(DetachCompanyUserRequest $request, User $user)
{
@ -283,7 +283,7 @@ class UserController extends BaseController
*
* @param ReconfirmUserRequest $request
* @param User $user
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*/
public function invite(ReconfirmUserRequest $request, User $user)
{
@ -301,7 +301,7 @@ class UserController extends BaseController
*
* @param ReconfirmUserRequest $request
* @param User $user
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*/
public function reconfirm(ReconfirmUserRequest $request, User $user)
{

18
app/Http/Controllers/VendorController.php
View File

@ -96,7 +96,7 @@ class VendorController extends BaseController
* ),
* )
* @param VendorFilters $filters
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function index(VendorFilters $filters)
{
@ -110,7 +110,7 @@ class VendorController extends BaseController
*
* @param ShowVendorRequest $request
* @param Vendor $vendor
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -164,7 +164,7 @@ class VendorController extends BaseController
*
* @param EditVendorRequest $request
* @param Vendor $vendor
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -218,7 +218,7 @@ class VendorController extends BaseController
*
* @param UpdateVendorRequest $request
* @param Vendor $vendor
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -284,7 +284,7 @@ class VendorController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateVendorRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -333,7 +333,7 @@ class VendorController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreVendorRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -391,7 +391,7 @@ class VendorController extends BaseController
*
* @param DestroyVendorRequest $request
* @param Vendor $vendor
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -446,7 +446,7 @@ class VendorController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -527,7 +527,7 @@ class VendorController extends BaseController
*
* @param UploadVendorRequest $request
* @param Vendor $vendor
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*

2
app/Http/Controllers/VendorPortal/UploadController.php
View File

@ -29,7 +29,7 @@ class UploadController extends Controller
* Main logic behind uploading the files.
*
* @param StoreUploadRequest $request
* @return Response|ResponseFactory
* @return Response| \Illuminate\Http\JsonResponse|ResponseFactory
*/
public function upload(StoreUploadRequest $request, PurchaseOrder $purchase_order)
{

2
app/Http/Controllers/WebCronController.php
View File

@ -23,7 +23,7 @@ class WebCronController extends Controller
/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*
* @OA\Get(
* path="/webcron",

16
app/Http/Controllers/WebhookController.php
View File

@ -79,7 +79,7 @@ class WebhookController extends BaseController
* ),
* )
* @param WebhookFilters $filters
* @return Response|mixed
* @return Response| \Illuminate\Http\JsonResponse|mixed
*/
public function index(WebhookFilters $filters)
{
@ -93,7 +93,7 @@ class WebhookController extends BaseController
*
* @param ShowWebhookRequest $request
* @param Webhook $webhook
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -147,7 +147,7 @@ class WebhookController extends BaseController
*
* @param EditWebhookRequest $request
* @param Webhook $webhook
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -201,7 +201,7 @@ class WebhookController extends BaseController
*
* @param UpdateWebhookRequest $request
* @param Webhook $webhook
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -262,7 +262,7 @@ class WebhookController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateWebhookRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -312,7 +312,7 @@ class WebhookController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreWebhookRequest $request
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
*
@ -378,7 +378,7 @@ class WebhookController extends BaseController
*
* @param DestroyWebhookRequest $request
* @param Webhook $webhook
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -433,7 +433,7 @@ class WebhookController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return Response| \Illuminate\Http\JsonResponse
*
*
* @OA\Post(

9
app/Http/Middleware/CheckClientExistence.php
View File

@ -32,8 +32,10 @@ class CheckClientExistence
return $next($request);
}
auth()->guard('contact')->user()->loadMissing(['company']); // @phpstan-ignore method.notFound
$multiple_contacts = ClientContact::query()
->with('client.gateway_tokens', 'company')
// ->with('client.gateway_tokens', 'company')
->where('email', auth()->guard('contact')->user()->email)
->whereNotNull('email')
->where('email', '<>', '')
@ -56,6 +58,11 @@ class CheckClientExistence
if (count($multiple_contacts) == 1 && ! Auth::guard('contact')->check()) {
Auth::guard('contact')->loginUsingId($multiple_contacts[0]->id, true);
auth()->guard('contact')->user()->loadMissing(['client' => function ($query) {
$query->without('gateway_tokens', 'documents', 'contacts.company', 'contacts'); // Exclude 'grandchildren' relation of 'client'
}]);
}
session()->put('multiple_contacts', $multiple_contacts);

8
app/Http/Middleware/ClientPortalEnabled.php
View File

@ -25,10 +25,12 @@ class ClientPortalEnabled
*/
public function handle($request, Closure $next)
{
/** @var \App\Models\ClientContact $client_contact */
$client_contact = auth()->user();
if ($client_contact->client->getSetting('enable_client_portal') === false) {
auth()->guard('contact')->user()->loadMissing(['client' => function ($query) {
$query->without('gateway_tokens', 'documents', 'contacts.company', 'contacts'); // Exclude 'grandchildren' relation of 'client'
}]);
if (auth()->guard('contact')->user()->client->getSetting('enable_client_portal') === false) {
return redirect()->route('client.error')->with(['title' => ctrans('texts.client_portal'), 'notification' => 'This section of the app has been disabled by the administrator.']);
}

12
app/Http/Middleware/Locale.php
View File

@ -69,15 +69,23 @@ class Locale
*/
public function handle($request, Closure $next)
{
/*LOCALE SET */
if ($request->has('lang') && in_array($request->input('lang', 'en'), $this->locales)) {
$locale = $request->input('lang');
App::setLocale($locale);
} elseif (auth()->guard('contact')->user()) {
App::setLocale(auth()->guard('contact')->user()->client()->setEagerLoads([])->first()->locale());
auth()->guard('contact')->user()->loadMissing(['client' => function ($query) { // @phpstan-ignore method.undefined
$query->without('gateway_tokens', 'documents', 'contacts.company', 'contacts'); // Exclude 'grandchildren' relation of 'client'
}]);
App::setLocale(auth()->guard('contact')->user()->client->locale());
} elseif (auth()->user()) {
try {
App::setLocale(auth()->user()->company()->getLocale());
App::setLocale(auth()->user()->company()->getLocale()); // @phpstan-ignore method.undefined
} catch (\Exception $e) {
}
} else {

6
app/Http/Middleware/QueryLogging.php
View File

@ -78,13 +78,11 @@ class QueryLogging
if ($request->hasHeader('X-CLIENT-PLATFORM')) {
$platform = $request->header('X-CLIENT-PLATFORM');
}
elseif($request->hasHeader('X-React')){
} elseif($request->hasHeader('X-React')) {
$platform = 'react';
}
if ($request->hasHeader('X-CLIENT-VERSION'))
{
if ($request->hasHeader('X-CLIENT-VERSION')) {
$client_version = $request->header('X-CLIENT-VERSION');
}

9
app/Http/Requests/Client/StoreClientRequest.php
View File

@ -48,8 +48,7 @@ class StoreClientRequest extends Request
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation();
}
else {
} else {
$rules['documents'] = 'bail|sometimes|array';
}
@ -133,11 +132,9 @@ class StoreClientRequest extends Request
} else {
$input['settings']['currency_id'] = (string) $user->company()->settings->currency_id;
}
}
elseif (! array_key_exists('currency_id', $input['settings'])) {
} elseif (! array_key_exists('currency_id', $input['settings'])) {
$input['settings']['currency_id'] = (string) $user->company()->settings->currency_id;
}
elseif (empty($input['settings']['currency_id']) ?? true) {
} elseif (empty($input['settings']['currency_id']) ?? true) {
$input['settings']['currency_id'] = (string) $user->company()->settings->currency_id;
}

3
app/Http/Requests/Client/UpdateClientRequest.php
View File

@ -105,8 +105,7 @@ class UpdateClientRequest extends Request
/* If the user removes the currency we must always set the default */
if (array_key_exists('settings', $input) && ! array_key_exists('currency_id', $input['settings'])) {
$input['settings']['currency_id'] = (string) $user->company()->settings->currency_id;
}
elseif (empty($input['settings']['currency_id']) ?? true) {
} elseif (empty($input['settings']['currency_id']) ?? true) {
$input['settings']['currency_id'] = (string) $user->company()->settings->currency_id;
}

Some files were not shown because too many files have changed in this diff Show More