Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Merge pull request #8669 from turbo124/v5-develop

Browse Source 
Fixes for e-invoice (Spanish)
This commit is contained in:
David Bomba 2023-07-26 19:09:28 +10:00 committed by GitHub
commit e560f6b49a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
78 changed files with 125 additions and 641 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.6.21
5.6.22

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

@ -163,11 +163,11 @@ class ClientExport extends BaseExport
}
if (in_array('client.country_id', $this->input['report_keys'])) {
$entity['country'] = $client->country ? ctrans("texts.country_{$client->country->name}") : '';
$entity['client.country_id'] = $client->country ? ctrans("texts.country_{$client->country->name}") : '';
}
if (in_array('client.shipping_country_id', $this->input['report_keys'])) {
$entity['shipping_country'] = $client->shipping_country ? ctrans("texts.country_{$client->shipping_country->name}") : '';
$entity['client.shipping_country_id'] = $client->shipping_country ? ctrans("texts.country_{$client->shipping_country->name}") : '';
}
if (in_array('client.currency_id', $this->input['report_keys'])) {

2
app/Factory/ExpenseFactory.php
View File

@ -28,7 +28,7 @@ class ExpenseFactory
$expense->tax_rate2 = 0;
$expense->tax_name3 = '';
$expense->tax_rate3 = 0;
$expense->date = null;
$expense->date = now()->format('Y-m-d');
$expense->payment_date = null;
$expense->amount = 0;
$expense->foreign_amount = 0;

2
app/Filters/BankTransactionFilters.php
View File

@ -151,7 +151,7 @@ class BankTransactionFilters extends QueryFilters
/**
* Filters the query by the users company ID.
*
* @return Illuminate\Database\Query\Builder
* @return \Illuminate\Database\Eloquent\Builder
*/
public function entityFilter()
{

2
app/Filters/BankTransactionRuleFilters.php
View File

@ -71,7 +71,7 @@ class BankTransactionRuleFilters extends QueryFilters
/**
* Filters the query by the users company ID.
*
* @return Illuminate\Database\Query\Builder
* @return \Illuminate\Database\Eloquent\Builder
*/
public function entityFilter()
{

1
app/Filters/QueryFilters.php
View File

@ -11,7 +11,6 @@
namespace App\Filters;
//use Illuminate\Database\Query\Builder;
use App\Utils\Traits\MakesHash;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;

2
app/Filters/QuoteFilters.php
View File

@ -152,7 +152,7 @@ class QuoteFilters extends QueryFilters
/**
* Filters the query by the users company ID.
*
* @return Illuminate\Eloquent\Query\Builder
* @return \Illuminate\Database\Eloquent\Builder
*/
public function entityFilter(): Builder
{

2
app/Filters/RecurringExpenseFilters.php
View File

@ -69,7 +69,7 @@ class RecurringExpenseFilters extends QueryFilters
/**
* Filters the query by the users company ID.
*
* @return Illuminate\Eloquent\Builder
* @return \Illuminate\Database\Eloquent\Builder
*/
public function entityFilter(): Builder
{

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

@ -11,20 +11,21 @@
namespace App\Http\Controllers;
use App\Factory\BankTransactionRuleFactory;
use App\Utils\Traits\MakesHash;
use Illuminate\Support\Collection;
use App\Models\BankTransactionRule;
use App\Filters\BankTransactionFilters;
use App\Factory\BankTransactionRuleFactory;
use App\Filters\BankTransactionRuleFilters;
use App\Repositories\BankTransactionRuleRepository;
use App\Transformers\BankTransactionRuleTransformer;
use App\Http\Requests\BankTransactionRule\BulkBankTransactionRuleRequest;
use App\Http\Requests\BankTransactionRule\CreateBankTransactionRuleRequest;
use App\Http\Requests\BankTransactionRule\DestroyBankTransactionRuleRequest;
use App\Http\Requests\BankTransactionRule\EditBankTransactionRuleRequest;
use App\Http\Requests\BankTransactionRule\ShowBankTransactionRuleRequest;
use App\Http\Requests\BankTransactionRule\StoreBankTransactionRuleRequest;
use App\Http\Requests\BankTransactionRule\CreateBankTransactionRuleRequest;
use App\Http\Requests\BankTransactionRule\UpdateBankTransactionRuleRequest;
use App\Models\BankTransactionRule;
use App\Repositories\BankTransactionRuleRepository;
use App\Transformers\BankTransactionRuleTransformer;
use App\Utils\Traits\MakesHash;
use App\Http\Requests\BankTransactionRule\DestroyBankTransactionRuleRequest;
class BankTransactionRuleController extends BaseController
{
@ -99,7 +100,7 @@ class BankTransactionRuleController extends BaseController
*
* @param ShowBankTransactionRuleRequest $request
* @param BankTransactionRule $bank_transaction_rule
* @return Response
* @return \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -154,7 +155,7 @@ class BankTransactionRuleController extends BaseController
*
* @param EditBankTransactionRuleRequest $request
* @param BankTransactionRule $bank_transaction_rule
* @return Response
* @return \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -208,7 +209,7 @@ class BankTransactionRuleController extends BaseController
*
* @param UpdateBankTransactionRuleRequest $request
* @param BankTransactionRule $bank_transaction_rule
* @return Response
* @return \Illuminate\Http\JsonResponse
*
*
*
@ -265,7 +266,7 @@ class BankTransactionRuleController extends BaseController
* Show the form for creating a new resource.
*
* @param CreateBankTransactionRuleRequest $request
* @return Response
* @return \Illuminate\Http\JsonResponse
*
*
*
@ -310,7 +311,7 @@ class BankTransactionRuleController extends BaseController
* Store a newly created resource in storage.
*
* @param StoreBankTransactionRuleRequest $request
* @return Response
* @return \Illuminate\Http\JsonResponse
*
*
*
@ -357,7 +358,7 @@ class BankTransactionRuleController extends BaseController
*
* @param DestroyBankTransactionRuleRequest $request
* @param BankTransactionRule $bank_transaction_rule
* @return Response
* @return \Illuminate\Http\JsonResponse
*
*
* @throws \Exception
@ -412,7 +413,7 @@ class BankTransactionRuleController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Collection
* @return \Illuminate\Support\Collection
*
* @OA\Post(
* path="/api/v1/bank_transation_rules/bulk",

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

@ -238,7 +238,7 @@ class ClientController extends BaseController
*
* @param PurgeClientRequest $request
* @param Client $client
* @return Response
* @return \Illuminate\Http\JsonResponse
*
*/
public function purge(PurgeClientRequest $request, Client $client)
@ -266,7 +266,7 @@ class ClientController extends BaseController
* @param PurgeClientRequest $request
* @param Client $client
* @param string $mergeable_client
* @return Response
* @return \Illuminate\Http\JsonResponse
*
*/

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

@ -49,10 +49,6 @@ class EntityViewController extends Controller
->with('contact.client')
->firstOrFail();
// $invitation = $invitation_entity::whereRaw('BINARY `key`= ?', [$invitation_key])
// ->with('contact.client')
// ->firstOrFail();
$contact = $invitation->contact;
$client = $contact->client;
$entity = $invitation->{$entity_type};

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

@ -143,7 +143,7 @@ class PaymentController extends Controller
* Pay for invoice/s using credits only.
*
* @param Request $request The request object
* @return Response The response view
* @return \Response The response view
*/
public function credit_response(Request $request)
{
@ -177,7 +177,6 @@ class PaymentController extends Controller
if ($invoices->sum('balance') > 0) {
$invoice = $invoices->first();
$invoice->service()->touchPdf(true);
return redirect()->route('client.invoice.show', ['invoice' => $invoice->hashed_id, 'hash' => $request->input('hash')]);
}

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

@ -48,7 +48,7 @@ class PaymentMethodController extends Controller
* Show the form for creating a new resource.
*
* @param CreatePaymentMethodRequest $request
* @return Response
* @return \Illuminate\View\View
*/
public function create(CreatePaymentMethodRequest $request)
{
@ -67,7 +67,7 @@ class PaymentMethodController extends Controller
* Store a newly created resource in storage.
*
* @param Request $request
* @return Response
* @return \Illuminate\View\View
*/
public function store(Request $request)
{

1
app/Http/Controllers/ClientPortal/QuoteController.php
View File

@ -78,7 +78,6 @@ class QuoteController extends Controller
public function bulk(ProcessQuotesInBulkRequest $request)
{
$transformed_ids = $this->transformKeys($request->quotes);
nlog(request()->all());
if ($request->action == 'download') {
return $this->downloadQuotes((array) $transformed_ids);

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

@ -23,7 +23,7 @@ class StatementController extends Controller
/**
* Show the statement in the client portal.
*
* @return View
* @return \Illuminate\View\View
*/
public function index(): View
{

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 JsonResponse.
* @return \Illuminate\Http\JsonResponse
*
*
* @OA\Post(

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

@ -58,7 +58,7 @@ class LoginController extends BaseController
*
* @param Request $request The request
*
* @return Response|User Process user login.
* @return \Illuminate\Http\JsonResponse
* @throws \Illuminate\Validation\ValidationException
*/
public function apiLogin(Request $request)

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

@ -447,7 +447,7 @@ class CreditController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Collection
* @return \Illuminate\Support\Collection
*
* @OA\Post(
* path="/api/v1/credits/bulk",

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

@ -170,20 +170,27 @@ class ImportController extends Controller
return $data;
}
public function detectDelimiter($csvfile)
/**
* Returns the best delimiter
*
* @param string $csvfile
* @return string
*/
public function detectDelimiter($csvfile): string
{
$delimiters = [',', '.', ';'];
$bestDelimiter = ' ';
$count = 0;
foreach ($delimiters as $delimiter) {
if (substr_count(strstr($csvfile, "\n", true), $delimiter) >= $count) {
$count = substr_count($csvfile, $delimiter);
$bestDelimiter = $delimiter;
$count = substr_count(strstr($csvfile, "\n", true), $delimiter);
$bestDelimiter = $delimiter;
}
}
return $bestDelimiter;
}
}

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

@ -476,7 +476,7 @@ class InvoiceController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Collection
* @return \Illuminate\Support\Collection
*
* @OA\Post(
* path="/api/v1/invoices/bulk",
@ -683,7 +683,6 @@ class InvoiceController extends BaseController
return $this->itemResponse($quote);
break;
case 'history':
// code...
break;
@ -717,7 +716,6 @@ class InvoiceController extends BaseController
echo Storage::get($file);
}, basename($file), ['Content-Type' => 'application/pdf']);
break;
case 'restore':
$this->invoice_repo->restore($invoice);
@ -742,8 +740,6 @@ class InvoiceController extends BaseController
break;
case 'cancel':
$invoice = $invoice->service()->handleCancellation()->deletePdf()->save();
// $invoice = $invoice->service()->handleCancellation()->touchPdf()->save();
if (! $bulk) {
$this->itemResponse($invoice);
}
@ -765,7 +761,6 @@ class InvoiceController extends BaseController
default:
return response()->json(['message' => ctrans('texts.action_unavailable', ['action' => $action])], 400);
break;
}
}

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

@ -445,7 +445,7 @@ class PaymentController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Collection
* @return \Illuminate\Support\Collection
*
*
* @OA\Post(

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

@ -397,7 +397,7 @@ class PaymentTermController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Collection
* @return \Illuminate\Support\Collection
*
*
* @OA\Post(

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

@ -408,7 +408,7 @@ class ProductController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Collection
* @return \Illuminate\Support\Collection
*
*
* @OA\Post(

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

@ -427,7 +427,7 @@ class PurchaseOrderController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Collection
* @return \Illuminate\Support\Collection
*
* @OA\Post(
* path="/api/v1/purchase_orders/bulk",

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

@ -459,7 +459,7 @@ class QuoteController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Collection
* @return \Illuminate\Support\Collection
*
*
* @OA\Post(

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

@ -429,7 +429,7 @@ class RecurringQuoteController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Collection
* @return \Illuminate\Support\Collection
*
*
* @OA\Post(

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

@ -48,7 +48,7 @@ class SubscriptionController extends BaseController
/**
* Show the list of Subscriptions.
*
* @return Response
* @return \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/subscriptions",
@ -92,7 +92,7 @@ class SubscriptionController extends BaseController
*
* @param CreateSubscriptionRequest $request The request
*
* @return Response
* @return \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -137,7 +137,7 @@ class SubscriptionController extends BaseController
*
* @param StoreSubscriptionRequest $request The request
*
* @return Response
* @return \Illuminate\Http\JsonResponse
*
*
* @OA\Post(
@ -185,7 +185,7 @@ class SubscriptionController extends BaseController
* @param ShowSubscriptionRequest $request The request
* @param Invoice $subscription The invoice
*
* @return Response
* @return \Illuminate\Http\JsonResponse
*
*
* @OA\Get(
@ -240,7 +240,7 @@ class SubscriptionController extends BaseController
* @param EditSubscriptionRequest $request The request
* @param Invoice $subscription The invoice
*
* @return Response
* @return \Illuminate\Http\JsonResponse
*
* @OA\Get(
* path="/api/v1/subscriptions/{id}/edit",
@ -294,7 +294,7 @@ class SubscriptionController extends BaseController
* @param UpdateSubscriptionRequest $request The request
* @param Subscription $subscription The invoice
*
* @return Response
* @return \Illuminate\Http\JsonResponse
*
*
* @OA\Put(
@ -357,7 +357,7 @@ class SubscriptionController extends BaseController
* @param DestroySubscriptionRequest $request
* @param Subscription $invoice
*
* @return Response
* @return \Illuminate\Http\JsonResponse
*
* @throws \Exception
* @OA\Delete(
@ -410,7 +410,7 @@ class SubscriptionController extends BaseController
/**
* Perform bulk actions on the list view.
*
* @return Response
* @return \Illuminate\Support\Collection
*
*
* @OA\Post(

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

@ -189,7 +189,7 @@ class UserController extends BaseController
*
* @param DestroyUserRequest $request
* @param User $user
* @return JsonResponse | Response
* @return \Illuminate\Http\JsonResponse
*
*/
public function destroy(DestroyUserRequest $request, User $user)

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

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

1
app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php
View File

@ -27,6 +27,7 @@ class ProcessQuotesInBulkRequest extends FormRequest
{
return [
'quotes' => ['array'],
'action' => 'sometimes',
];
}
}

2
app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php
View File

@ -55,7 +55,7 @@ class UpdateGroupSettingRequest extends Request
* are saveable
*
* @param object $settings
* @return stdClass $settings
* @return array $settings
*/
private function filterSaveableSettings($settings)
{

3
app/Http/Requests/Import/PreImportRequest.php
View File

@ -28,9 +28,10 @@ class PreImportRequest extends Request
public function rules()
{
return [
'files.*' => 'file|mimes:csv,txt',
'files.*' => 'file|mimetypes:text/csv,text/plain,application/octet-stream',
'files' => 'required|array|min:1|max:6',
'import_type' => 'required',
];
}
}

2
app/Jobs/Company/CompanyExport.php
View File

@ -59,7 +59,7 @@ class CompanyExport implements ShouldQueue
/**
* Execute the job.
*
* @return CompanyToken|null
* @return void
*/
public function handle()
{

8
app/Jobs/Cron/UpdateCalculatedFields.php
View File

@ -43,7 +43,9 @@ class UpdateCalculatedFields
if (! config('ninja.db.multi_db_enabled')) {
Project::with('tasks')->where('updated_at', '>', now()->subHours(2))
Project::with('tasks')->whereHas('tasks', function ($query){
$query->where('updated_at', '>', now()->subHours(2));
})
->cursor()
->each(function ($project) {
@ -59,7 +61,9 @@ class UpdateCalculatedFields
MultiDB::setDB($db);
Project::with('tasks')->where('updated_at', '>', now()->subHours(2))
Project::with('tasks')->whereHas('tasks', function ($query){
$query->where('updated_at', '>', now()->subHours(2));
})
->cursor()
->each(function ($project) {
$project->current_hours = $this->calculateDuration($project);

3
app/Jobs/RecurringInvoice/SendRecurring.php
View File

@ -91,9 +91,6 @@ class SendRecurring implements ShouldQueue
$invoice = $this->createRecurringInvitations($invoice);
/* 09-01-2022 ensure we create the PDFs at this point in time! */
$invoice->service()->touchPdf(true);
/* Set next date here to prevent a recurring loop forming */
$this->recurring_invoice->next_send_date = $this->recurring_invoice->nextSendDate();
$this->recurring_invoice->next_send_date_client = $this->recurring_invoice->nextSendDateClient();

6
app/Jobs/Util/ReminderJob.php
View File

@ -205,9 +205,6 @@ class ReminderJob implements ShouldQueue
->markSent()
->save();
//30-6-2023 - fix for duplicate touching
// $invoice->service()->touchPdf(true);
$enabled_reminder = 'enable_'.$reminder_template;
if ($reminder_template == 'endless_reminder') {
$enabled_reminder = 'enable_reminder_endless';
@ -308,14 +305,11 @@ class ReminderJob implements ShouldQueue
/**Refresh Invoice values*/
$invoice = $invoice->calc()->getInvoice();
// $invoice->service()->deletePdf(); 24-11-2022 no need to delete here because we regenerate later anyway
nlog('adjusting client balance and invoice balance by #'.$invoice->number.' '.($invoice->balance - $temp_invoice_balance));
$invoice->client->service()->updateBalance($invoice->balance - $temp_invoice_balance);
$invoice->ledger()->updateInvoiceBalance($invoice->balance - $temp_invoice_balance, "Late Fee Adjustment for invoice {$invoice->number}");
$invoice->service()->touchPdf(true);
return $invoice;
}
}

2
app/Libraries/OAuth/OAuth.php
View File

@ -41,7 +41,7 @@ class OAuth
/**
* @param Socialite $user
* @return bool|\App\Models\User|\App\Libraries\App\Models\User|null
* @return bool | \App\Models\User | \App\Models\User | null
*/
public static function handleAuth($socialite_user, $provider)
{

43
app/Models/ClientContact.php
View File

@ -68,17 +68,12 @@ use Laracasts\Presenter\PresentableTrait;
* @property int|null $deleted_at
* @property-read \App\Models\Client $client
* @property-read \App\Models\Company $company
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CreditInvitation> $credit_invitations
* @property-read int|null $credit_invitations_count
* @property-read mixed $contact_id
* @property-read mixed $hashed_id
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invoice_invitations
* @property-read int|null $invoice_invitations_count
* @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
* @property-read int|null $notifications_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\QuoteInvitation> $quote_invitations
* @property-read int|null $quote_invitations_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoiceInvitation> $recurring_invoice_invitations
* @property-read int|null $recurring_invoice_invitations_count
* @property-read \App\Models\User $user
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact company()
@ -87,51 +82,13 @@ use Laracasts\Presenter\PresentableTrait;
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact query()
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereAcceptedTermsVersion($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereAvatar($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereAvatarSize($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereAvatarType($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereClientId($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereCompanyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereConfirmationCode($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereConfirmed($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereContactKey($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereCustomValue1($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereCustomValue2($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereCustomValue3($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereCustomValue4($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereEmail($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereEmailVerifiedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereFailedLogins($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereFirstName($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereGoogle2faSecret($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereIsLocked($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereIsPrimary($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereLastLogin($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereLastName($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereOauthProviderId($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereOauthUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact wherePassword($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact wherePhone($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereRememberToken($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereSendEmail($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereToken($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact withTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|ClientContact withoutTrashed()
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CreditInvitation> $credit_invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invoice_invitations
* @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\QuoteInvitation> $quote_invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoiceInvitation> $recurring_invoice_invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CreditInvitation> $credit_invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invoice_invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $client
* @mixin \Eloquent
*/
class ClientContact extends Authenticatable implements HasLocalePreference

44
app/Models/CompanyGateway.php
View File

@ -28,7 +28,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property int|null $update_details
* @property int $is_deleted
* @property string $config
* @property mixed $fees_and_limits
* @property object $fees_and_limits
* @property string|null $custom_value1
* @property string|null $custom_value2
* @property string|null $custom_value3
@ -47,7 +47,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property int $require_custom_value2
* @property int $require_custom_value3
* @property int $require_custom_value4
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @property-read int|null $client_gateway_tokens_count
* @property-read \App\Models\Company $company
* @property-read \App\Models\Gateway $gateway
@ -60,51 +59,10 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway query()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope()
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereAcceptedCreditCards($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCompanyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereConfig($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCustomValue1($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCustomValue2($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCustomValue3($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCustomValue4($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereFeesAndLimits($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereGatewayKey($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereIsDeleted($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereLabel($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireBillingAddress($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireClientName($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireClientPhone($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireContactEmail($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireContactName($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCustomValue1($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCustomValue2($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCustomValue3($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCustomValue4($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCvv($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequirePostalCode($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireShippingAddress($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereTokenBilling($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereUpdateDetails($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway withTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway withoutTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway find()
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @mixin \Eloquent
*/
class CompanyGateway extends BaseModel

11
app/Models/CompanyToken.php
View File

@ -40,17 +40,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken query()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope()
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereAccountId($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereCompanyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereIsDeleted($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereIsSystem($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereToken($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken withTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|CompanyToken withoutTrashed()
* @mixin \Eloquent

58
app/Models/Expense.php
View File

@ -83,66 +83,12 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @method static \Illuminate\Database\Eloquent\Builder|Expense onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|Expense query()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope()
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereAmount($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereAssignedUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereBankId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereCalculateTaxByAmount($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereCategoryId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereClientId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereCompanyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereCurrencyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereCustomValue1($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereCustomValue2($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereCustomValue3($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereCustomValue4($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereExchangeRate($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereForeignAmount($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereInvoiceCurrencyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereInvoiceDocuments($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereInvoiceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereIsDeleted($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereNumber($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense wherePaymentDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense wherePaymentTypeId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense wherePrivateNotes($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereProjectId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense wherePublicNotes($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereRecurringExpenseId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereShouldBeInvoiced($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxAmount1($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxAmount2($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxAmount3($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxName1($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxName2($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxName3($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxRate1($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxRate2($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereTaxRate3($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereTransactionId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereTransactionReference($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereUsesInclusiveTaxes($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense whereVendorId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Expense withTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|Expense withoutTrashed()
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $client
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoice
* @property-read \App\Models\BankTransaction|null $transaction
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @mixin \Eloquent
*/
class Expense extends BaseModel

172
app/Models/Invoice.php
View File

@ -97,36 +97,27 @@ use App\Events\Invoice\InvoiceReminderWasEmailed;
* @property int|null $subscription_id
* @property int $auto_bill_tries
* @property bool $is_proforma
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
* @property-read int|null $activities_count
* @property-read \App\Models\User|null $assigned_user
* @property-read \App\Models\Client $client
* @property-read \App\Models\Company $company
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
* @property-read int|null $company_ledger_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
* @property-read int|null $credits_count
* @property-read \App\Models\Design|null $design
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read int|null $documents_count
* @property-read \App\Models\Expense|null $expense
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
* @property-read int|null $expenses_count
* @property-read mixed $balance_due
* @property-read mixed $hashed_id
* @property-read mixed $status
* @property-read mixed $total
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
* @property-read int|null $history_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
* @property-read int|null $invitations_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
* @property-read int|null $payments_count
* @property-read \App\Models\Project|null $project
* @property-read \App\Models\RecurringInvoice|null $recurring_invoice
* @property-read \App\Models\Subscription|null $subscription
* @property-read \App\Models\Task|null $task
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read int|null $tasks_count
* @property-read \App\Models\User $user
* @property-read \App\Models\Vendor|null $vendor
@ -139,69 +130,6 @@ use App\Events\Invoice\InvoiceReminderWasEmailed;
* @method static \Illuminate\Database\Eloquent\Builder|Invoice onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|Invoice query()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope()
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereAmount($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereAssignedUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereAutoBillEnabled($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereAutoBillTries($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereBackup($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereBalance($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereClientId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCompanyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurcharge1($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurcharge2($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurcharge3($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurcharge4($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurchargeTax1($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurchargeTax2($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurchargeTax3($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomSurchargeTax4($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomValue1($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomValue2($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomValue3($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereCustomValue4($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereDesignId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereDiscount($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereDueDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereExchangeRate($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereFooter($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereIsAmountDiscount($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereIsDeleted($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereIsProforma($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereLastSentDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereLastViewed($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereLineItems($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereNextSendDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereNumber($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice wherePaidToDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice wherePartial($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice wherePartialDueDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice wherePoNumber($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice wherePrivateNotes($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereProjectId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice wherePublicNotes($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereRecurringId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereReminder1Sent($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereReminder2Sent($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereReminder3Sent($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereReminderLastSent($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereStatusId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereSubscriptionId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxName1($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxName2($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxName3($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxRate1($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxRate2($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxRate3($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTerms($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTotalTaxes($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereUsesInclusiveTaxes($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereVendorId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Invoice withTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|Invoice withoutTrashed()
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
@ -214,106 +142,6 @@ use App\Events\Invoice\InvoiceReminderWasEmailed;
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property object|null $tax_data
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @method static \Illuminate\Database\Eloquent\Builder|Invoice whereTaxData($value)
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @mixin \Eloquent
*/
class Invoice extends BaseModel

11
app/Models/PaymentHash.php
View File

@ -20,23 +20,14 @@ use Illuminate\Database\Eloquent\Model;
* @property string $hash
* @property string $fee_total
* @property int|null $fee_invoice_id
* @property object $data
* @property object|array $data
* @property int|null $payment_id
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property-read \App\Models\Invoice|null $fee_invoice
* @property-read \App\Models\Payment|null $payment
* @method static \Illuminate\Database\Eloquent\Builder|PaymentHash newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|PaymentHash newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|PaymentHash query()
* @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereData($value)
* @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereFeeInvoiceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereFeeTotal($value)
* @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereHash($value)
* @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|PaymentHash wherePaymentId($value)
* @method static \Illuminate\Database\Eloquent\Builder|PaymentHash whereUpdatedAt($value)
* @mixin \Eloquent
*/
class PaymentHash extends Model

47
app/Models/Project.php
View File

@ -32,11 +32,9 @@ use Laracasts\Presenter\PresentableTrait;
* @property string $color
* @property-read \App\Models\Client|null $client
* @property-read \App\Models\Company $company
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read int|null $documents_count
* @property-read mixed $hashed_id
* @property-read Project|null $project
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read int|null $tasks_count
* @property-read \App\Models\User $user
* @property-read \App\Models\Vendor|null $vendor
@ -49,55 +47,10 @@ use Laracasts\Presenter\PresentableTrait;
* @method static \Illuminate\Database\Eloquent\Builder|Project onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|Project query()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope()
* @method static \Illuminate\Database\Eloquent\Builder|Project whereAssignedUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereBudgetedHours($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereClientId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereColor($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereCompanyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereCustomValue1($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereCustomValue2($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereCustomValue3($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereCustomValue4($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereDueDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereIsDeleted($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereNumber($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project wherePrivateNotes($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project wherePublicNotes($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereTaskRate($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Project withTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|Project withoutTrashed()
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property int|null $current_hours
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @method static \Illuminate\Database\Eloquent\Builder|Project whereCurrentHours($value)
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @mixin \Eloquent
*/
class Project extends BaseModel

19
app/Models/QuoteInvitation.php
View File

@ -54,25 +54,6 @@ use Illuminate\Support\Facades\Storage;
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation query()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope()
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereClientContactId($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereCompanyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereEmailError($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereEmailStatus($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereKey($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereMessageId($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereOpenedDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereQuoteId($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereSentDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereSignatureBase64($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereSignatureDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereSignatureIp($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereTransactionReference($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation whereViewedDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation withTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|QuoteInvitation withoutTrashed()
* @mixin \Eloquent

32
app/Models/Scheduler.php
View File

@ -20,19 +20,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* App\Models\Scheduler
*
* @property bool paused
* @property bool is_deleted
* @property \Carbon\Carbon|mixed start_from
* @property int frequency_id
* @property \Carbon\Carbon|mixed next_run
* @property int company_id
* @property int updated_at
* @property int created_at
* @property int deleted_at
* @property string action_name
* @property mixed company
* @property array parameters
* @property string action_class
* @property int $id
* @property bool $is_deleted
* @property int|null $created_at
@ -42,8 +29,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property int $company_id
* @property bool $is_paused
* @property int|null $frequency_id
* @property \Illuminate\Support\Carbon|null $next_run
* @property \Illuminate\Support\Carbon|null $next_run_client
* @property \Carbon\Carbon|\Illuminate\Support\Carbon|null $next_run_client
* @property \Carbon\Carbon|\Illuminate\Support\Carbon|null $next_run
* @property int $user_id
* @property string $name
* @property string $template
@ -59,21 +46,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler query()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope()
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereCompanyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereFrequencyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereIsDeleted($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereIsPaused($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereNextRun($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereNextRunClient($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereParameters($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereRemainingCycles($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereTemplate($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler withTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|Scheduler withoutTrashed()
* @property-read \App\Models\User $user

4
app/Models/Task.php
View File

@ -36,8 +36,8 @@ use Illuminate\Support\Carbon;
* @property string|null $custom_value4
* @property int|null $duration
* @property string|null $description
* @property int $is_deleted
* @property int $is_running
* @property bool $is_deleted
* @property bool $is_running
* @property string|null $time_log
* @property string|null $number
* @property string $rate

4
app/Models/Traits/Excludable.php
View File

@ -33,10 +33,10 @@ trait Excludable
/**
* Exclude an array of elements from the result.
* @param Builder $query
* @param \Illuminate\Database\Eloquent\Builder $query
* @param array $columns
*
* @return Builder<BaseModel>
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeExclude($query, $columns): \Illuminate\Database\Eloquent\Builder
{

54
app/Models/User.php
View File

@ -77,16 +77,6 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
* @property int $verified_phone_number
* @property-read \App\Models\Account $account
* @property-read \App\Models\Company $company
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $clients
* @property-read int|null $clients_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Company> $companies
* @property-read int|null $companies_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyUser> $company_users
* @property-read int|null $company_users_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientContact> $contacts
* @property-read int|null $contacts_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read int|null $documents_count
* @property-read mixed $hashed_id
* @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
* @property-read int|null $notifications_count
@ -99,53 +89,9 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
* @method static \Illuminate\Database\Eloquent\Builder|User onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|User query()
* @method static \Illuminate\Database\Eloquent\Builder|User where($column, $value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereAcceptedTermsVersion($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereAccountId($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereAvatar($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereAvatarHeight($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereAvatarSize($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereAvatarWidth($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereConfirmationCode($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereCustomValue1($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereCustomValue2($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereCustomValue3($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereCustomValue4($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereDeviceToken($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereEmail($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereEmailVerifiedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereFailedLogins($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereFirstName($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereGoogle2faSecret($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereHasPassword($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereIp($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereIsDeleted($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereLastConfirmedEmailAddress($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereLastLogin($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereLastName($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereOauthProviderId($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereOauthUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereOauthUserRefreshToken($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereOauthUserToken($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereOauthUserTokenExpiry($value)
* @method static \Illuminate\Database\Eloquent\Builder|User wherePassword($value)
* @method static \Illuminate\Database\Eloquent\Builder|User wherePhone($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereReferralCode($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereRememberToken($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereSignature($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereSmsVerificationCode($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereThemeId($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|User whereVerifiedPhoneNumber($value)
* @method static \Illuminate\Database\Eloquent\Builder|User withTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|User withoutTrashed()
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $clients
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Company> $companies
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyUser> $company_users
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientContact> $contacts
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
* @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $tokens
* @method bool hasPermissionTo(string $permission)

4
app/PaymentDrivers/CheckoutComPaymentDriver.php
View File

@ -168,7 +168,7 @@ class CheckoutComPaymentDriver extends BaseDriver
* Payment View
*
* @param array $data Payment data array
* @return view The payment view
* @return \Illuminate\View\View
*/
public function processPaymentView(array $data)
{
@ -179,7 +179,7 @@ class CheckoutComPaymentDriver extends BaseDriver
* Process the payment response
*
* @param Request $request The payment request
* @return view The payment response view
* @return \Illuminate\View\View
*/
public function processPaymentResponse($request)
{

2
app/PaymentDrivers/GoCardless/ACH.php
View File

@ -142,7 +142,7 @@ class ACH implements MethodInterface
* Show the payment page for ACH.
*
* @param array $data
* @return View
* @return \Illuminate\View\View
*/
public function paymentView(array $data): View
{

2
app/PaymentDrivers/GoCardless/DirectDebit.php
View File

@ -242,7 +242,7 @@ class DirectDebit implements MethodInterface
* Payment view for Direct Debit.
*
* @param array $data
* @return View
* @return \Illuminate\View\View
*/
public function paymentView(array $data): View
{

2
app/PaymentDrivers/GoCardless/SEPA.php
View File

@ -141,7 +141,7 @@ class SEPA implements MethodInterface
* Payment view for SEPA.
*
* @param array $data
* @return View
* @return \Illuminate\View\View
*/
public function paymentView(array $data): View
{

2
app/PaymentDrivers/Mollie/Bancontact.php
View File

@ -40,7 +40,7 @@ class Bancontact implements MethodInterface
* Show the authorization page for Bancontact.
*
* @param array $data
* @return View
* @return \Illuminate\View\View
*/
public function authorizeView(array $data): View
{

2
app/PaymentDrivers/Mollie/BankTransfer.php
View File

@ -43,7 +43,7 @@ class BankTransfer implements MethodInterface
* Show the authorization page for bank transfer.
*
* @param array $data
* @return View
* @return \Illuminate\View\View
*/
public function authorizeView(array $data): View
{

2
app/PaymentDrivers/Mollie/IDEAL.php
View File

@ -40,7 +40,7 @@ class IDEAL implements MethodInterface
* Show the authorization page for iDEAL.
*
* @param array $data
* @return View
* @return \Illuminate\View\View
*/
public function authorizeView(array $data): View
{

2
app/PaymentDrivers/Mollie/KBC.php
View File

@ -40,7 +40,7 @@ class KBC implements MethodInterface
* Show the authorization page for KBC.
*
* @param array $data
* @return View
* @return \Illuminate\View\View
*/
public function authorizeView(array $data): View
{

4
app/PaymentDrivers/Razorpay/Hosted.php
View File

@ -41,7 +41,7 @@ class Hosted implements MethodInterface
* Show the authorization page for Razorpay.
*
* @param array $data
* @return View
* @return \Illuminate\View\View
*/
public function authorizeView(array $data): View
{
@ -63,7 +63,7 @@ class Hosted implements MethodInterface
* Payment view for the Razorpay.
*
* @param array $data
* @return View
* @return \Illuminate\View\View
*/
public function paymentView(array $data): View
{

2
app/PaymentDrivers/Square/CreditCard.php
View File

@ -43,7 +43,7 @@ class CreditCard implements MethodInterface
* Authorization page for credit card.
*
* @param array $data
* @return View
* @return \Illuminate\View\View
*/
public function authorizeView($data): View
{

10
app/PaymentDrivers/Stripe/ACH.php
View File

@ -187,6 +187,16 @@ class ACH
$intent = false;
if (count($data['tokens']) == 1) {
$token = $data['tokens'][0];
$meta = $token->meta;
if(isset($meta->state) && $meta->state == 'unauthorized')
return redirect()->route('client.payment_methods.show', $token->hashed_id);
}
if (count($data['tokens']) == 0) {
$intent =
$this->stripe->createPaymentIntent(

2
app/PaymentDrivers/WePayPaymentDriver.php
View File

@ -89,7 +89,7 @@ class WePayPaymentDriver extends BaseDriver
* Setup the gateway
*
* @param array $data user_id + company
* @return view
* @return \Illuminate\View\View
*/
public function setup(array $data)
{

2
app/Services/Credit/CreditService.php
View File

@ -183,7 +183,7 @@ class CreditService
/**
* Sometimes we need to refresh the
* PDF when it is updated etc.
* @return InvoiceService
* @return self
*/
public function touchPdf($force = false)
{

1
app/Services/Invoice/ApplyPaymentAmount.php
View File

@ -73,7 +73,6 @@ class ApplyPaymentAmount extends AbstractService
->updatePaidToDate($payment->amount)
->setCalculatedStatus()
->applyNumber()
->touchPdf()
->save();
$this->invoice

6
app/Services/Invoice/EInvoice/FacturaEInvoice.php
View File

@ -214,7 +214,7 @@ class FacturaEInvoice extends AbstractService
{
$po = $this->invoice->po_number ?? '';
$this->fac->setReferences($po, $this->invoice->custom_value1, $this->invoice->custom_value2);
$this->fac->setReferences($po, substr($this->invoice->custom_value1, 0, 20), $this->invoice->custom_value2);
return $this;
}
@ -233,8 +233,8 @@ class FacturaEInvoice extends AbstractService
foreach($this->invoice->line_items as $item) {
$this->fac->addItem(new FacturaeItem([
'name' => $item->notes,
'description' => $item->product_key,
'name' => $item->product_key,
'description' => $item->notes,
'quantity' => $item->quantity,
'unitPriceWithoutTax' => $item->cost,
'discountsAndRebates' => $item->discount,

1
app/Services/Invoice/MarkSent.php
View File

@ -50,7 +50,6 @@ class MarkSent extends AbstractService
->service()
->applyNumber()
->setDueDate()
->touchPdf()
->setReminder()
->save();

4
app/Services/Payment/DeletePayment.php
View File

@ -21,7 +21,7 @@ class DeletePayment
private float $_paid_to_date_deleted = 0;
/**
* @param mixed $payment
* @param Payment $payment
* @return void
*/
public function __construct(public Payment $payment, private bool $update_client_paid_to_date)
@ -29,7 +29,7 @@ class DeletePayment
}
/**
* @return mixed
* @return Payment
* @throws BindingResolutionException
*/
public function run()

1
app/Services/Payment/SendEmail.php
View File

@ -23,7 +23,6 @@ class SendEmail
/**
* Builds the correct template to send.
* @return void
*/
public function run()
{

4
app/Transformers/ClientTransformer.php
View File

@ -47,7 +47,7 @@ class ClientTransformer extends EntityTransformer
/**
* @param Client $client
*
* @return Collection
* @return \Illuminate\Support\Collection
*/
public function includeActivities(Client $client)
{
@ -66,7 +66,7 @@ class ClientTransformer extends EntityTransformer
/**
* @param Client $client
*
* @return Collection
* @return \Illuminate\Support\Collection
*/
public function includeContacts(Client $client)
{

4
app/Transformers/ProductTransformer.php
View File

@ -37,7 +37,7 @@ class ProductTransformer extends EntityTransformer
/**
* @param Product $product
*
* @return Collection
* @return \Illuminate\Support\Collection
*/
public function includeUser(Product $product)
{
@ -49,7 +49,7 @@ class ProductTransformer extends EntityTransformer
/**
* @param Product $product
*
* @return Collection
* @return \Illuminate\Support\Collection
*/
public function includeCompany(Product $product)
{

4
app/Transformers/VendorTransformer.php
View File

@ -40,7 +40,7 @@ class VendorTransformer extends EntityTransformer
/**
* @param Vendor $vendor
*
* @return Collection
* @return \Illuminate\Support\Collection
*/
public function includeActivities(Vendor $vendor)
{
@ -52,7 +52,7 @@ class VendorTransformer extends EntityTransformer
/**
* @param Vendor $vendor
*
* @return Collection
* @return \Illuminate\Support\Collection
*/
public function includeContacts(Vendor $vendor)
{

4
config/ninja.php
View File

@ -15,8 +15,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION','5.6.21'),
'app_tag' => env('APP_TAG','5.6.21'),
'app_version' => env('APP_VERSION','5.6.22'),
'app_tag' => env('APP_TAG','5.6.22'),
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),

18
resources/views/portal/ninja2020/components/pdf-viewer.blade.php
View File

@ -1,13 +1,3 @@
@php
//$mobile = stripos(request()->server('HTTP_USER_AGENT'), 'Android') || stripos(request()->server('HTTP_USER_AGENT'), 'iPhone') || stripos(request()->server('HTTP_USER_AGENT'), 'iPod') || stripos(request()->server('HTTP_USER_AGENT'), 'iPad');
$mobile = false;
@endphp
@push('head')
<!-- <meta name="pdf-url" content="{{ $url ?? $entity->pdf_file_path($invitation, 'url', true) }}?cache_buster={{time()}}">
<script src="{{ asset('js/vendor/pdf.js/pdf.min.js') }}"></script> -->
@endpush
<div class="flex items-center justify-between mt-4">
<section class="flex items-center">
<div class="items-center" style="{{ $mobile ? '' : 'display: none' }}" id="pagination-button-container">
@ -56,15 +46,7 @@
</section>
</div>
<!-- @if($mobile)
<div class="w-full h-full overflow-auto mt-4">
<canvas id="pdf-placeholder" class="shadow rounded-lg bg-white"></canvas>
</div>
@else -->
@livewire('pdf-slot', ['entity' => $entity, 'invitation' => $invitation, 'db' => $invitation->company->db])
<!-- <iframe id="pdf-iframe" src="{{ $url ?? $entity->pdf_file_path($invitation, 'url', true) }}?cache_buster={{time()}}" class="h-screen w-full border-0 mt-4"></iframe> -->
<!-- @endif -->
@if($mobile)
@push('footer')

4
resources/views/portal/ninja2020/credits/show-fullscreen.blade.php
View File

@ -1,3 +1 @@
<iframe src="{{ $credit->fullscreenPdfViewer($invitation) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe>
<!-- <iframe src="{{ $credit->pdf_file_path(null, 'url', true) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe> -->
<iframe src="{{ $credit->fullscreenPdfViewer($invitation) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe>

11
resources/views/portal/ninja2020/credits/show.blade.php
View File

@ -1,13 +1,6 @@
@extends('portal.ninja2020.layout.app')
@section('meta_title', ctrans('texts.view_credit'))
@push('head')
<meta name="pdf-url" content="{{ $credit->pdf_file_path(null, 'url', true) }}">
@include('portal.ninja2020.components.no-cache')
<script src="{{ asset('js/vendor/pdf.js/pdf.min.js') }}"></script>
@endpush
@section('body')
<div class="bg-white shadow sm:rounded-lg mb-4" translate>
<div class="px-4 py-5 sm:p-6">
@ -31,8 +24,8 @@
</div>
</div>
@include('portal.ninja2020.components.entity-documents', ['entity' => $credit])
@livewire('pdf-slot', ['entity' => $credit, 'invitation' => $invitation, 'db' => $invitation->company->db])
@include('portal.ninja2020.components.entity-documents', ['entity' => $credit])
@livewire('pdf-slot', ['entity' => $credit, 'invitation' => $invitation, 'db' => $invitation->company->db])
@endsection

3
resources/views/portal/ninja2020/invoices/show-fullscreen.blade.php
View File

@ -1,2 +1 @@
<iframe src="{{ $invoice->fullscreenPdfViewer($invitation) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe>
<!-- <iframe src="{{ $invoice->pdf_file_path($invitation, 'url', true) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe> -->
<iframe src="{{ $invoice->fullscreenPdfViewer($invitation) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe>

3
resources/views/portal/ninja2020/purchase_orders/show-fullscreen.blade.php
View File

@ -1,2 +1 @@
<iframe src="{{ $purchase_order->fullscreenPdfViewer($invitation) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe>
<!-- <iframe src="{{ $purchase_order->pdf_file_path($invitation, 'url', true) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe> -->
<iframe src="{{ $purchase_order->fullscreenPdfViewer($invitation) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe>

4
resources/views/portal/ninja2020/quotes/show-fullscreen.blade.php
View File

@ -1,3 +1 @@
<iframe src="{{ $quote->fullscreenPdfViewer($invitation) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe>
<!-- <iframe src="{{ $quote->pdf_file_path(null,'url',true) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe> -->
<iframe src="{{ $quote->fullscreenPdfViewer($invitation) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe>

6
resources/views/portal/ninja2020/quotes/show.blade.php
View File

@ -2,15 +2,9 @@
@section('meta_title', ctrans('texts.entity_number_placeholder', ['entity' => ctrans('texts.quote'), 'entity_number' => $quote->number]))
@push('head')
<meta name="pdf-url" content="{{ asset($quote->pdf_file_path(null, 'url', true)) }}">
<script src="{{ asset('js/vendor/pdf.js/pdf.min.js') }}"></script>
<meta name="show-quote-terms" content="{{ $settings->show_accept_quote_terms ? true : false }}">
<meta name="require-quote-signature" content="{{ $client->company->account->hasFeature(\App\Models\Account::FEATURE_INVOICE_SETTINGS) && $settings->require_quote_signature }}">
<meta name="accept-user-input" content="{{ $client->getSetting('accept_client_input_quote_approval') }}">
@include('portal.ninja2020.components.no-cache')
<script src="{{ asset('vendor/signature_pad@2.3.2/signature_pad.min.js') }}"></script>
@endpush