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 branch 'v5-develop' into preview

Browse Source
This commit is contained in:
David Bomba 2023-07-02 08:34:55 +10:00
commit 2c6230cd9e
74 changed files with 711 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.6.4
5.6.5

7
app/DataMapper/Tax/US/Rule.php
View File

@ -48,7 +48,6 @@ class Rule extends BaseRule implements RuleInterface
{
$this->tax_rate1 = $item->tax_rate1;
$this->tax_name1 = $item->tax_name1;
return $this;
@ -117,6 +116,9 @@ class Rule extends BaseRule implements RuleInterface
if(in_array($this->tax_data?->txbService,['Y','L'])) {
$this->default($item);
}
else {
$this->taxExempt($item);
}
return $this;
}
@ -165,9 +167,6 @@ class Rule extends BaseRule implements RuleInterface
$this->tax_rate1 = 0;
$this->tax_name1 = '';
// $this->tax_rate1 = $this->invoice->client->company->tax_data->regions->{$this->client_region}->subregions->{$this->client_subregion}->tax_rate;
// $this->tax_name1 = "Sales Tax";
return $this;
}

2
app/Exceptions/Handler.php
View File

@ -105,7 +105,7 @@ class Handler extends ExceptionHandler
if($exception instanceof ThrottleRequestsException && class_exists(\Modules\Admin\Events\ThrottledExceptionRaised::class)) {
$uri = urldecode(request()->getRequestUri());
event(new \Modules\Admin\Events\ThrottledExceptionRaised(auth()->user()?->account?->key, $uri, request()->ip()));
// event(new \Modules\Admin\Events\ThrottledExceptionRaised(auth()->user()?->account?->key, $uri, request()->ip()));
}
Integration::configureScope(function (Scope $scope): void {

41
app/Exceptions/QuoteConversion.php Normal file
View File

@ -0,0 +1,41 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://www.elastic.co/licensing/elastic-license
*/
namespace App\Exceptions;
use Exception;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
class QuoteConversion extends Exception
{
/**
* Report the exception.
*
* @return void
*/
public function report()
{
//
}
/**
* Render the exception into an HTTP response.
*
* @param Request $request
* @return Response
*/
public function render($request)
{
return response()->json(['message' => 'This quote has already been converted. Cannot convert again.'], 400);
}
}

16
app/Factory/RecurringExpenseToExpenseFactory.php
View File

@ -95,6 +95,11 @@ class RecurringExpenseToExpenseFactory
$replacements = [
'literal' => [
':MONTHYEAR' => \sprintf(
'%s %s',
Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F'),
now()->year,
),
':MONTH' => Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F'),
':YEAR' => now()->year,
':QUARTER' => 'Q'.now()->quarter,
@ -240,6 +245,17 @@ class RecurringExpenseToExpenseFactory
$output = \Carbon\Carbon::create()->month($output)->translatedFormat('F');
}
if ($matches->keys()->first() == ':MONTHYEAR') {
$final_date = now()->addMonths($output-now()->month);
$output = \sprintf(
'%s %s',
$final_date->translatedFormat('F'),
$final_date->year,
);
}
$value = preg_replace(
$target,
$output,

23
app/Filters/ExpenseFilters.php
View File

@ -106,6 +106,29 @@ class ExpenseFilters extends QueryFilters
return $this->builder;
}
/**
* Filter expenses that only have invoices
*
* @param string $value
* @return Builder
*/
public function has_invoices(string $value = ''): Builder
{
$split = explode(",", $value);
if (is_array($split) && in_array($split[0], ['client', 'project'])) {
$search_key = $split[0] == 'client' ? 'client_id' : 'project_id';
return $this->builder->whereHas('invoice', function ($query) use ($search_key, $split){
$query->where($search_key, $this->decodePrimaryKey($split[1]))
->whereIn('status_id', [\App\Models\Invoice::STATUS_DRAFT, \App\Models\Invoice::STATUS_SENT, \App\Models\Invoice::STATUS_PARTIAL]);
});
}
return $this->builder;
}
/**
* Returns a list of expenses that can be matched to bank transactions
*/

9
app/Filters/UserFilters.php
View File

@ -89,6 +89,15 @@ class UserFilters extends QueryFilters
->where('account_id', auth()->user()->account_id);
}
public function sending_users(string $value = ''): Builder
{
if (strlen($value) == 0 || $value != 'true') {
return $this->builder;
}
return $this->builder->whereNotNull('oauth_user_refresh_token');
}
/**
* Exclude a list of user_ids, can pass multiple
* user IDs by separating them with a comma.

9
app/Helpers/Bank/Yodlee/Transformer/IncomeTransformer.php
View File

@ -127,9 +127,12 @@ class IncomeTransformer implements BankRevenueInterface
foreach ($transaction->transaction as $transaction) {
//do not store duplicate / pending transactions
if (property_exists($transaction, 'status') && $transaction->status == 'PENDING') {
if (property_exists($transaction, 'status') && $transaction->status == 'PENDING')
continue;
//some object do no store amounts ignore these
if(!property_exists($transaction, 'amount'))
continue;
}
$data[] = $this->transformTransaction($transaction);
}
@ -148,7 +151,7 @@ class IncomeTransformer implements BankRevenueInterface
'category_type' => $transaction->categoryType,
'date' => $transaction->date,
'bank_account_id' => $transaction->accountId,
'description' => $transaction->description->original,
'description' => $transaction?->description?->original ?? '',
'base_type' => property_exists($transaction, 'baseType') ? $transaction->baseType : $this->calculateBaseType($transaction),
];
}

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

@ -92,46 +92,47 @@ class ActivityController extends BaseController
->company()
->take($default_activities);
if ($request->has('react')) {
// if ($request->has('react')) {
/** @var \App\Models\User auth()->user() */
$user = auth()->user();
// /** @var \App\Models\User auth()->user() */
// $user = auth()->user();
if (!$user->isAdmin()) {
$activities->where('user_id', auth()->user()->id);
}
// if (!$user->isAdmin()) {
// $activities->where('user_id', auth()->user()->id);
// }
$system = ctrans('texts.system');
// $system = ctrans('texts.system');
$data = $activities->cursor()->map(function ($activity) {
// $data = $activities->cursor()->map(function ($activity) {
$arr =
[
'client' => $activity->client ? $activity->client : '',
'contact' => $activity->client ? $activity->contact : '',
'quote' => $activity->quote ? $activity->quote : '',
'user' => $activity->user ? $activity->user : '',
'expense' => $activity->expense ? $activity->expense : '',
'invoice' => $activity->invoice ? $activity->invoice : '',
'recurring_invoice' => $activity->recurring_invoice ? $activity->recurring_invoice : '',
'payment' => $activity->payment ? $activity->payment : '',
'credit' => $activity->credit ? $activity->credit : '',
'task' => $activity->task ? $activity->task : '',
'vendor' => $activity->vendor ? $activity->vendor : '',
'purchase_order' => $activity->purchase_order ? $activity->purchase_order : '',
'subscription' => $activity->subscription ? $activity->subscription : '',
'vendor_contact' => $activity->vendor_contact ? $activity->vendor_contact : '',
'recurring_expense' => $activity->recurring_expense ? $activity->recurring_expense : '',
];
// $arr =
// [
// 'client' => $activity->client ? $activity->client : '',
// 'contact' => $activity->client ? $activity->contact : '',
// 'quote' => $activity->quote ? $activity->quote : '',
// 'user' => $activity->user ? $activity->user : '',
// 'expense' => $activity->expense ? $activity->expense : '',
// 'invoice' => $activity->invoice ? $activity->invoice : '',
// 'recurring_invoice' => $activity->recurring_invoice ? $activity->recurring_invoice : '',
// 'payment' => $activity->payment ? $activity->payment : '',
// 'credit' => $activity->credit ? $activity->credit : '',
// 'task' => $activity->task ? $activity->task : '',
// 'vendor' => $activity->vendor ? $activity->vendor : '',
// 'purchase_order' => $activity->purchase_order ? $activity->purchase_order : '',
// 'subscription' => $activity->subscription ? $activity->subscription : '',
// 'vendor_contact' => $activity->vendor_contact ? $activity->vendor_contact : '',
// 'recurring_expense' => $activity->recurring_expense ? $activity->recurring_expense : '',
// ];
$activity_array = $activity->toArray();
// $activity_array = $activity->toArray();
return array_merge($arr, $activity_array);
});
// return array_merge($arr, $activity_array);
// });
return response()->json(['data' => $data->toArray()], 200);
}
elseif($request->has('reactv2')) {
// return response()->json(['data' => $data->toArray()], 200);
// }
// else
if($request->has('reactv2')) {
/** @var \App\Models\User auth()->user() */
$user = auth()->user();

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

@ -682,8 +682,6 @@ class LoginController extends BaseController
'email' => $socialite_user->getEmail(),
'oauth_user_id' => $socialite_user->getId(),
'oauth_provider_id' => $provider,
// 'oauth_user_token' => $oauth_user_token,
// 'oauth_user_refresh_token' => $socialite_user->refreshToken,
];
$user->update($update_user);
@ -699,7 +697,7 @@ class LoginController extends BaseController
$request_from_react = Cache::pull("react_redir:".auth()->user()?->account?->key);
if($request_from_react)
// if($request_from_react)
$redirect_url = config('ninja.react_url')."/#/settings/user_details/connect";
return redirect($redirect_url);
@ -735,6 +733,10 @@ class LoginController extends BaseController
nlog('user not found for oauth');
}
return redirect('/#/');
$redirect_url = config('ninja.react_url')."/#/settings/user_details/connect";
return redirect($redirect_url);
// return redirect('/#/');
}
}

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

@ -90,14 +90,15 @@ class ConnectedAccountController extends BaseController
private function handleMicrosoftOauth($request)
{
nlog($request->all());
$access_token = false;
$access_token = $request->has('access_token') ? $request->input('access_token') : $request->input('accessToken');
if (!$request->has('access_token')) {
if (!$access_token) {
return response()->json(['message' => 'No access_token parameter found!'], 400);
}
$graph = new \Microsoft\Graph\Graph();
$graph->setAccessToken($request->input('access_token'));
$graph->setAccessToken($access_token);
$user = $graph->createRequest("GET", "/me")
->setReturnType(Model\User::class)

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

@ -408,7 +408,7 @@ class InvoiceController extends BaseController
$invoice->service()
->triggeredActions($request)
->touchPdf()
->deletePdf()
->adjustInventory($old_invoice);
event(new InvoiceWasUpdated($invoice, $invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
@ -740,7 +740,8 @@ class InvoiceController extends BaseController
}
break;
case 'cancel':
$invoice = $invoice->service()->handleCancellation()->touchPdf()->save();
$invoice = $invoice->service()->handleCancellation()->deletePdf()->save();
// $invoice = $invoice->service()->handleCancellation()->touchPdf()->save();
if (! $bulk) {
$this->itemResponse($invoice);

27
app/Http/Requests/Chart/ShowChartRequest.php
View File

@ -12,9 +12,12 @@
namespace App\Http\Requests\Chart;
use App\Http\Requests\Request;
use App\Utils\Traits\MakesDates;
class ShowChartRequest extends Request
{
use MakesDates;
/**
* Determine if the user is authorized to make this request.
*
@ -22,14 +25,18 @@ class ShowChartRequest extends Request
*/
public function authorize() : bool
{
return auth()->user()->isAdmin();
/**@var \App\Models\User auth()->user */
$user = auth()->user();
return $user->isAdmin();
}
public function rules()
{
return [
'start_date' => 'date',
'end_date' => 'date',
'date_range' => 'bail|sometimes|string|in:last7_days,last30_days,last365_days,this_month,last_month,this_quarter,last_quarter,this_year,last_year,all_time,custom',
'start_date' => 'bail|sometimes|date',
'end_date' => 'bail|sometimes|date',
];
}
@ -37,12 +44,18 @@ class ShowChartRequest extends Request
{
$input = $this->all();
if (! array_key_exists('start_date', $input)) {
$input['start_date'] = now()->subDays(20);
if(isset($input['date_range'])) {
$dates = $this->calculateStartAndEndDates($input);
$input['start_date'] = $dates[0];
$input['end_date'] = $dates[1];
}
if (! array_key_exists('end_date', $input)) {
$input['end_date'] = now();
if (! isset($input['start_date'])) {
$input['start_date'] = now()->subDays(20)->format('Y-m-d');
}
if (! isset($input['end_date'])) {
$input['end_date'] = now()->format('Y-m-d');
}
$this->replace($input);

2
app/Http/Requests/Preview/PreviewInvoiceRequest.php
View File

@ -48,7 +48,7 @@ class PreviewInvoiceRequest extends Request
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
$input['amount'] = 0;
$input['balance'] = 0;
$input['number'] = ctrans('texts.live_preview').' #'.rand(0, 1000);
$input['number'] = isset($input['number']) ? $input['number'] : ctrans('texts.live_preview').' #'.rand(0, 1000);
$this->replace($input);
}

2
app/Http/Requests/Preview/PreviewPurchaseOrderRequest.php
View File

@ -48,7 +48,7 @@ class PreviewPurchaseOrderRequest extends Request
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
$input['amount'] = 0;
$input['balance'] = 0;
$input['number'] = ctrans('texts.live_preview') . " #". rand(0, 1000);
$input['number'] = isset($input['number']) ? $input['number'] : ctrans('texts.live_preview').' #'.rand(0, 1000); //30-06-2023
$this->replace($input);
}

2
app/Http/Requests/Report/GenericReportRequest.php
View File

@ -33,7 +33,7 @@ class GenericReportRequest extends Request
'start_date' => 'bail|required_if:date_range,custom|nullable|date',
'report_keys' => 'present|array',
'send_email' => 'required|bool',
'status' => 'sometimes|string|nullable|in:all,draft,sent,viewed,paid,unpaid,overdue',
// 'status' => 'sometimes|string|nullable|in:all,draft,sent,viewed,paid,unpaid,overdue',
];
}

2
app/Jobs/Bank/MatchBankTransactions.php
View File

@ -362,7 +362,7 @@ class MatchBankTransactions implements ShouldQueue
$this->invoice
->service()
->applyNumber()
->touchPdf()
->deletePdf()
->save();
$payment->ledger()

31
app/Jobs/Bank/ProcessBankTransactions.php
View File

@ -11,17 +11,19 @@
namespace App\Jobs\Bank;
use App\Helpers\Bank\Yodlee\Yodlee;
use App\Models\Company;
use App\Libraries\MultiDB;
use Illuminate\Bus\Queueable;
use App\Models\BankIntegration;
use App\Models\BankTransaction;
use App\Models\Company;
use App\Helpers\Bank\Yodlee\Yodlee;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use App\Services\Bank\BankMatchingService;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\Middleware\WithoutOverlapping;
use App\Notifications\Ninja\GenericNinjaAdminNotification;
class ProcessBankTransactions implements ShouldQueue
{
@ -70,6 +72,14 @@ class ProcessBankTransactions implements ShouldQueue
$this->processTransactions();
} catch(\Exception $e) {
nlog("{$this->bank_integration_account_id} - exited abnormally => ". $e->getMessage());
$content = [
"Processing transactions for account: {$this->bank_integration->account->key} failed",
"Exception Details => ",
$e->getMessage(),
];
$this->bank_integration->company->notification(new GenericNinjaAdminNotification($content))->ninja();
return;
}
} while ($this->stop_loop);
@ -152,4 +162,15 @@ class ProcessBankTransactions implements ShouldQueue
$this->bank_integration->save();
}
}
public function middleware()
{
return [new WithoutOverlapping($this->bank_integration_account_id)];
}
public function backoff()
{
return [rand(10, 15), rand(30, 40), rand(60, 79), rand(160, 200), rand(3000, 5000)];
}
}

11
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -243,19 +243,20 @@ class NinjaMailerJob implements ShouldQueue
case 'gmail':
$this->mailer = 'gmail';
$this->setGmailMailer();
return;
return $this;
case 'office365':
case 'microsoft':
$this->mailer = 'office365';
$this->setOfficeMailer();
return;
return $this;
case 'client_postmark':
$this->mailer = 'postmark';
$this->setPostmarkMailer();
return;
return $this;
case 'client_mailgun':
$this->mailer = 'mailgun';
$this->setMailgunMailer();
return;
return $this;
default:
break;
@ -264,6 +265,8 @@ class NinjaMailerJob implements ShouldQueue
if (Ninja::isSelfHost()) {
$this->setSelfHostMultiMailer();
}
return $this;
}
/**

231
app/Jobs/Util/Import.php
View File

@ -11,85 +11,89 @@
namespace App\Jobs\Util;
use App\DataMapper\Analytics\MigrationFailure;
use App\DataMapper\CompanySettings;
use App\Exceptions\ClientHostedMigrationException;
use App\Exceptions\MigrationValidatorFailed;
use App\Exceptions\ResourceDependencyMissing;
use Exception;
use App\Models\Task;
use App\Models\User;
use App\Utils\Ninja;
use App\Models\Quote;
use App\Models\Client;
use App\Models\Credit;
use App\Models\Vendor;
use App\Models\Company;
use App\Models\Expense;
use App\Models\Invoice;
use App\Models\Payment;
use App\Models\Product;
use App\Models\Project;
use App\Models\TaxRate;
use App\Models\Activity;
use App\Models\Document;
use App\Libraries\MultiDB;
use App\Models\TaskStatus;
use App\Models\PaymentTerm;
use Illuminate\Support\Str;
use App\Factory\UserFactory;
use App\Factory\QuoteFactory;
use App\Models\ClientContact;
use Illuminate\Bus\Queueable;
use App\Factory\ClientFactory;
use App\Factory\CompanyLedgerFactory;
use App\Factory\CreditFactory;
use App\Factory\VendorFactory;
use App\Models\CompanyGateway;
use Illuminate\Support\Carbon;
use App\Factory\InvoiceFactory;
use App\Factory\PaymentFactory;
use App\Factory\ProductFactory;
use App\Factory\QuoteFactory;
use App\Factory\RecurringInvoiceFactory;
use App\Factory\TaxRateFactory;
use App\Factory\UserFactory;
use App\Factory\VendorFactory;
use App\Http\Requests\Company\UpdateCompanyRequest;
use App\Http\ValidationRules\ValidCompanyGatewayFeesAndLimitsRule;
use App\Http\ValidationRules\ValidUserForCompany;
use App\Jobs\Company\CreateCompanyToken;
use App\Jobs\Mail\NinjaMailerJob;
use App\Jobs\Mail\NinjaMailerObject;
use App\Jobs\Ninja\CheckCompanyData;
use App\Libraries\MultiDB;
use App\Mail\Migration\StripeConnectMigration;
use App\Mail\MigrationCompleted;
use App\Models\Activity;
use App\Models\Client;
use App\Models\ClientContact;
use App\Models\ClientGatewayToken;
use App\Models\Company;
use App\Models\CompanyGateway;
use App\Models\Credit;
use App\Models\Document;
use App\Models\Expense;
use App\Jobs\Util\VersionCheck;
use App\Models\ExpenseCategory;
use App\Models\Invoice;
use App\Models\Payment;
use App\Models\PaymentTerm;
use App\Models\Product;
use App\Models\Project;
use App\Models\Quote;
use App\Utils\Traits\MakesHash;
use App\Mail\MigrationCompleted;
use App\Models\RecurringExpense;
use App\Models\RecurringInvoice;
use App\Models\Task;
use App\Models\TaskStatus;
use App\Models\TaxRate;
use App\Models\User;
use App\Models\Vendor;
use App\Repositories\ClientContactRepository;
use App\Repositories\ClientRepository;
use App\Repositories\CompanyRepository;
use App\Repositories\CreditRepository;
use App\Repositories\Migration\InvoiceMigrationRepository;
use App\Repositories\Migration\PaymentMigrationRepository;
use App\Repositories\ProductRepository;
use App\Repositories\UserRepository;
use App\Repositories\VendorContactRepository;
use App\Repositories\VendorRepository;
use App\Utils\Ninja;
use App\Utils\Traits\CleanLineItems;
use App\Utils\Traits\CompanyGatewayFeesAndLimitsSaver;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\SavesDocuments;
use App\Utils\Traits\Uploadable;
use Exception;
use Illuminate\Bus\Queueable;
use App\Jobs\Mail\NinjaMailerJob;
use Illuminate\Http\UploadedFile;
use App\Models\ClientGatewayToken;
use Illuminate\Support\Facades\DB;
use App\DataMapper\CompanySettings;
use Illuminate\Support\Facades\App;
use App\Jobs\Mail\NinjaMailerObject;
use App\Jobs\Ninja\CheckCompanyData;
use App\Repositories\UserRepository;
use App\Utils\Traits\CleanLineItems;
use App\Utils\Traits\SavesDocuments;
use Illuminate\Support\Facades\Mail;
use App\Factory\CompanyLedgerFactory;
use App\Repositories\ClientRepository;
use App\Repositories\CreditRepository;
use App\Repositories\VendorRepository;
use Illuminate\Queue\SerializesModels;
use Turbo124\Beacon\Facades\LightLogs;
use App\Repositories\CompanyRepository;
use App\Repositories\ProductRepository;
use App\Factory\RecurringInvoiceFactory;
use App\Jobs\Company\CreateCompanyToken;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Support\Facades\Validator;
use Modules\Admin\Jobs\Account\NinjaUser;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Http\UploadedFile;
use Illuminate\Queue\InteractsWithQueue;
use App\DataMapper\ClientRegistrationFields;
use App\Exceptions\MigrationValidatorFailed;
use App\Exceptions\ResourceDependencyMissing;
use App\Repositories\ClientContactRepository;
use App\Repositories\VendorContactRepository;
use App\DataMapper\Analytics\MigrationFailure;
use App\Mail\Migration\StripeConnectMigration;
use App\Http\ValidationRules\ValidUserForCompany;
use App\Exceptions\ClientHostedMigrationException;
use App\Http\Requests\Company\UpdateCompanyRequest;
use Illuminate\Queue\Middleware\WithoutOverlapping;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Turbo124\Beacon\Facades\LightLogs;
use App\Utils\Traits\CompanyGatewayFeesAndLimitsSaver;
use App\Repositories\Migration\InvoiceMigrationRepository;
use App\Repositories\Migration\PaymentMigrationRepository;
use App\Http\ValidationRules\ValidCompanyGatewayFeesAndLimitsRule;
class Import implements ShouldQueue
{
@ -135,6 +139,7 @@ class Import implements ShouldQueue
'recurring_expenses',
'tasks',
'documents',
'activities',
];
/**
@ -181,7 +186,7 @@ class Import implements ShouldQueue
public function middleware()
{
return [(new WithoutOverlapping($this->user->account_id))];
return [(new WithoutOverlapping($this->company->company_key))];
}
/**
@ -303,7 +308,7 @@ class Import implements ShouldQueue
if (round($total_invoice_payments, 2) != round($client->paid_to_date, 2)) {
$client->paid_to_date = $total_invoice_payments;
$client->save();
$client->saveQuietly();
}
});
}
@ -319,12 +324,12 @@ class Import implements ShouldQueue
$company_ledger->notes = 'Migrated Client Balance';
$company_ledger->balance = $invoice_balances;
$company_ledger->activity_id = Activity::CREATE_CLIENT;
$company_ledger->save();
$company_ledger->saveQuietly();
$client->company_ledger()->save($company_ledger);
$client->balance = $invoice_balances;
$client->save();
$client->saveQuietly();
});
}
@ -1504,7 +1509,19 @@ class Import implements ShouldQueue
false
);
$this->saveDocument($uploaded_file, $entity, $is_public = true);
// $this->saveDocument($uploaded_file, $entity, $is_public = true);
$document = (new \App\Jobs\Util\UploadFile(
$uploaded_file,
\App\Jobs\Util\UploadFile::DOCUMENT,
$this->user,
$this->company,
$entity,
null,
true
))->handle();
} catch(\Exception $e) {
//do nothing, gracefully :)
}
@ -1776,6 +1793,78 @@ class Import implements ShouldQueue
$data = null;
}
private function processActivities(array $data): void
{
Activity::where('company_id', $this->company->id)->cursor()->each(function ($a){
$a->forceDelete();
nlog("deleting {$a->id}");
});
Activity::unguard();
foreach ($data as $resource) {
$modified = $resource;
$modified['company_id'] = $this->company->id;
$modified['user_id'] = $this->processUserId($resource);
try {
if (isset($modified['client_id'])) {
$modified['client_id'] = $this->transformId('clients', $resource['client_id']);
}
if (isset($modified['invoice_id'])) {
$modified['invoice_id'] = $this->transformId('invoices', $resource['invoice_id']);
}
if (isset($modified['quote_id'])) {
$modified['quote_id'] = $this->transformId('quotes', $resource['quote_id']);
}
if (isset($modified['recurring_invoice_id'])) {
$modified['recurring_invoice_id'] = $this->transformId('recurring_invoices', $resource['recurring_invoice_id']);
}
if (isset($modified['payment_id'])) {
$modified['payment_id'] = $this->transformId('payments', $resource['payment_id']);
}
if (isset($modified['credit_id'])) {
$modified['credit_id'] = $this->transformId('credits', $resource['credit_id']);
}
if (isset($modified['expense_id'])) {
$modified['expense_id'] = $this->transformId('expenses', $resource['expense_id']);
}
if (isset($modified['task_id'])) {
$modified['task_id'] = $this->transformId('tasks', $resource['task_id']);
}
if (isset($modified['client_contact_id'])) {
$modified['client_contact_id'] = $this->transformId('client_contacts', $resource['client_contact_id']);
}
$modified['updated_at'] = $modified['created_at'];
$act = Activity::make($modified);
$act->save(['timestamps' => false]);
}
catch (\Exception $e) {
nlog("could not import activity: {$e->getMessage()}");
}
}
Activity::reguard();
}
private function processExpenses(array $data) :void
{
Expense::unguard();

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

@ -126,7 +126,7 @@ class ReminderJob implements ShouldQueue
}
$reminder_template = $invoice->calculateTemplate('invoice');
nlog("reminder template = {$reminder_template}");
// nlog("reminder template = {$reminder_template}");
$invoice->service()->touchReminder($reminder_template)->save();
$fees = $this->calcLateFee($invoice, $reminder_template);
@ -208,7 +208,8 @@ class ReminderJob implements ShouldQueue
->markSent()
->save();
$invoice->service()->touchPdf(true);
//30-6-2023 - fix for duplicate touching
// $invoice->service()->touchPdf(true);
$enabled_reminder = 'enable_'.$reminder_template;
if ($reminder_template == 'endless_reminder') {
@ -268,7 +269,6 @@ class ReminderJob implements ShouldQueue
}
return [$late_fee_amount, $late_fee_percent];
// return $this->setLateFee($invoice, $late_fee_amount, $late_fee_percent);
}
/**

4
app/Jobs/Util/WebhookSingle.php
View File

@ -122,7 +122,9 @@ class WebhookSingle implements ShouldQueue
$client = new Client(['headers' => array_merge($base_headers, $headers)]);
try {
$response = $client->{$subscription->rest_method}($subscription->target_url, [
$verb = $subscription->rest_method ?? 'post';
$response = $client->{$verb}($subscription->target_url, [
RequestOptions::JSON => $data, // or 'json' => [...]
]);

13
app/Listeners/Activity/PaymentCreatedActivity.php
View File

@ -39,24 +39,27 @@ class PaymentCreatedActivity implements ShouldQueue
*/
public function handle($event)
{
MultiDB::setDb($event->company->db);
$payment = $event->payment;
$invoice_id = null;
if($payment->invoices()->exists())
$invoice_id = $payment->invoices()->first()->id;
$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
$invoices = $payment->invoices;
$fields = new stdClass;
$fields->payment_id = $payment->id;
$fields->invoice_id = $invoice_id;
$fields->client_id = $payment->client_id;
$fields->user_id = $user_id;
$fields->company_id = $payment->company_id;
$fields->activity_type_id = Activity::CREATE_PAYMENT;
if (count($invoices) == 0) {
$this->activity_repo->save($fields, $payment, $event->event_vars);
}
$this->activity_repo->save($fields, $payment, $event->event_vars);
}
}

6
app/Models/Activity.php
View File

@ -515,9 +515,8 @@ class Activity extends StaticModel
{
$system = ctrans('texts.system');
return match($variable) {
':invoice' => $translation = [substr($variable, 1) => [ 'label' => $this?->invoice?->number ?? '', 'hashed_id' => $this->invoice?->hashed_id ?? '']],
':contact' => $translation = $this->resolveContact(),
match($variable) {
':invoice' => $translation = [substr($variable, 1) => [ 'label' => $this?->invoice?->number ?? '', 'hashed_id' => $this->invoice?->hashed_id ?? '']],
':user' => $translation = [substr($variable, 1) => [ 'label' => $this?->user?->present()->name() ?? $system, 'hashed_id' => $this->user->hashed_id ?? '']],
':quote' => $translation = [substr($variable, 1) => [ 'label' => $this?->quote?->number ?? '', 'hashed_id' => $this->quote->hashed_id ?? '']],
':credit' => $translation = [substr($variable, 1) => [ 'label' => $this?->credit?->number ?? '', 'hashed_id' => $this->credit->hashed_id ?? '']],
@ -531,6 +530,7 @@ class Activity extends StaticModel
':payment_amount' => $translation = [substr($variable, 1) =>[ 'label' => Number::formatMoney($this?->payment?->amount, $this?->payment?->client) ?? '', 'hashed_id' => '']],
':adjustment' => $translation = [substr($variable, 1) =>[ 'label' => Number::formatMoney($this?->payment?->refunded, $this?->payment?->client) ?? '', 'hashed_id' => '']],
':ip' => $translation = [ 'ip' => $this->ip ?? ''],
':contact' => $translation = $this->resolveContact(),
default => $translation = [],
};

36
app/Models/BaseModel.php
View File

@ -11,15 +11,17 @@
namespace App\Models;
use Illuminate\Support\Str;
use Illuminate\Support\Carbon;
use App\Utils\Traits\MakesHash;
use App\Jobs\Entity\CreateRawPdf;
use App\Jobs\Util\WebhookHandler;
use App\Models\Traits\Excludable;
use App\Utils\Traits\MakesHash;
use Illuminate\Database\Eloquent\Model;
use App\Jobs\Vendor\CreatePurchaseOrderPdf;
use App\Utils\Traits\UserSessionAttributes;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException;
use Illuminate\Support\Carbon;
use Illuminate\Support\Str;
/**
* Class BaseModel
@ -255,4 +257,30 @@ class BaseModel extends Model
WebhookHandler::dispatch($event_id, $this, $this->company, $additional_data);
}
}
/**
* Returns the base64 encoded PDF string of the entity
*/
public function fullscreenPdfViewer($invitation = null): string
{
if (! $invitation) {
if ($this->invitations()->exists()) {
$invitation = $this->invitations()->first();
} else {
$this->service()->createInvitations();
$invitation = $this->invitations()->first();
}
}
if (! $invitation) {
throw new \Exception('Hard fail, could not create an invitation.');
}
if($this instanceof \App\Models\PurchaseOrder)
return "data:application/pdf;base64,".base64_encode((new CreatePurchaseOrderPdf($invitation, $invitation->company->db))->rawPdf());
return "data:application/pdf;base64,".base64_encode((new CreateRawPdf($invitation, $invitation->company->db))->handle());
}
}

4
app/Models/Client.php
View File

@ -544,9 +544,9 @@ class Client extends BaseModel implements HasLocalePreference
return $this->settings->{$setting};
} elseif (is_bool($this->settings->{$setting})) {
return $this->settings->{$setting};
} elseif (is_int($this->settings->{$setting})) { //10-08-2022 integer client values are not being passed back! This resolves it.
} elseif (is_int($this->settings->{$setting})) {
return $this->settings->{$setting};
} elseif(is_float($this->settings->{$setting})) { //10-08-2022 integer client values are not being passed back! This resolves it.
} elseif(is_float($this->settings->{$setting})) {
return $this->settings->{$setting};
}
}

5
app/Models/Expense.php
View File

@ -225,6 +225,11 @@ class Expense extends BaseModel
return $this->belongsTo(Company::class);
}
public function invoice()
{
return $this->belongsTo(Invoice::class);
}
public function vendor()
{
return $this->belongsTo(Vendor::class);

3
app/Models/Invoice.php
View File

@ -14,6 +14,7 @@ namespace App\Models;
use App\Utils\Ninja;
use Illuminate\Support\Carbon;
use App\Utils\Traits\MakesDates;
use App\Jobs\Entity\CreateRawPdf;
use App\Helpers\Invoice\InvoiceSum;
use App\Jobs\Entity\CreateEntityPdf;
use App\Utils\Traits\MakesReminders;
@ -683,6 +684,7 @@ class Invoice extends BaseModel
public function pdf_file_path($invitation = null, string $type = 'path', bool $portal = false)
{
if (! $invitation) {
if ($this->invitations()->exists()) {
$invitation = $this->invitations()->first();
@ -725,7 +727,6 @@ class Invoice extends BaseModel
return Storage::disk(config('filesystems.default'))->{$type}($file_path);
}
try {
$file_exists = Storage::disk('public')->exists($file_path);
} catch (\Exception $e) {

71
app/Notifications/Ninja/GenericNinjaAdminNotification.php Normal file
View File

@ -0,0 +1,71 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://www.elastic.co/licensing/elastic-license
*/
namespace App\Notifications\Ninja;
use Illuminate\Notifications\Messages\SlackMessage;
use Illuminate\Notifications\Notification;
class GenericNinjaAdminNotification extends Notification
{
public function __construct(protected array $message_array)
{
}
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
{
return ['slack'];
}
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
*/
public function toMail($notifiable)
{
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
//
];
}
public function toSlack($notifiable)
{
$content = '';
foreach($this->message_array as $message) {
$content .= $message . "\n";
}
return (new SlackMessage)
->success()
->from(ctrans('texts.notification_bot'))
->image('https://app.invoiceninja.com/favicon.png')
->content($content);
}
}

4
app/PaymentDrivers/BaseDriver.php
View File

@ -525,7 +525,7 @@ class BaseDriver extends AbstractPaymentDriver
$invoices = Invoice::whereIn('id', $this->transformKeys(array_column($this->payment_hash->invoices(), 'invoice_id')))->withTrashed()->get();
$invoices->each(function ($invoice) {
$invoice->service()->touchPdf();
$invoice->service()->deletePdf();
});
$invoices->first()->invitations->each(function ($invitation) use ($nmo) {
@ -570,7 +570,7 @@ class BaseDriver extends AbstractPaymentDriver
$invoices = Invoice::whereIn('id', $this->transformKeys(array_column($this->payment_hash->invoices(), 'invoice_id')))->withTrashed()->get();
$invoices->each(function ($invoice) {
$invoice->service()->touchPdf();
$invoice->service()->deletePdf();
});
$invoices->first()->invitations->each(function ($invitation) use ($nmo) {

36
app/PaymentDrivers/Eway/CreditCard.php
View File

@ -70,12 +70,17 @@ class CreditCard
$response = $this->eway_driver->init()->eway->createCustomer(\Eway\Rapid\Enum\ApiMethod::DIRECT, $transaction);
$response_status = ErrorCode::getStatus($response->ResponseMessage);
if(property_exists($response, 'ResponseMessage'))
$response_status = ErrorCode::getStatus($response->ResponseMessage);
if (! $response_status['success']) {
$this->eway_driver->sendFailureMail($response_status['message']);
throw new PaymentFailed($response_status['message'], 400);
$this->logResponse($response);
throw new PaymentFailed($response_status['message'] ?? 'Unknown response from gateway, please contact you merchant.', 400);
}
//success
@ -94,6 +99,8 @@ class CreditCard
$token = $this->eway_driver->storeGatewayToken($cgt, []);
$this->logResponse($response);
return $token;
}
@ -135,7 +142,7 @@ class CreditCard
$amount = array_sum(array_column($this->eway_driver->payment_hash->invoices(), 'amount')) + $this->eway_driver->payment_hash->fee_total;
$description = "Invoices: {$invoice_numbers} for {$amount} for client {$this->eway_driver->client->present()->name()}";
// $description = "Invoices: {$invoice_numbers} for {$amount} for client {$this->eway_driver->client->present()->name()}";
$transaction = [
'Payment' => [
@ -152,29 +159,6 @@ class CreditCard
$this->logResponse($response);
// if(!$response || !property_exists($response, 'ResponseMessage'))
// throw new PaymentFailed('The gateway did not return a valid response. Please check your gateway credentials.', 400);
// $response_status = ErrorCode::getStatus($response->ResponseMessage);
// if(!$response_status['success']){
// if($response->getErrors())
// {
// $message = false;
// foreach ($response->getErrors() as $error) {
// $message = \Eway\Rapid::getMessage($error);
// }
// $return_message = $message ?: $response_status['message'];
// }
// $this->eway_driver->sendFailureMail($response_status['message']);
// throw new PaymentFailed($response_status['message'], 400);
// }
if ($response->TransactionStatus) {
$payment = $this->storePayment($response);
} else {

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

@ -123,6 +123,7 @@ class CreditCard
'city' => $this->paytrace->client->city,
'state' => $this->paytrace->client->state,
'zip' => $this->paytrace->client->postal_code,
'country' => $this->paytrace->client->country->iso_3166_2
];
return $data;
@ -177,6 +178,7 @@ class CreditCard
'customer_id' => $token,
'integrator_id' => $this->paytrace->company_gateway->getConfigField('integratorId'),
'amount' => $request->input('amount_with_fee'),
'invoice_id' => $this->harvestInvoiceId(),
];
$response = $this->paytrace->gatewayRequest('/v1/transactions/sale/by_customer', $data);

2
app/PaymentDrivers/Stripe/iDeal.php
View File

@ -106,7 +106,7 @@ class iDeal
'gateway_type_id' => GatewayType::IDEAL,
];
$this->stripe->createPayment($data, Payment::STATUS_PENDING);
$this->stripe->createPayment($data, Payment::STATUS_COMPLETED);
SystemLogger::dispatch(
['response' => $this->stripe->payment_hash->data, 'data' => $data],

2
app/Repositories/PaymentRepository.php
View File

@ -185,7 +185,7 @@ class PaymentRepository extends BaseRepository
$paymentable->payment_id = $payment->id;
$paymentable->paymentable_id = $credit->id;
$paymentable->paymentable_type = Credit::class;
$paymentable->amount = $paid_invoice['amount'];
$paymentable->amount = $paid_credit['amount'];
$paymentable->save();
$credit = $credit->service()->markSent()->save();

6
app/Repositories/TaskStatusRepository.php
View File

@ -38,13 +38,15 @@ class TaskStatusRepository extends BaseRepository
public function archive($task_status)
{
$task_status = TaskStatus::where('id', $task_status->id)
$task_status = TaskStatus::withTrashed()
->where('id', $task_status->id)
->where('company_id', $task_status->company_id)
->first();
$new_status = $task_status ? $task_status->id : null;
Task::where('status_id', $task_status->id)
Task::withTrashed()
->where('status_id', $task_status->id)
->where('company_id', $task_status->company_id)
->update(['status_id' => $new_status]);

5
app/Services/Chart/ChartService.php
View File

@ -76,6 +76,8 @@ class ChartService
$currencies = $this->getCurrencyCodes();
$data = [];
$data['start_date'] = $start_date;
$data['end_date'] = $end_date;
foreach ($currencies as $key => $value) {
$data[$key]['invoices'] = $this->getInvoiceChartQuery($start_date, $end_date, $key);
@ -97,6 +99,9 @@ class ChartService
$data['currencies'] = $this->getCurrencyCodes();
$data['start_date'] = $start_date;
$data['end_date'] = $end_date;
$revenue = $this->getRevenue($start_date, $end_date);
$outstanding = $this->getOutstanding($start_date, $end_date);
$expenses = $this->getExpenses($start_date, $end_date);

4
app/Services/Credit/ApplyPayment.php
View File

@ -137,7 +137,7 @@ class ApplyPayment
->updateBalance($this->amount_applied * -1)
->updatePaidToDate($this->amount_applied)
->updateStatus()
->touchPdf()
->deletePdf()
->save();
$this->credit
@ -147,7 +147,7 @@ class ApplyPayment
event(new InvoiceWasUpdated($this->invoice, $this->invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
if ((int) $this->invoice->balance == 0) {
$this->invoice->service()->touchPdf();
$this->invoice->service()->deletePdf();
$this->invoice = $this->invoice->fresh();
event(new InvoiceWasPaid($this->invoice, $this->payment, $this->payment->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
}

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

@ -11,15 +11,17 @@
namespace App\Services\Credit;
use App\Factory\PaymentFactory;
use App\Jobs\Entity\CreateEntityPdf;
use App\Jobs\Util\UnlinkFile;
use App\Utils\Ninja;
use App\Models\Credit;
use App\Models\Payment;
use App\Models\PaymentType;
use App\Jobs\Util\UnlinkFile;
use App\Factory\PaymentFactory;
use App\Utils\Traits\MakesHash;
use App\Jobs\Entity\CreateEntityPdf;
use App\Repositories\CreditRepository;
use App\Repositories\PaymentRepository;
use App\Utils\Traits\MakesHash;
use Illuminate\Support\Facades\Storage;
class CreditService
{
@ -235,7 +237,24 @@ class CreditService
public function deletePdf()
{
$this->credit->invitations->each(function ($invitation) {
(new UnlinkFile(config('filesystems.default'), $this->credit->client->credit_filepath($invitation).$this->credit->numberFormatter().'.pdf'))->handle();
// (new UnlinkFile(config('filesystems.default'), $this->credit->client->credit_filepath($invitation).$this->credit->numberFormatter().'.pdf'))->handle();
//30-06-2023
try {
// if (Storage::disk(config('filesystems.default'))->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
Storage::disk(config('filesystems.default'))->delete($this->credit->client->credit_filepath($invitation).$this->credit->numberFormatter().'.pdf');
// }
// if (Ninja::isHosted() && Storage::disk('public')->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
if (Ninja::isHosted()) {
Storage::disk('public')->delete($this->credit->client->credit_filepath($invitation).$this->credit->numberFormatter().'.pdf');
}
} catch (\Exception $e) {
nlog($e->getMessage());
}
});
return $this;

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

@ -42,7 +42,7 @@ class MarkSent
->setStatus(Credit::STATUS_SENT)
->applyNumber()
->adjustBalance($this->credit->amount)
->touchPdf()
->deletePdf()
->save();
$this->client

4
app/Services/Email/Email.php
View File

@ -432,6 +432,7 @@ class Email implements ShouldQueue
$this->setGmailMailer();
return $this;
case 'office365':
case 'microsoft':
$this->mailer = 'office365';
$this->setOfficeMailer();
return $this;
@ -445,7 +446,8 @@ class Email implements ShouldQueue
return $this;
default:
break;
$this->mailer = config('mail.default');
return $this;
}
if (Ninja::isSelfHost()) {

3
app/Services/Email/EmailDefaults.php
View File

@ -307,9 +307,6 @@ class EmailDefaults
$xinvoice_path = $this->email->email_object->entity->service()->getEInvoice();
// $xinvoice_path = (new CreateEInvoice($this->email->email_object->entity, true, stream_get_meta_data($tempfile)['uri']))->handle();
// $this->email->email_object->attachments = array_merge($this->email->email_object->attachments, [['file' => base64_encode($pdf), 'name' => $this->email->email_object->entity->numberFormatter().'.pdf']]);
if(Storage::disk(config('filesystems.default'))->exists($xinvoice_path))
$this->email->email_object->attachments = array_merge($this->email->email_object->attachments, [['file' => base64_encode(Storage::get($xinvoice_path)), 'name' => explode(".", $this->email->email_object->entity->getFileName('xml'))[0]."-xinvoice.xml"]]);

2
app/Services/Invoice/ApplyPayment.php
View File

@ -92,7 +92,7 @@ class ApplyPayment extends AbstractService
}
});
$this->invoice->service()->applyNumber()->workFlow()->touchPdf()->save();
$this->invoice->service()->applyNumber()->workFlow()->deletePdf()->save();
return $this->invoice;
}

12
app/Services/Invoice/HandleCancellation.php
View File

@ -44,9 +44,7 @@ class HandleCancellation extends AbstractService
$this->invoice->balance = 0;
$this->invoice = $this->invoice->service()->setStatus(Invoice::STATUS_CANCELLED)->save();
//adjust client balance
$this->invoice->client->service()->updateBalance($adjustment)->save();
// $this->invoice->fresh();
$this->invoice->service()->workFlow()->save();
@ -54,16 +52,6 @@ class HandleCancellation extends AbstractService
event('eloquent.updated: App\Models\Invoice', $this->invoice);
$transaction = [
'invoice' => $this->invoice->transaction_event(),
'payment' => [],
'client' => $this->invoice->client->transaction_event(),
'credit' => [],
'metadata' => [],
];
// TransactionLog::dispatch(TransactionEvent::INVOICE_CANCELLED, $transaction, $this->invoice->company->db);
return $this->invoice;
}

20
app/Services/Invoice/InvoiceService.php
View File

@ -115,7 +115,6 @@ class InvoiceService
*/
public function applyPayment(Payment $payment, float $payment_amount)
{
// $this->deletePdf();
$this->invoice = $this->markSent()->save();
$this->invoice = (new ApplyPayment($this->invoice, $payment, $payment_amount))->run();
@ -339,7 +338,7 @@ class InvoiceService
return $item;
})->toArray();
$this->touchPdf();
$this->deletePdf();
return $this;
}
@ -348,13 +347,15 @@ class InvoiceService
{
$this->invoice->load('invitations');
//30-06-2023
$this->invoice->invitations->each(function ($invitation) {
try {
if (Storage::disk(config('filesystems.default'))->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
// if (Storage::disk(config('filesystems.default'))->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
Storage::disk(config('filesystems.default'))->delete($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf');
}
// }
if (Ninja::isHosted() && Storage::disk('public')->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
// if (Ninja::isHosted() && Storage::disk('public')->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
if (Ninja::isHosted()) {
Storage::disk('public')->delete($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf');
}
} catch (\Exception $e) {
@ -371,11 +372,12 @@ class InvoiceService
$this->invoice->invitations->each(function ($invitation) {
try {
if (Storage::disk(config('filesystems.default'))->exists($this->invoice->client->e_invoice_filepath($invitation).$this->invoice->getFileName("xml"))) {
// if (Storage::disk(config('filesystems.default'))->exists($this->invoice->client->e_invoice_filepath($invitation).$this->invoice->getFileName("xml"))) {
Storage::disk(config('filesystems.default'))->delete($this->invoice->client->e_invoice_filepath($invitation).$this->invoice->getFileName("xml"));
}
// }
if (Ninja::isHosted() && Storage::disk('public')->exists($this->invoice->client->e_invoice_filepath($invitation).$this->invoice->getFileName("xml"))) {
// if (Ninja::isHosted() && Storage::disk('public')->exists($this->invoice->client->e_invoice_filepath($invitation).$this->invoice->getFileName("xml"))) {
if (Ninja::isHosted()) {
Storage::disk('public')->delete($this->invoice->client->e_invoice_filepath($invitation).$this->invoice->getFileName("xml"));
}
} catch (\Exception $e) {
@ -403,7 +405,7 @@ class InvoiceService
})->toArray();
$this->invoice = $this->invoice->calc()->getInvoice();
$this->touchPdf();
$this->deletePdf();
/* 24-03-2022 */
$new_balance = $this->invoice->balance;

2
app/Services/Invoice/MarkPaid.php
View File

@ -102,7 +102,7 @@ class MarkPaid extends AbstractService
$this->invoice
->service()
->applyNumber()
->touchPdf()
->deletePdf()
->save();
$payment->ledger()

2
app/Services/Invoice/TriggeredActions.php
View File

@ -54,7 +54,7 @@ class TriggeredActions extends AbstractService
}
if ($this->request->has('send_email') && $this->request->input('send_email') == 'true') {
$this->invoice->service()->markSent()->touchPdf()->save();
$this->invoice->service()->markSent()->save();
$this->sendEmail();
$this->updated = false;
}

2
app/Services/Payment/UpdateInvoicePayment.php
View File

@ -79,7 +79,7 @@ class UpdateInvoicePayment
$invoice = $invoice->service()
->clearPartial()
->updateStatus()
->touchPdf()
->deletePdf()
->workFlow()
->save();

2
app/Services/Pdf/PdfBuilder.php
View File

@ -653,7 +653,7 @@ class PdfBuilder
$data[$key][$table_type.".{$_table_type}4"] = strlen($item->custom_value4) >= 1 ? $helpers->formatCustomFieldValue($this->service->company->custom_fields, "{$_table_type}4", $item->custom_value4, $this->service->config->currency_entity) : '';
if ($item->quantity > 0 || $item->cost > 0) {
$data[$key][$table_type.'.quantity'] = $this->service->config->formatMoney($item->quantity);
$data[$key][$table_type.'.quantity'] = $item->quantity;
$data[$key][$table_type.'.unit_cost'] = $this->service->config->formatMoney($item->cost);

14
app/Services/Pdf/PdfMock.php
View File

@ -232,6 +232,9 @@ class PdfMock
'$secondary_font_url' => 'https://fonts.googleapis.com/css2?family=Roboto&display=swap',
'$contact.signature' => '',
'$company_logo_size' => $this->settings->company_logo_size ?: '65%',
'$product.tax_rate1' => ctrans('texts.tax'),
'$product.tax_rate2' => ctrans('texts.tax'),
'$product.tax_rate3' => ctrans('texts.tax'),
'$product.tax_name1' => '',
'$product.tax_name2' => '',
'$product.tax_name3' => '',
@ -688,8 +691,11 @@ class PdfMock
'$net_subtotal_label' => ctrans('texts.net_subtotal'),
'$credit.total_label' => ctrans('texts.total'),
'$quote.amount_label' => ctrans('texts.amount'),
'$description_label' => ctrans('texts.description'),
'$product.tax_rate1_label' => ctrans('texts.tax'),
'$product.tax_rate2_label' => ctrans('texts.tax'),
'$product.tax_rate3_label' => ctrans('texts.tax'),
'$product.tax_label' => ctrans('texts.tax'),
'$description_label' => ctrans('texts.description'),
'$your_entity_label' => ctrans("texts.your_{$this->entity_string}"),
'$view_button_label' => ctrans('texts.view'),
'$status_logo_label' => ctrans('texts.logo'),
@ -782,9 +788,9 @@ class PdfMock
'$amount_label' => ctrans('texts.amount'),
'$notes_label' => ctrans('texts.notes'),
'$terms_label' => ctrans('texts.terms'),
'tax_rate1_label' => ctrans('texts.tax_rate1'),
'tax_rate2_label' => ctrans('texts.tax_rate2'),
'tax_rate3_label' => ctrans('texts.tax_rate3'),
'$tax_rate1_label' => ctrans('texts.tax_rate1'),
'$tax_rate2_label' => ctrans('texts.tax_rate2'),
'$tax_rate3_label' => ctrans('texts.tax_rate3'),
'$phone_label' => ctrans('texts.phone'),
'$email_label' => ctrans('texts.email'),
'$taxes_label' => ctrans('texts.taxes'),

5
app/Services/PurchaseOrder/GetPurchaseOrderPdf.php
View File

@ -19,11 +19,8 @@ use Illuminate\Support\Facades\Storage;
class GetPurchaseOrderPdf extends AbstractService
{
public function __construct(PurchaseOrder $purchase_order, VendorContact $contact = null)
public function __construct(public PurchaseOrder $purchase_order, public ?VendorContact $contact = null)
{
$this->purchase_order = $purchase_order;
$this->contact = $contact;
}
public function run()

4
app/Services/PurchaseOrder/TriggeredActions.php
View File

@ -43,10 +43,6 @@ class TriggeredActions extends AbstractService
$this->purchase_order = $this->purchase_order->service()->markSent()->touchPdf()->save();
}
// if ($this->request->has('cancel') && $this->request->input('cancel') == 'true') {
// $this->purchase_order = $this->purchase_order->service()->handleCancellation()->save();
// }
if ($this->request->has('save_default_footer') && $this->request->input('save_default_footer') == 'true') {
$company = $this->purchase_order->company;
$settings = $company->settings;

2
app/Services/Quote/MarkSent.php
View File

@ -47,7 +47,7 @@ class MarkSent
->service()
->setStatus(Quote::STATUS_SENT)
->applyNumber()
->touchPdf()
->deletePdf()
->save();
event(new QuoteWasMarkedSent($this->quote, $this->quote->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));

34
app/Services/Quote/QuoteService.php
View File

@ -11,14 +11,15 @@
namespace App\Services\Quote;
use App\Events\Quote\QuoteWasApproved;
use App\Jobs\Entity\CreateEntityPdf;
use App\Jobs\Util\UnlinkFile;
use App\Models\Invoice;
use App\Models\Quote;
use App\Repositories\QuoteRepository;
use App\Utils\Ninja;
use App\Models\Quote;
use App\Jobs\Util\UnlinkFile;
use App\Utils\Traits\MakesHash;
use App\Exceptions\QuoteConversion;
use App\Jobs\Entity\CreateEntityPdf;
use App\Repositories\QuoteRepository;
use App\Events\Quote\QuoteWasApproved;
use Illuminate\Support\Facades\Storage;
class QuoteService
{
@ -43,7 +44,7 @@ class QuoteService
public function convert() :self
{
if ($this->quote->invoice_id) {
return $this;
throw new QuoteConversion();
}
$convert_quote = (new ConvertQuote($this->quote->client))->run($this->quote);
@ -115,7 +116,7 @@ class QuoteService
$this->invoice
->service()
->markSent()
->touchPdf()
->deletePdf()
->save();
}
@ -224,7 +225,22 @@ class QuoteService
public function deletePdf()
{
$this->quote->invitations->each(function ($invitation) {
(new UnlinkFile(config('filesystems.default'), $this->quote->client->quote_filepath($invitation).$this->quote->numberFormatter().'.pdf'))->handle();
// (new UnlinkFile(config('filesystems.default'), $this->quote->client->quote_filepath($invitation).$this->quote->numberFormatter().'.pdf'))->handle();
//30-06-2023
try {
// if (Storage::disk(config('filesystems.default'))->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
Storage::disk(config('filesystems.default'))->delete($this->quote->client->quote_filepath($invitation).$this->quote->numberFormatter().'.pdf');
// }
// if (Ninja::isHosted() && Storage::disk('public')->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
if (Ninja::isHosted()) {
Storage::disk('public')->delete($this->quote->client->quote_filepath($invitation).$this->quote->numberFormatter().'.pdf');
}
} catch (\Exception $e) {
nlog($e->getMessage());
}
});
return $this;

19
app/Services/Recurring/RecurringService.php
View File

@ -11,11 +11,13 @@
namespace App\Services\Recurring;
use App\Utils\Ninja;
use App\Jobs\Util\UnlinkFile;
use App\Models\RecurringQuote;
use Illuminate\Support\Carbon;
use App\Models\RecurringExpense;
use App\Models\RecurringInvoice;
use Illuminate\Support\Facades\Storage;
use App\Jobs\RecurringInvoice\SendRecurring;
class RecurringService
@ -88,7 +90,22 @@ class RecurringService
public function deletePdf()
{
$this->recurring_entity->invitations->each(function ($invitation) {
(new UnlinkFile(config('filesystems.default'), $this->recurring_entity->client->recurring_invoice_filepath($invitation) . $this->recurring_entity->numberFormatter().'.pdf'))->handle();
// (new UnlinkFile(config('filesystems.default'), $this->recurring_entity->client->recurring_invoice_filepath($invitation) . $this->recurring_entity->numberFormatter().'.pdf'))->handle();
//30-06-2023
try {
Storage::disk(config('filesystems.default'))->delete($this->recurring_entity->client->recurring_invoice_filepath($invitation) . $this->recurring_entity->numberFormatter().'.pdf');
// if (Storage::disk(config('filesystems.default'))->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
// }
// if (Ninja::isHosted() && Storage::disk('public')->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
Storage::disk('public')->delete($this->recurring_entity->client->recurring_invoice_filepath($invitation) . $this->recurring_entity->numberFormatter().'.pdf');
if (Ninja::isHosted()) {
}
} catch (\Exception $e) {
nlog($e->getMessage());
}
});

3
app/Services/Scheduler/EmailReport.php
View File

@ -58,7 +58,8 @@ class EmailReport
public function run()
{
$start_end_dates = $this->calculateStartAndEndDates();
$start_end_dates = $this->calculateStartAndEndDates($this->scheduler->parameters);
$data = [];
$data = [

6
app/Services/Subscription/SubscriptionService.php
View File

@ -188,7 +188,7 @@ class SubscriptionService
//update the invoice and attach to the recurring invoice!!!!!
$invoice->recurring_id = $recurring_invoice->id;
$invoice->is_proforma = false;
$invoice->service()->touchPdf();
$invoice->service()->deletePdf();
$invoice->save();
$contact = $invoice->client->contacts()->whereNotNull('email')->first();
@ -821,13 +821,15 @@ class SubscriptionService
$invoice->is_proforma = false;
$invoice->save();
// 29-06-2023 handle webhooks for payment intent - user may not be present.
$context = [
'context' => 'change_plan',
'recurring_invoice' => $recurring_invoice->hashed_id,
'invoice' => $this->encodePrimaryKey($payment_hash->fee_invoice_id),
'client' => $recurring_invoice->client->hashed_id,
'subscription' => $this->subscription->hashed_id,
'contact' => auth()->guard('contact')->user()->hashed_id,
'contact' => auth()->guard('contact')->user()?->hashed_id ?? $recurring_invoice->client->contacts()->first()->hashed_id,
'account_key' => $recurring_invoice->client->custom_value2,
];

2
app/Services/Tax/Providers/ZipTax.php
View File

@ -69,7 +69,7 @@ class ZipTax implements TaxProviderInterface
private function parseResponse($response)
{
if(isset($response['rCode']) && $response['rCode'] == 100)
if(isset($response['rCode']) && $response['rCode'] == 100 && isset($response['results']['0']))
return $response['results']['0'];
if(isset($response['rCode']) && class_exists(\Modules\Admin\Events\TaxProviderException::class))

1
app/Transformers/CompanyTransformer.php
View File

@ -203,6 +203,7 @@ class CompanyTransformer extends EntityTransformer
'has_e_invoice_certificate_passphrase' => $company->e_invoice_certificate_passphrase ? true : false,
'invoice_task_project_header' => (bool) $company->invoice_task_project_header,
'invoice_task_item_description' => (bool) $company->invoice_task_item_description,
'origin_tax_data' => $company->origin_tax_data ?: new \stdClass,
];
}

33
app/Transformers/ExpenseTransformer.php
View File

@ -11,12 +11,15 @@
namespace App\Transformers;
use App\Models\Document;
use App\Models\Expense;
use App\Models\Vendor;
use App\Models\Expense;
use App\Models\Invoice;
use App\Models\ExpenseCategory;
use App\Transformers\ExpenseCategoryTransformer;
use App\Models\Document;
use App\Utils\Traits\MakesHash;
use Illuminate\Database\Eloquent\SoftDeletes;
use League\Fractal\Resource\Item;
use Illuminate\Database\Eloquent\SoftDeletes;
/**
* class ExpenseTransformer.
@ -36,6 +39,8 @@ class ExpenseTransformer extends EntityTransformer
protected $availableIncludes = [
'client',
'vendor',
'category',
'invoice',
];
public function includeDocuments(Expense $expense)
@ -56,6 +61,28 @@ class ExpenseTransformer extends EntityTransformer
return $this->includeItem($expense->client, $transformer, Client::class);
}
public function includeInvoice(Expense $expense): ?Item
{
$transformer = new InvoiceTransformer($this->serializer);
if (!$expense->invoice) {
return null;
}
return $this->includeItem($expense->invoice, $transformer, Invoice::class);
}
public function includeCategory(Expense $expense): ?Item
{
$transformer = new ExpenseCategoryTransformer($this->serializer);
if (!$expense->category) {
return null;
}
return $this->includeItem($expense->category, $transformer, ExpenseCategory::class);
}
public function includeVendor(Expense $expense): ?Item
{
$transformer = new VendorTransformer($this->serializer);

6
app/Utils/Traits/MakesDates.php
View File

@ -119,9 +119,9 @@ trait MakesDates
*
* @return array [$start_date, $end_date];
*/
public function calculateStartAndEndDates(): array
public function calculateStartAndEndDates(array $data): array
{
return match ($this->scheduler->parameters['date_range']) {
return match ($data['date_range']) {
EmailStatement::LAST7 => [now()->startOfDay()->subDays(7)->format('Y-m-d'), now()->startOfDay()->format('Y-m-d')],
EmailStatement::LAST30 => [now()->startOfDay()->subDays(30)->format('Y-m-d'), now()->startOfDay()->format('Y-m-d')],
EmailStatement::LAST365 => [now()->startOfDay()->subDays(365)->format('Y-m-d'), now()->startOfDay()->format('Y-m-d')],
@ -131,7 +131,7 @@ trait MakesDates
EmailStatement::LAST_QUARTER => [now()->startOfDay()->subQuarterNoOverflow()->firstOfQuarter()->format('Y-m-d'), now()->startOfDay()->subQuarterNoOverflow()->lastOfQuarter()->format('Y-m-d')],
EmailStatement::THIS_YEAR => [now()->startOfDay()->firstOfYear()->format('Y-m-d'), now()->startOfDay()->lastOfYear()->format('Y-m-d')],
EmailStatement::LAST_YEAR => [now()->startOfDay()->subYearNoOverflow()->firstOfYear()->format('Y-m-d'), now()->startOfDay()->subYearNoOverflow()->lastOfYear()->format('Y-m-d')],
EmailStatement::CUSTOM_RANGE => [$this->scheduler->parameters['start_date'], $this->scheduler->parameters['end_date']],
EmailStatement::CUSTOM_RANGE => [$data['start_date'], $data['end_date']],
default => [now()->startOfDay()->firstOfMonth()->format('Y-m-d'), now()->startOfDay()->lastOfMonth()->format('Y-m-d')],
};
}

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' => '5.6.4',
'app_tag' => '5.6.4',
'app_version' => '5.6.5',
'app_tag' => '5.6.5',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),

9
database/migrations/2023_04_27_045639_add_kmher_language.php
View File

@ -25,9 +25,12 @@ return new class extends Migration
Language::create(['id' => 38, 'name' => 'Khmer', 'locale' => 'km_KH']);
}
Schema::table('companies', function (Blueprint $table) {
$table->dropColumn('enable_e_invoice');
});
if (Schema::hasColumn('companies', 'enable_e_invoice'))
{
Schema::table('companies', function (Blueprint $table) {
$table->dropColumn('enable_e_invoice');
});
}
Company::query()->cursor()->each(function ($company){
$company->tax_data = new TaxModel();

2
lang/en/texts.php
View File

@ -3863,7 +3863,7 @@ $LANG = array(
'notification_credit_viewed' => 'The following client :client viewed Credit :credit for :amount.',
'reset_password_text' => 'Enter your email to reset your password.',
'password_reset' => 'Password reset',
'account_login_text' => 'Welcome back! Glad to see you.',
'account_login_text' => 'Welcome! Glad to see you.',
'request_cancellation' => 'Request cancellation',
'delete_payment_method' => 'Delete Payment Method',
'about_to_delete_payment_method' => 'You are about to delete the payment method.',

2
phpstan.neon
View File

@ -6,8 +6,6 @@ parameters:
ignoreErrors:
- '#Call to an undefined method .*badMethod\(\)#'
- '#Call to an undefined method Illuminate\Database\Eloquent\Builder::exclude#'
parallel:
maximumNumberOfProcesses: 8
level: 4
paths:
- 'app/'

2
resources/views/pdf-designs/calm.html
View File

@ -132,7 +132,7 @@
}
#shipping-details {
visibility: $show_shipping_address_visibility;
opacity: $show_shipping_address_visibility;
flex-direction: column;
line-height: var(--line-height);
}

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

@ -1,2 +1,3 @@
<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>
<!-- <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> -->

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

@ -1,2 +1,2 @@
<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>
<!-- <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> -->

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

@ -0,0 +1,2 @@
<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> -->

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

@ -1,2 +1,3 @@
<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>
<!-- <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> -->

1
resources/views/portal/ninja2020/statement/index.blade.php
View File

@ -45,6 +45,7 @@
</div>
@include('portal.ninja2020.components.pdf-viewer', ['url' => route('client.statement.raw')])
@endsection
@push('footer')

2
routes/client.php
View File

@ -40,7 +40,7 @@ Route::get('tmp_pdf/{hash}', [App\Http\Controllers\ClientPortal\TempRouteControl
Route::get('client/key_login/{contact_key}', [App\Http\Controllers\ClientPortal\ContactHashLoginController::class, 'login'])->name('client.contact_login')->middleware(['domain_db','contact_key_login']);
Route::get('client/magic_link/{magic_link}', [App\Http\Controllers\ClientPortal\ContactHashLoginController::class, 'magicLink'])->name('client.contact_magic_link')->middleware(['domain_db','contact_key_login']);
Route::get('documents/{document_hash}', [App\Http\Controllers\ClientPortal\DocumentController::class, 'publicDownload'])->name('documents.public_download')->middleware(['domain_db','token_auth']);
Route::get('documents/{document_hash}', [App\Http\Controllers\ClientPortal\DocumentController::class, 'publicDownload'])->name('documents.public_download')->middleware(['api_db','token_auth']);
Route::get('error', [App\Http\Controllers\ClientPortal\ContactHashLoginController::class, 'errorPage'])->name('client.error');
Route::get('client/payment/{contact_key}/{payment_id}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'paymentRouter'])->middleware(['domain_db','contact_key_login']);
Route::get('client/ninja/{contact_key}/{company_key}', [App\Http\Controllers\ClientPortal\NinjaPlanController::class, 'index'])->name('client.ninja_contact_login')->middleware(['domain_db']);

2
tests/Feature/ExpenseApiTest.php
View File

@ -31,6 +31,8 @@ class ExpenseApiTest extends TestCase
use DatabaseTransactions;
use MockAccountData;
public $faker;
protected function setUp() :void
{
parent::setUp();

34
tests/Feature/QuoteTest.php
View File

@ -11,16 +11,17 @@
namespace Tests\Feature;
use App\Models\ClientContact;
use App\Models\Project;
use App\Models\Quote;
use App\Utils\Traits\MakesHash;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Routing\Middleware\ThrottleRequests;
use Illuminate\Support\Facades\Session;
use Tests\MockAccountData;
use Tests\TestCase;
use App\Models\Quote;
use App\Models\Project;
use Tests\MockAccountData;
use App\Models\ClientContact;
use App\Utils\Traits\MakesHash;
use App\Exceptions\QuoteConversion;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Session;
use Illuminate\Routing\Middleware\ThrottleRequests;
use Illuminate\Foundation\Testing\DatabaseTransactions;
/**
* @test
@ -32,6 +33,8 @@ class QuoteTest extends TestCase
use DatabaseTransactions;
use MockAccountData;
public $faker;
protected function setUp() :void
{
parent::setUp();
@ -49,6 +52,19 @@ class QuoteTest extends TestCase
);
}
public function testQuoteConversion()
{
$invoice = $this->quote->service()->convertToInvoice();
$this->assertInstanceOf('\App\Models\Invoice', $invoice);
$this->expectException(QuoteConversion::class);
$invoice = $this->quote->service()->convertToInvoice();
}
public function testQuoteDownloadPDF()
{
$i = $this->quote->invitations->first();