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

Merge pull request #9298 from turbo124/v5-develop

Browse Source 
Set default payment notifications for new companies
This commit is contained in:
David Bomba 2024-02-16 08:47:42 +11:00 committed by GitHub
commit 49dfee7afe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
139 changed files with 919 additions and 909 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
.github/workflows/react_release.yml vendored Normal file
View File

@ -0,0 +1,76 @@
on:
release:
types: [released]
name: React Release
jobs:
build:
name: Upload Release Asset
runs-on: ubuntu-latest
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.1
extensions: mysql, mysqlnd, sqlite3, bcmath, gd, curl, zip, openssl, mbstring, xml
- name: Checkout code
uses: actions/checkout@v1
with:
ref: v5-develop
- name: Copy .env file
run: |
cp .env.example .env
- name: Install composer dependencies
run: |
composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
composer install --no-dev
- name: Prepare Laravel Application
run: |
cp .env.example .env
php artisan key:generate --force
php artisan optimize
php artisan storage:link --force
sudo php artisan cache:clear
sudo find ./vendor/bin/ -type f -exec chmod +x {} \;
sudo find ./ -type d -exec chmod 755 {} \;
sudo rm -f public/main.*
sudo rm -f public/flutter*
- name: Prepare React FrontEnd
run: |
git clone https://${{secrets.commit_secret}}@github.com/invoiceninja/ui.git
cd ui
git checkout develop
npm i
npm run build
cp -r dist/* ../public/
- name: Prepare JS/CSS assets
run: |
npm i
npm run production
- name: Cleanup Builds
run: |
sudo rm -rf bootstrap/cache/*
sudo rm -rf node_modules
sudo rm -rf .git
sudo rm .env
- name: Build project
run: |
shopt -s dotglob
tar --exclude='public/storage' --exclude='.htaccess' --exclude='invoiceninja.zip' -zcvf /home/runner/work/invoiceninja/react-invoiceninja.tar *
- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: |
/home/runner/work/invoiceninja/react-invoiceninja.tar

2
VERSION.txt
View File

@ -1 +1 @@
5.8.24
5.8.25

5
app/Console/Commands/EncryptNinja.php
View File

@ -52,8 +52,9 @@ class EncryptNinja extends Command
*/
public function handle()
{
if($this->option('encrypt'))
if($this->option('encrypt')) {
return $this->encryptFiles();
}
if($this->option('decrypt')) {
return $this->decryptFiles();
@ -67,7 +68,7 @@ class EncryptNinja extends Command
$contents = Storage::disk('base')->get($file);
$encrypted = encrypt($contents);
Storage::disk('base')->put($file.".enc", $encrypted);
Storage::disk('base')->delete($file);
// Storage::disk('base')->delete($file);
}
}

2
app/DataMapper/CompanySettings.php
View File

@ -878,7 +878,7 @@ class CompanySettings extends BaseSettings
{
$notification = new stdClass();
$notification->email = [];
$notification->email = ['invoice_sent_all'];
$notification->email = ['invoice_sent_all','payment_success_all','payment_manual_all'];
return $notification;
}

2
app/DataProviders/Domains.php
View File

@ -59391,7 +59391,7 @@ class Domains
'wireconnected.com'
];
public static function getDomains()
public static function getDomains(): array
{
return self::$verify_domains;
}

31
app/Export/CSV/BaseExport.php
View File

@ -451,13 +451,15 @@ class BaseExport
{
if (isset($this->input['client_id']) && $this->input['client_id'] != 'all') {
if(!is_int($this->input['client_id']))
if(!is_int($this->input['client_id'])) {
$this->input['client_id'] = $this->decodePrimaryKey($this->input['client_id']);
}
$client = Client::withTrashed()->find($this->input['client_id']);
if(!$client)
if(!$client) {
return $query;
}
$this->client_description = $client->present()->name;
return $query->where('client_id', $this->input['client_id']);
@ -845,16 +847,18 @@ class BaseExport
protected function addClientFilter($query, $clients): Builder
{
if(is_string($clients))
if(is_string($clients)) {
$clients = explode(',', $clients);
}
$transformed_clients = $this->transformKeys($clients);
nlog($clients);
nlog($transformed_clients);
if(count($transformed_clients) > 0)
if(count($transformed_clients) > 0) {
$query->whereIn('client_id', $transformed_clients);
}
return $query;
}
@ -868,8 +872,9 @@ class BaseExport
$transformed_vendors = $this->transformKeys($vendors);
if(count($transformed_vendors) > 0)
if(count($transformed_vendors) > 0) {
$query->whereIn('vendor_id', $transformed_vendors);
}
return $query;
}
@ -883,8 +888,9 @@ class BaseExport
$transformed_projects = $this->transformKeys($projects);
if(count($transformed_projects) > 0)
if(count($transformed_projects) > 0) {
$query->whereIn('project_id', $transformed_projects);
}
return $query;
}
@ -899,8 +905,9 @@ class BaseExport
$transformed_expense_categories = $this->transformKeys($expense_categories);
if(count($transformed_expense_categories) > 0)
if(count($transformed_expense_categories) > 0) {
$query->whereIn('category_id', $transformed_expense_categories);
}
return $query;
}
@ -1299,9 +1306,9 @@ class BaseExport
public function queueDocuments(Builder $query)
{
nlog("queue docs pls");
if($query->getModel() instanceof Document)
if($query->getModel() instanceof Document) {
$documents = $query->pluck('id')->toArray();
else{
} else {
$documents = $query->cursor()
->map(function ($entity) {
return $entity->documents()->pluck('id')->toArray();
@ -1315,11 +1322,13 @@ class BaseExport
$user = $this->company->owner();
if(auth()->user() && auth()->user()->account_id == $this->company->account_id)
if(auth()->user() && auth()->user()->account_id == $this->company->account_id) {
$user = auth()->user();
}
if($this->input['user_id'] ?? false)
if($this->input['user_id'] ?? false) {
$user = User::where('id', $this->input['user_id'])->where('account_id', $this->company->account_id)->first();
}
ZipDocuments::dispatch($documents, $this->company, $user);
}

7
app/Export/CSV/ExpenseExport.php
View File

@ -23,7 +23,6 @@ use League\Csv\Writer;
class ExpenseExport extends BaseExport
{
private $expense_transformer;
private Decorator $decorator;
@ -206,14 +205,12 @@ class ExpenseExport extends BaseExport
if($expense->calculate_tax_by_amount) {
$total_tax_amount = round($expense->tax_amount1 + $expense->tax_amount2 + $expense->tax_amount3, $precision);
}
else {
} else {
if($expense->uses_inclusive_taxes) {
$total_tax_amount = ($this->calcInclusiveLineTax($expense->tax_rate1 ?? 0, $expense->amount, $precision)) + ($this->calcInclusiveLineTax($expense->tax_rate2 ?? 0, $expense->amount, $precision)) + ($this->calcInclusiveLineTax($expense->tax_rate3 ?? 0, $expense->amount, $precision));
$entity['expense.net_amount'] = round(($expense->amount - round($total_tax_amount, $precision)), $precision);
}
else{
} else {
$total_tax_amount = ($expense->amount * (($expense->tax_rate1 ?? 0) / 100)) + ($expense->amount * (($expense->tax_rate2 ?? 0) / 100)) + ($expense->amount * (($expense->tax_rate3 ?? 0) / 100));
$entity['expense.net_amount'] = round(($expense->amount + round($total_tax_amount, $precision)), $precision);
}

3
app/Filters/ClientFilters.php
View File

@ -165,8 +165,7 @@ class ClientFilters extends QueryFilters
$dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
if($sort_col[0] == 'number')
{
if($sort_col[0] == 'number') {
return $this->builder->orderByRaw('ABS(number) ' . $dir);
}

3
app/Filters/InvoiceFilters.php
View File

@ -323,8 +323,7 @@ class InvoiceFilters extends QueryFilters
}
if($sort_col[0] == 'number')
{
if($sort_col[0] == 'number') {
return $this->builder->orderByRaw('ABS(number) ' . $dir);
}

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

@ -70,8 +70,9 @@ class TransactionTransformer implements BankRevenueInterface
{
$data = [];
if (!array_key_exists('transactions', $transactionResponse) || !array_key_exists('booked', $transactionResponse["transactions"]))
if (!array_key_exists('transactions', $transactionResponse) || !array_key_exists('booked', $transactionResponse["transactions"])) {
throw new \Exception('invalid dataset');
}
foreach ($transactionResponse["transactions"]["booked"] as $transaction) {
$data[] = $this->transformTransaction($transaction);
@ -83,11 +84,11 @@ class TransactionTransformer implements BankRevenueInterface
{
// depending on institution, the result can be different, so we load the first available unique id
$transactionId = '';
if (array_key_exists('transactionId', $transaction))
if (array_key_exists('transactionId', $transaction)) {
$transactionId = $transaction["transactionId"];
else if (array_key_exists('internalTransactionId', $transaction))
} elseif (array_key_exists('internalTransactionId', $transaction)) {
$transactionId = $transaction["internalTransactionId"];
else {
} else {
nlog(`Invalid Input for nordigen transaction transformer: ` . $transaction);
throw new \Exception('invalid dataset: missing transactionId - Please report this error to the developer');
}
@ -96,22 +97,24 @@ class TransactionTransformer implements BankRevenueInterface
// description could be in varios places
$description = '';
if (array_key_exists('remittanceInformationStructured', $transaction))
if (array_key_exists('remittanceInformationStructured', $transaction)) {
$description = $transaction["remittanceInformationStructured"];
else if (array_key_exists('remittanceInformationStructuredArray', $transaction))
} elseif (array_key_exists('remittanceInformationStructuredArray', $transaction)) {
$description = implode('\n', $transaction["remittanceInformationStructuredArray"]);
else if (array_key_exists('remittanceInformationUnstructured', $transaction))
} elseif (array_key_exists('remittanceInformationUnstructured', $transaction)) {
$description = $transaction["remittanceInformationUnstructured"];
else if (array_key_exists('remittanceInformationUnstructuredArray', $transaction))
} elseif (array_key_exists('remittanceInformationUnstructuredArray', $transaction)) {
$description = implode('\n', $transaction["remittanceInformationUnstructuredArray"]);
else
} else {
Log::warning("Missing description for the following transaction: " . json_encode($transaction));
}
// enrich description with currencyExchange informations
if (array_key_exists('currencyExchange', $transaction))
if (isset($transaction['currencyExchange'])) {
foreach ($transaction["currencyExchange"] as $exchangeRate) {
$targetAmount = round($amount * (float) $exchangeRate["exchangeRate"], 2);
$description .= '\nexchangeRate: ' . $amount . " " . $exchangeRate["sourceCurrency"] . " = " . $targetAmount . " " . $exchangeRate["targetCurrency"] . " (" . $exchangeRate["quotationDate"] . ")";
$targetAmount = round($amount * (float) ($exchangeRate["exchangeRate"] ?? 1) , 2);
$description .= '\nexchangeRate: ' . $amount . " " . ($exchangeRate["sourceCurrency"] ?? '?') . " = " . $targetAmount . " " . ($exchangeRate["targetCurrency"] ?? '?') . " (" . ($exchangeRate["quotationDate"] ?? '?') . ")";
}
}
// participant data
@ -153,8 +156,9 @@ class TransactionTransformer implements BankRevenueInterface
return $item->code == $code;
})->first();
if ($currency)
if ($currency) {
return $currency->id;
}
return 1;

3
app/Http/Controllers/BankTransactionController.php
View File

@ -112,8 +112,9 @@ class BankTransactionController extends BaseController
$this->bank_transaction_repo->convert_matched($bank_transactions);
} else {
$bank_transactions->each(function ($bank_transaction, $key) use ($action, $user) {
if($user->can('edit', $bank_transaction))
if($user->can('edit', $bank_transaction)) {
$this->bank_transaction_repo->{$action}($bank_transaction);
}
});
}

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

@ -74,8 +74,9 @@ class DocumentController extends Controller
$hash = Cache::pull($hash);
if(!$hash)
if(!$hash) {
abort(404);
}
MultiDB::setDb($hash['db']);

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

@ -58,4 +58,3 @@ class EmailPreferencesController extends Controller
return back()->with('message', ctrans('texts.updated_settings'));
}
}

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

@ -224,8 +224,9 @@ class InvoiceController extends Controller
$settings = auth()->guard('contact')->user()->client->getMergedSettings();
$variables = false;
if(($invitation = $invoices->first()->invitations()->first() ?? false) && $settings->show_accept_invoice_terms)
if(($invitation = $invoices->first()->invitations()->first() ?? false) && $settings->show_accept_invoice_terms) {
$variables = (new HtmlEngine($invitation))->generateLabelsAndValues();
}
$data = [
'settings' => $settings,

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

@ -12,24 +12,25 @@
namespace App\Http\Controllers\ClientPortal;
use App\Factory\PaymentFactory;
use App\Http\Controllers\Controller;
use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
use App\Models\CompanyGateway;
use App\Models\GatewayType;
use App\Models\Invoice;
use App\Models\Payment;
use App\Utils\HtmlEngine;
use Illuminate\View\View;
use App\Models\GatewayType;
use App\Models\PaymentHash;
use App\Models\PaymentType;
use Illuminate\Http\Request;
use App\Models\CompanyGateway;
use App\Factory\PaymentFactory;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\MakesDates;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use Illuminate\Contracts\View\Factory;
use App\PaymentDrivers\Stripe\BankTransfer;
use App\Services\ClientPortal\InstantPayment;
use App\Services\Subscription\SubscriptionService;
use App\Utils\Traits\MakesDates;
use App\Utils\Traits\MakesHash;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\View\View;
use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
/**
* Class PaymentController.
@ -125,10 +126,16 @@ class PaymentController extends Controller
// 09-07-2022 catch duplicate responses for invoices that already paid here.
if ($invoice && $invoice->status_id == Invoice::STATUS_PAID) {
$invitation = $invoice->invitations->first();
$variables = ($invitation && auth()->guard('contact')->user()->client->getSetting('show_accept_invoice_terms')) ? (new HtmlEngine($invitation))->generateLabelsAndValues() : false;
$data = [
'invoice' => $invoice,
'key' => false,
'invitation' => $invoice->invitations->first()
'invitation' => $invitation,
'variables' => $variables,
];
if ($request->query('mode') === 'fullscreen') {

3
app/Http/Controllers/HostedMigrationController.php
View File

@ -29,8 +29,9 @@ class HostedMigrationController extends Controller
MultiDB::findAndSetDbByCompanyKey($request->company_key);
$c = Company::where('company_key', $request->company_key)->first();
if(!$c || $c->is_disabled)
if(!$c || $c->is_disabled) {
return response()->json(['message' => 'ok'], 200);
}
// if(\App\Models\Invoice::query()->where('company_id', $c->id)->where('created_at', '>', now()->subMonths(2))->first())
// return response()->json(['message' => 'New data exists, are you sure? Please log in here https://app.invoicing.co and delete the company if you really need to migrate again.'], 400);

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

@ -22,18 +22,22 @@ class MailgunWebhookController extends BaseController
{
private $invitation;
public function __construct() {}
public function __construct()
{
}
public function webhook(Request $request)
{
$input = $request->all();
if (\abs(\time() - $request['signature']['timestamp']) > 15)
if (\abs(\time() - $request['signature']['timestamp']) > 15) {
return response()->json(['message' => 'Success'], 200);
}
if(\hash_equals(\hash_hmac('sha256', $input['signature']['timestamp'] . $input['signature']['token'], config('services.mailgun.webhook_signing_key')), $input['signature']['signature']))
if(\hash_equals(\hash_hmac('sha256', $input['signature']['timestamp'] . $input['signature']['token'], config('services.mailgun.webhook_signing_key')), $input['signature']['signature'])) {
ProcessMailgunWebhook::dispatch($request->all())->delay(10);
}
return response()->json(['message' => 'Success.'], 200);
}

2
app/Http/Middleware/TokenAuth.php
View File

@ -67,7 +67,7 @@ class TokenAuth
$truth->setUser($company_token->user);
$truth->setCompany($company_token->company);
$truth->setCompanyToken($company_token);
$truth->setPremiumHosted($company_token->account->isPremium());
/*
| This method binds the db to the jobs created using this
| session

12
app/Http/Requests/Request.php
View File

@ -198,17 +198,21 @@ class Request extends FormRequest
}
}
if(isset($input['public_notes']))
if(isset($input['public_notes'])) {
$input['public_notes'] = str_replace("</sc", "<-", $input['public_notes']);
}
if(isset($input['footer']))
if(isset($input['footer'])) {
$input['footer'] = str_replace("</sc", "<-", $input['footer']);
}
if(isset($input['terms']))
if(isset($input['terms'])) {
$input['terms'] = str_replace("</sc", "<-", $input['terms']);
}
if(isset($input['private_notes']))
if(isset($input['private_notes'])) {
$input['private_notes'] = str_replace("</sc", "<-", $input['private_notes']);
}
return $input;
}

3
app/Http/ValidationRules/PaymentAppliedValidAmount.php
View File

@ -90,8 +90,7 @@ class PaymentAppliedValidAmount implements Rule
if($inv->status_id == Invoice::STATUS_DRAFT && $inv->amount >= $invoice['amount']) {
}
elseif ($inv->balance < $invoice['amount']) {
} elseif ($inv->balance < $invoice['amount']) {
$this->message = 'Amount cannot be greater than invoice balance';
return false;

6
app/Import/Providers/Wave.php
View File

@ -117,10 +117,8 @@ class Wave extends BaseImport implements ImportInterface
$this->transformer = new InvoiceTransformer($this->company);
foreach($data as $key => $invoice)
{
if(!isset($invoice['Invoice Number']) || empty($invoice['Invoice Number']))
{
foreach($data as $key => $invoice) {
if(!isset($invoice['Invoice Number']) || empty($invoice['Invoice Number'])) {
unset($data[$key]);
}
}

65
app/Jobs/Cron/CompanyRecurringCron.php
View File

@ -1,65 +0,0 @@
<?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\Jobs\Cron;
use App\Libraries\MultiDB;
use App\Models\Company;
use App\Models\RecurringInvoice;
use Illuminate\Foundation\Bus\Dispatchable;
/*@not used*/
class CompanyRecurringCron
{
use Dispatchable;
public $tries = 1;
/**
* Create a new job instance.
*
* @return void
*/
public function __construct()
{
}
/**
* Execute the job.
*
* @return void
*/
public function handle(): void
{
//multiDB environment, need to
foreach (MultiDB::$dbs as $db) {
MultiDB::setDB($db);
Company::where('is_disabled', 0)
->whereHas('recurring_invoices', function ($query) {
$query->where('next_send_date', '<=', now()->toDateTimeString())
->whereNotNull('next_send_date')
->whereNull('deleted_at')
->where('is_deleted', false)
->where('status_id', RecurringInvoice::STATUS_ACTIVE)
->where('remaining_cycles', '!=', '0')
->whereHas('client', function ($query) {
$query->where('is_deleted', 0)
->where('deleted_at', null);
});
})
->cursor()->each(function ($company) {
SendCompanyRecurring::dispatch($company->id, $company->db);
});
}
}
}

4
app/Jobs/Cron/RecurringExpensesCron.php
View File

@ -51,7 +51,7 @@ class RecurringExpensesCron
Auth::logout();
if (! config('ninja.db.multi_db_enabled')) {
$recurring_expenses = RecurringExpense::where('next_send_date', '<=', now()->toDateTimeString())
$recurring_expenses = RecurringExpense::query()->where('next_send_date', '<=', now()->toDateTimeString())
->whereNotNull('next_send_date')
->whereNull('deleted_at')
->where('status_id', RecurringInvoice::STATUS_ACTIVE)
@ -76,7 +76,7 @@ class RecurringExpensesCron
foreach (MultiDB::$dbs as $db) {
MultiDB::setDB($db);
$recurring_expenses = RecurringExpense::where('next_send_date', '<=', now()->toDateTimeString())
$recurring_expenses = RecurringExpense::query()->where('next_send_date', '<=', now()->toDateTimeString())
->whereNotNull('next_send_date')
->whereNull('deleted_at')
->where('status_id', RecurringInvoice::STATUS_ACTIVE)

4
app/Jobs/Cron/RecurringInvoicesCron.php
View File

@ -48,7 +48,7 @@ class RecurringInvoicesCron
Auth::logout();
if (! config('ninja.db.multi_db_enabled')) {
$recurring_invoices = RecurringInvoice::where('status_id', RecurringInvoice::STATUS_ACTIVE)
$recurring_invoices = RecurringInvoice::query()->where('status_id', RecurringInvoice::STATUS_ACTIVE)
->where('is_deleted', false)
->where('remaining_cycles', '!=', '0')
->whereNotNull('next_send_date')
@ -87,7 +87,7 @@ class RecurringInvoicesCron
foreach (MultiDB::$dbs as $db) {
MultiDB::setDB($db);
$recurring_invoices = RecurringInvoice::where('status_id', RecurringInvoice::STATUS_ACTIVE)
$recurring_invoices = RecurringInvoice::query()->where('status_id', RecurringInvoice::STATUS_ACTIVE)
->where('is_deleted', false)
->where('remaining_cycles', '!=', '0')
->whereNull('deleted_at')

74
app/Jobs/Cron/SendCompanyRecurring.php
View File

@ -1,74 +0,0 @@
<?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\Jobs\Cron;
use App\Jobs\RecurringInvoice\SendRecurring;
use App\Libraries\MultiDB;
use App\Models\Company;
use App\Models\RecurringInvoice;
use Illuminate\Foundation\Bus\Dispatchable;
/*@not used*/
class SendCompanyRecurring
{
use Dispatchable;
public $tries = 1;
/** @var \App\Models\Company $company */
public $company;
public function __construct(private int $company_id, private string $db)
{
}
/**
* Execute the job.
*
* @return void
*/
public function handle(): void
{
MultiDB::setDB($this->db);
$recurring_invoices = Company::where('id', $this->company_id)
->where('is_disabled', 0)
->whereHas('recurring_invoices', function ($query) {
$query->where('next_send_date', '<=', now()->toDateTimeString())
->whereNotNull('next_send_date')
->whereNull('deleted_at')
->where('is_deleted', false)
->where('status_id', RecurringInvoice::STATUS_ACTIVE)
->where('remaining_cycles', '!=', '0')
->whereHas('client', function ($query) {
$query->where('is_deleted', 0)
->where('deleted_at', null);
});
})
->cursor()->each(function ($recurring_invoice) {
nlog("Trying to send {$recurring_invoice->number}");
if ($recurring_invoice->company->stop_on_unpaid_recurring) {
if ($recurring_invoice->invoices()->whereIn('status_id', [2, 3])->where('is_deleted', 0)->where('balance', '>', 0)->exists()) {
return;
}
}
try {
(new SendRecurring($recurring_invoice, $recurring_invoice->company->db))->handle();
} catch (\Exception $e) {
nlog("Unable to sending recurring invoice {$recurring_invoice->id} ".$e->getMessage());
}
});
}
}

4
app/Jobs/Cron/SubscriptionCron.php
View File

@ -52,7 +52,7 @@ class SubscriptionCron
->whereNotNull('subscription_id')
->cursor();
$invoices->each(function ($invoice) {
$invoices->each(function (Invoice $invoice) {
$subscription = $invoice->subscription;
$body = [
@ -80,7 +80,7 @@ class SubscriptionCron
->whereNotNull('subscription_id')
->cursor();
$invoices->each(function ($invoice) {
$invoices->each(function (Invoice $invoice) {
$subscription = $invoice->subscription;
$body = [

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

@ -101,8 +101,7 @@ class NinjaMailerJob implements ShouldQueue
$this->nmo->mailable->replyTo($this->nmo->settings->reply_to_email, $reply_to_name);
} elseif(isset($this->nmo->invitation->user)) {
$this->nmo->mailable->replyTo($this->nmo->invitation->user->email, $this->nmo->invitation->user->present()->name());
}
else {
} else {
$this->nmo->mailable->replyTo($this->company->owner()->email, $this->company->owner()->present()->name());
}
@ -286,8 +285,7 @@ class NinjaMailerJob implements ShouldQueue
return $this;
}
}
catch(\Exception $e){
} catch(\Exception $e) {
nlog($e->getMessage());
}
}

1
app/Jobs/Mail/NinjaMailerObject.php
View File

@ -16,7 +16,6 @@ namespace App\Jobs\Mail;
*/
class NinjaMailerObject
{
/* @var Illuminate\Mail\Mailable */
public $mailable;

11
app/Jobs/Mailgun/ProcessMailgunWebhook.php
View File

@ -34,7 +34,10 @@ use App\Notifications\Ninja\EmailBounceNotification;
class ProcessMailgunWebhook implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
use Dispatchable;
use InteractsWithQueue;
use Queueable;
use SerializesModels;
public $tries = 1;
@ -89,8 +92,9 @@ class ProcessMailgunWebhook implements ShouldQueue
{
nlog($this->request);
if(!$this->request['event-data']['tags'][0])
if(!$this->request['event-data']['tags'][0]) {
return;
}
MultiDB::findAndSetDbByCompanyKey($this->request['event-data']['tags'][0]);
$company = Company::where('company_key', $this->request['event-data']['tags'][0])->first();
@ -180,8 +184,9 @@ class ProcessMailgunWebhook implements ShouldQueue
$sl = $this->getSystemLog($this->request['MessageID']);
/** Prevents Gmail tracking from firing inappropriately */
if($this->request['signature']['timestamp'] < $sl->log['signature']['timestamp'] + 3)
if($this->request['signature']['timestamp'] < $sl->log['signature']['timestamp'] + 3) {
return;
}
$event = [
'bounce_id' => '',

1
app/Jobs/User/UserEmailChanged.php
View File

@ -94,6 +94,7 @@ class UserEmailChanged implements ShouldQueue
'logo' => $this->company->present()->logo(),
'settings' => $this->settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
}
}

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

@ -233,7 +233,6 @@ class Import implements ShouldQueue
['name' => ctrans('texts.ready_to_do'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 2],
['name' => ctrans('texts.in_progress'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 3],
['name' => ctrans('texts.done'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 4],
];
TaskStatus::insert($task_statuses);

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

@ -94,7 +94,7 @@ class VersionCheck implements ShouldQueue
Client::doesntHave('contacts')
->cursor()
->each(function ($client) {
->each(function (Client $client) {
$new_contact = ClientContactFactory::create($client->company_id, $client->user_id);
$new_contact->client_id = $client->id;
@ -107,7 +107,7 @@ class VersionCheck implements ShouldQueue
Vendor::doesntHave('contacts')
->cursor()
->each(function ($vendor) {
->each(function (Vendor $vendor) {
$new_contact = VendorContactFactory::create($vendor->company_id, $vendor->user_id);
$new_contact->vendor_id = $vendor->id;

3
app/Listeners/Invoice/InvoiceFailedEmailNotification.php
View File

@ -37,8 +37,9 @@ class InvoiceFailedEmailNotification
{
MultiDB::setDb($event->company->db);
if(Cache::has("invoice_failed_email_notification_{$event->invitation->key}"))
if(Cache::has("invoice_failed_email_notification_{$event->invitation->key}")) {
return;
}
$invoice = $event->invitation->invoice;

1
app/Mail/Admin/ClientUnsubscribedObject.php
View File

@ -44,6 +44,7 @@ class ClientUnsubscribedObject
'settings' => $this->company->settings,
'logo' => $this->company->present()->logo(),
'text_body' => "\n\n".ctrans('texts.client_unsubscribed_help', ['client' => $this->contact->present()->name()])."\n\n",
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
$mail_obj = new \stdClass();

2
app/Mail/Admin/EntityCreatedObject.php
View File

@ -94,6 +94,7 @@ class EntityCreatedObject
'settings' => $this->company->settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,
'text_body' => str_replace(['$view_button','$viewButton','$viewLink','$view_url'], '$view_url', $content),
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
} else {
$this->entity->load('client.country', 'client.company');
@ -181,6 +182,7 @@ class EntityCreatedObject
'settings' => $settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,
'text_body' => str_replace(['$view_button','$viewButton','$view_link','$view_button'], '$view_url', $content),
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
}
}

1
app/Mail/Admin/EntityFailedSendObject.php
View File

@ -152,6 +152,7 @@ class EntityFailedSendObject
"settings" => $settings,
"whitelabel" => $this->company->account->isPaid() ? true : false,
"text_body" => str_replace("<br>", "\n", $content),
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
return $data;

1
app/Mail/Admin/EntityNotificationMailer.php
View File

@ -12,6 +12,7 @@
namespace App\Mail\Admin;
use Illuminate\Mail\Mailable;
//@deprecated?
class EntityNotificationMailer extends Mailable
{

1
app/Mail/Admin/EntityPaidObject.php
View File

@ -105,6 +105,7 @@ class EntityPaidObject
'settings' => $settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,
'text_body' => $content,
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
return $data;

4
app/Mail/Admin/EntitySentObject.php
View File

@ -87,6 +87,8 @@ class EntitySentObject
'logo' => $this->company->present()->logo(),
'settings' => $this->company->settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
$mail_obj->markdown = 'email.admin.generic';
$mail_obj->tag = $this->company->company_key;
@ -197,6 +199,8 @@ class EntitySentObject
'settings' => $settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,
'text_body' => $content,
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
}
}

1
app/Mail/Admin/EntityViewedObject.php
View File

@ -116,6 +116,7 @@ class EntityViewedObject
'settings' => $settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,
'text_body' => $content,
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
return $data;

1
app/Mail/Admin/InventoryNotificationObject.php
View File

@ -76,6 +76,7 @@ class InventoryNotificationObject
'settings' => $this->product->company->settings,
'whitelabel' => $this->product->company->account->isPaid() ? true : false,
'text_body' => $content,
'template' => $this->product->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
return $data;

1
app/Mail/Admin/PaymentFailureObject.php
View File

@ -99,6 +99,7 @@ class PaymentFailureObject
'button' => $this->use_react_url ? ctrans('texts.view_client') : ctrans('texts.login'),
'additional_info' => $this->error,
'text_body' => $content,
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
return $data;

1
app/Mail/Admin/PurchaseOrderAcceptedObject.php
View File

@ -92,6 +92,7 @@ class PurchaseOrderAcceptedObject
'settings' => $settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,
'text_body' => $content,
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
return $data;

1
app/Mail/Admin/QuoteApprovedObject.php
View File

@ -91,6 +91,7 @@ class QuoteApprovedObject
'settings' => $settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,
'text_body' => $content,
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
return $data;

2
app/Mail/Admin/QuoteExpiredObject.php
View File

@ -91,6 +91,8 @@ class QuoteExpiredObject
'settings' => $settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,
'text_body' => $content,
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
return $data;

1
app/Mail/Admin/ResetPasswordObject.php
View File

@ -41,6 +41,7 @@ class ResetPasswordObject
'settings' => $this->company->settings,
'logo' => $this->company->present()->logo(),
'text_body' => ctrans('texts.reset_password'),
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
$mail_obj = new \stdClass();

1
app/Mail/Admin/VerifyUserObject.php
View File

@ -53,6 +53,7 @@ class VerifyUserObject
'logo' => $this->company->present()->logo(),
'signature' => $this->company->settings->email_signature,
'text_body' => ctrans('texts.confirmation_message'),
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
$mail_obj = new \stdClass();

2
app/Mail/Client/ClientStatement.php
View File

@ -52,7 +52,7 @@ class ClientStatement extends Mailable
public function content()
{
return new Content(
view: 'email.template.client',
view: $this->data['company']->account->isPremium() ? 'email.template.client_premium' : 'email.template.client',
text: 'email.template.text',
with: [
'text_body' => $this->data['body'],

1
app/Mail/RecurringInvoice/ClientContactRequestCancellationObject.php
View File

@ -48,6 +48,7 @@ class ClientContactRequestCancellationObject
'signature' => $this->company->settings->email_signature,
'settings' => $this->company->settings,
'logo' => $this->company->present()->logo(),
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
];
$mail_obj = new \stdClass();

1
app/Mail/Subscription/OtpCode.php
View File

@ -58,6 +58,7 @@ class OtpCode extends Mailable
'title' => ctrans('texts.otp_code_subject'),
'content' => ctrans('texts.otp_code_body', ['code' => $this->code]),
'whitelabel' => $this->company->account->isPaid(),
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
]);
}
}

2
app/Mail/TemplateEmail.php
View File

@ -75,7 +75,7 @@ class TemplateEmail extends Mailable
$template_name = 'email.template.'.$this->build_email->getTemplate();
if ($this->build_email->getTemplate() == 'light' || $this->build_email->getTemplate() == 'dark') {
$template_name = 'email.template.client';
$template_name = $this->company->account->isPremium() ? 'email.template.client_premium' : 'email.template.client';
}
if ($this->build_email->getTemplate() == 'custom') {

1
app/Mail/User/UserLoggedIn.php
View File

@ -19,7 +19,6 @@ use Illuminate\Support\Facades\App;
class UserLoggedIn extends Mailable
{
/**
* Create a new message instance.
*

2
app/Mail/VendorTemplateEmail.php
View File

@ -72,7 +72,7 @@ class VendorTemplateEmail extends Mailable
$template_name = 'email.template.'.$this->build_email->getTemplate();
if ($this->build_email->getTemplate() == 'light' || $this->build_email->getTemplate() == 'dark') {
$template_name = 'email.template.client';
$template_name = $this->company->account->isPremium() ? 'email.template.client_premium' : 'email.template.client';
}
if ($this->build_email->getTemplate() == 'custom') {

1
app/Models/Account.php
View File

@ -296,6 +296,7 @@ class Account extends BaseModel
public function isPremium(): bool
{
// return true;
return Ninja::isHosted() && $this->isPaidHostedClient() && !$this->isTrial() && Carbon::createFromTimestamp($this->created_at)->diffInMonths() > 2;
}

3
app/Models/BaseModel.php
View File

@ -328,8 +328,9 @@ class BaseModel extends Model
*/
public function parseHtmlVariables(string $field, array $variables): string
{
if(!$this->{$field})
if(!$this->{$field}) {
return '';
}
$section = strtr($this->{$field}, $variables['labels']);

3
app/Models/CompanyUser.php
View File

@ -201,7 +201,8 @@ class CompanyUser extends Pivot
* @return bool
*/
public function portalType(): bool
{ nlog(isset($this->react_settings->react_notification_link) && $this->react_settings->react_notification_link);
{
nlog(isset($this->react_settings->react_notification_link) && $this->react_settings->react_notification_link);
return isset($this->react_settings->react_notification_link) && $this->react_settings->react_notification_link;
}

3
app/Models/Payment.php
View File

@ -325,8 +325,9 @@ class Payment extends BaseModel
return '<h6><span class="badge badge-danger">'.ctrans('texts.payment_status_3').'</span></h6>';
case self::STATUS_COMPLETED:
if($this->amount > $this->applied)
if($this->amount > $this->applied) {
return '<h6><span class="badge badge-info">' . ctrans('texts.partially_unapplied') . '</span></h6>';
}
return '<h6><span class="badge badge-info">'.ctrans('texts.payment_status_4').'</span></h6>';
case self::STATUS_PARTIALLY_REFUNDED:

3
app/Models/RecurringExpense.php
View File

@ -78,7 +78,6 @@ use Illuminate\Support\Carbon;
* @property-read \App\Models\User $user
* @property-read \App\Models\Vendor|null $vendor
* @property-read \App\Models\ExpenseCategory|null $category
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel company()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel exclude($columns)
* @method static \Database\Factories\RecurringExpenseFactory factory($count = null, $state = [])
* @method static \Illuminate\Database\Eloquent\Builder|RecurringExpense filter(\App\Filters\QueryFilters $filters)
@ -222,7 +221,7 @@ class RecurringExpense extends BaseModel
return $this->belongsTo(User::class, 'assigned_user_id', 'id');
}
public function company()
public function company():\Illuminate\Database\Eloquent\Relations\BelongsTo
{
return $this->belongsTo(Company::class);
}

18
app/Models/RecurringInvoice.php
View File

@ -106,7 +106,6 @@ use Laracasts\Presenter\PresentableTrait;
* @property-read \App\Models\Subscription|null $subscription
* @property-read \App\Models\User $user
* @property-read \App\Models\Vendor|null $vendor
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel company()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel exclude($columns)
* @method static \Database\Factories\RecurringInvoiceFactory factory($count = null, $state = [])
* @method static \Illuminate\Database\Eloquent\Builder|RecurringInvoice filter(\App\Filters\QueryFilters $filters)
@ -343,16 +342,25 @@ class RecurringInvoice extends BaseModel
}
}
public function calculateStatus()
/**
* CalculateStatus
*
* Calculates the status of the Recurring Invoice.
*
* We only apply the pending status on new models, we never revert an invoice back to
* pending.
* @param bool $new_model
* @return int
*/
public function calculateStatus(bool $new_model = false) //15-02-2024 - $new_model needed
{
if($this->remaining_cycles == 0) {
return self::STATUS_COMPLETED;
} elseif ($this->status_id == self::STATUS_ACTIVE && Carbon::parse($this->next_send_date)->isFuture()) {
} elseif ($new_model && $this->status_id == self::STATUS_ACTIVE && Carbon::parse($this->next_send_date)->isFuture())
return self::STATUS_PENDING;
} else {
return $this->status_id;
}
}

6
app/PaymentDrivers/CheckoutComPaymentDriver.php
View File

@ -214,8 +214,9 @@ class CheckoutComPaymentDriver extends BaseDriver
{
$this->init();
if($this->company_gateway->update_details)
if($this->company_gateway->update_details) {
$this->updateCustomer();
}
$request = new RefundRequest();
$request->reference = "{$payment->transaction_reference} ".now();
@ -332,8 +333,9 @@ class CheckoutComPaymentDriver extends BaseDriver
public function updateCustomer($customer_id = null)
{
if(!$customer_id)
if(!$customer_id) {
return;
}
try {

3
app/PaymentDrivers/PayPalPPCPPaymentDriver.php
View File

@ -272,8 +272,7 @@ class PayPalPPCPPaymentDriver extends BaseDriver
//capture
$orderID = $response['orderID'];
if($this->company_gateway->require_shipping_address)
{
if($this->company_gateway->require_shipping_address) {
$shipping_data =
[[

12
app/Providers/ComposerServiceProvider.php
View File

@ -24,18 +24,6 @@ class ComposerServiceProvider extends ServiceProvider
public function boot()
{
view()->composer('portal.*', PortalComposer::class);
// view()->composer(
// ['email.admin.generic', 'email.client.generic'],
// function ($view) {
// $view->with(
// 'template',
// Ninja::isHosted()
// );
// }
// );
}
/**

2
app/Repositories/BaseRepository.php
View File

@ -365,7 +365,7 @@ class BaseRepository
$model = $model->calc()->getRecurringInvoice();
$model->status_id = $model->calculateStatus();
$model->status_id = $model->calculateStatus($this->new_model);
if ($this->new_model) {
event('eloquent.created: App\Models\RecurringInvoice', $model);

6
app/Services/Client/ClientService.php
View File

@ -26,7 +26,8 @@ use Illuminate\Database\QueryException;
class ClientService
{
use MakesDates, GeneratesCounter;
use MakesDates;
use GeneratesCounter;
private string $client_start_date;
@ -153,8 +154,9 @@ class ClientService
{
$x = 1;
if(isset($this->client->number))
if(isset($this->client->number)) {
return $this;
}
do {
try {

1
app/Services/Email/AdminEmailMailable.php
View File

@ -68,6 +68,7 @@ class AdminEmailMailable extends Mailable
'logo' => $this->email_object->company->present()->logo(),
'settings' => $this->email_object->settings,
'whitelabel' => $this->email_object->company->account->isPaid() ? true : false,
'template' => $this->email_object->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
]
);
}

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

@ -107,10 +107,10 @@ class EmailDefaults
match ($this->email->email_object->settings->email_style) {
'plain' => $this->template = 'email.template.plain',
'light' => $this->template = 'email.template.client',
'dark' => $this->template = 'email.template.client',
'light' => $this->template = $this->email->email_object->company->account->isPremium() ? 'email.template.client_premium' : 'email.template.client',
'dark' => $this->template = $this->email->email_object->company->account->isPremium() ? 'email.template.client_premium' :'email.template.client',
'custom' => $this->template = 'email.template.custom',
default => $this->template = 'email.template.client',
default => $this->template = $this->email->email_object->company->account->isPremium() ? 'email.template.client_premium' :'email.template.client',
};
$this->email->email_object->html_template = $this->template;
@ -213,15 +213,13 @@ class EmailDefaults
if(str_contains($this->email->email_object->settings->reply_to_email, "@")) {
$reply_to_email = $this->email->email_object->settings->reply_to_email;
}
elseif(isset($this->email->email_object->invitation->user)) {
} elseif(isset($this->email->email_object->invitation->user)) {
$reply_to_email = $this->email->email_object->invitation->user->email;
}
if(strlen($this->email->email_object->settings->reply_to_name) > 3) {
$reply_to_name = $this->email->email_object->settings->reply_to_name;
}
elseif(isset($this->email->email_object->invitation->user)) {
} elseif(isset($this->email->email_object->invitation->user)) {
$reply_to_name = $this->email->email_object->invitation->user->present()->name();
}

1
app/Services/Invoice/EInvoice/RoEInvoice.php
View File

@ -34,7 +34,6 @@ use CleverIt\UBL\Invoice\Price;
class RoEInvoice extends AbstractService
{
public function __construct(public Invoice $invoice)
{
}

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

@ -18,7 +18,9 @@ use Illuminate\Database\QueryException;
class SendEmail
{
public function __construct(public Payment $payment, public ?ClientContact $contact) {}
public function __construct(public Payment $payment, public ?ClientContact $contact)
{
}
/**
* Builds the correct template to send.

3
app/Services/Subscription/ChangePlanInvoice.php
View File

@ -52,8 +52,9 @@ class ChangePlanInvoice extends AbstractService
//generate new recurring invoice at this point as we know the user has succeeded with their upgrade.
}
if($refund > $new_charge)
if($refund > $new_charge) {
return $this->generateCredit($refund - $new_charge);
}
return $invoice;
}

1
app/Services/Subscription/InvoiceToRecurring.php
View File

@ -21,7 +21,6 @@ use App\Repositories\SubscriptionRepository;
class InvoiceToRecurring extends AbstractService
{
protected \App\Services\Subscription\SubscriptionStatus $status;
public function __construct(protected int $client_id, public Subscription $subscription, public array $bundle = [])

13
app/Services/Subscription/SubscriptionStatus.php
View File

@ -19,7 +19,9 @@ use App\Services\AbstractService;
class SubscriptionStatus extends AbstractService
{
public function __construct(public Subscription $subscription, protected RecurringInvoice $recurring_invoice) {}
public function __construct(public Subscription $subscription, protected RecurringInvoice $recurring_invoice)
{
}
/** @var bool $is_trial */
public bool $is_trial = false;
@ -93,8 +95,9 @@ class SubscriptionStatus extends AbstractService
->orderBy('id', 'desc')
->first();
if(!$primary_invoice)
if(!$primary_invoice) {
return 0;
}
$subscription_start_date = Carbon::parse($primary_invoice->date)->startOfDay();
@ -140,8 +143,9 @@ class SubscriptionStatus extends AbstractService
private function checkTrial(): self
{
if(!$this->subscription->trial_enabled)
if(!$this->subscription->trial_enabled) {
return $this->setIsTrial(false);
}
$primary_invoice = Invoice::query()
->where('company_id', $this->recurring_invoice->company_id)
@ -170,8 +174,9 @@ class SubscriptionStatus extends AbstractService
*/
private function checkRefundable(): self
{
if(!$this->recurring_invoice->subscription->refund_period || $this->recurring_invoice->subscription->refund_period === 0)
if(!$this->recurring_invoice->subscription->refund_period || $this->recurring_invoice->subscription->refund_period === 0) {
return $this->setRefundable(false);
}
$primary_invoice = $this->recurring_invoice
->invoices()

8
app/Services/Subscription/UpgradePrice.php
View File

@ -38,10 +38,11 @@ class UpgradePrice extends AbstractService
->subscription
->status($this->recurring_invoice);
if($this->status->is_in_good_standing)
if($this->status->is_in_good_standing) {
$this->calculateUpgrade();
else
} else {
$this->upgrade_price = $this->subscription->price;
}
return $this;
@ -70,8 +71,9 @@ class UpgradePrice extends AbstractService
private function getRefundableAmount(?Invoice $invoice, float $ratio): float
{
if (!$invoice || !$invoice->date || $invoice->status_id != Invoice::STATUS_PAID || $ratio == 0)
if (!$invoice || !$invoice->date || $invoice->status_id != Invoice::STATUS_PAID || $ratio == 0) {
return 0;
}
return max(0, round(($invoice->paid_to_date * $ratio), 2));
}

3
app/Utils/HtmlEngine.php
View File

@ -745,8 +745,9 @@ class HtmlEngine
if((int)$this->client->country_id !== (int)$this->company->settings->country_id) {
$tax_label .= ctrans('texts.intracommunity_tax_info') . "<br>";
if($this->entity_calc->getTotalTaxes() > 0)
if($this->entity_calc->getTotalTaxes() > 0) {
$tax_label = '';
}
}

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

@ -74,11 +74,13 @@ trait CleanLineItems
}
if(isset($item['notes']))
if(isset($item['notes'])) {
$item['notes'] = str_replace("</", "<-", $item['notes']);
}
if(isset($item['product_key']))
if(isset($item['product_key'])) {
$item['product_key'] = str_replace("</", "<-", $item['product_key']);
}
}

14
app/Utils/TruthSource.php
View File

@ -21,6 +21,15 @@ class TruthSource
public $company_token;
public $premium_hosted;
public function setPremiumHosted($premium_hosted)
{
$this->premium_hosted = $premium_hosted;
return $this;
}
public function setCompanyUser($company_user)
{
$this->company_user = $company_user;
@ -49,6 +58,11 @@ class TruthSource
return $this;
}
public function getPremiumHosted()
{
return $this->premium_hosted;
}
public function getCompany()
{
return $this->company;

169
composer.lock generated
View File

@ -707,16 +707,16 @@
},
{
"name": "amphp/socket",
"version": "v2.2.2",
"version": "v2.2.3",
"source": {
"type": "git",
"url": "https://github.com/amphp/socket.git",
"reference": "eb6c5e6baae5aebd9a209f50e81bff38c7efef97"
"reference": "40c80bdc67a9f975ecb5f4083e3c84ef9f23eace"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/amphp/socket/zipball/eb6c5e6baae5aebd9a209f50e81bff38c7efef97",
"reference": "eb6c5e6baae5aebd9a209f50e81bff38c7efef97",
"url": "https://api.github.com/repos/amphp/socket/zipball/40c80bdc67a9f975ecb5f4083e3c84ef9f23eace",
"reference": "40c80bdc67a9f975ecb5f4083e3c84ef9f23eace",
"shasum": ""
},
"require": {
@ -735,7 +735,7 @@
"amphp/phpunit-util": "^3",
"amphp/process": "^2",
"phpunit/phpunit": "^9",
"psalm/phar": "^5.4"
"psalm/phar": "5.20"
},
"type": "library",
"autoload": {
@ -779,7 +779,7 @@
],
"support": {
"issues": "https://github.com/amphp/socket/issues",
"source": "https://github.com/amphp/socket/tree/v2.2.2"
"source": "https://github.com/amphp/socket/tree/v2.2.3"
},
"funding": [
{
@ -787,7 +787,7 @@
"type": "github"
}
],
"time": "2023-12-31T18:12:01+00:00"
"time": "2024-02-13T21:03:09+00:00"
},
{
"name": "amphp/sync",
@ -1343,16 +1343,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.298.3",
"version": "3.298.9",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "70fde185df4a8dd99983a308b823991fb5b39060"
"reference": "db225c3a1c5dabfbb5071349cfb7e4c396c3d9ec"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/70fde185df4a8dd99983a308b823991fb5b39060",
"reference": "70fde185df4a8dd99983a308b823991fb5b39060",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/db225c3a1c5dabfbb5071349cfb7e4c396c3d9ec",
"reference": "db225c3a1c5dabfbb5071349cfb7e4c396c3d9ec",
"shasum": ""
},
"require": {
@ -1432,9 +1432,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.298.3"
"source": "https://github.com/aws/aws-sdk-php/tree/3.298.9"
},
"time": "2024-02-05T19:05:28+00:00"
"time": "2024-02-13T19:08:16+00:00"
},
{
"name": "bacon/bacon-qr-code",
@ -1717,16 +1717,16 @@
},
{
"name": "checkout/checkout-sdk-php",
"version": "3.0.20",
"version": "3.0.21",
"source": {
"type": "git",
"url": "https://github.com/checkout/checkout-sdk-php.git",
"reference": "4310ef994a663b925d1209f8c579f0965f5e14f8"
"reference": "0195aa0153b79b3f8350509e54a5654e57f62bd3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/checkout/checkout-sdk-php/zipball/4310ef994a663b925d1209f8c579f0965f5e14f8",
"reference": "4310ef994a663b925d1209f8c579f0965f5e14f8",
"url": "https://api.github.com/repos/checkout/checkout-sdk-php/zipball/0195aa0153b79b3f8350509e54a5654e57f62bd3",
"reference": "0195aa0153b79b3f8350509e54a5654e57f62bd3",
"shasum": ""
},
"require": {
@ -1779,9 +1779,9 @@
],
"support": {
"issues": "https://github.com/checkout/checkout-sdk-php/issues",
"source": "https://github.com/checkout/checkout-sdk-php/tree/3.0.20"
"source": "https://github.com/checkout/checkout-sdk-php/tree/3.0.21"
},
"time": "2024-01-10T13:50:01+00:00"
"time": "2024-02-08T17:30:23+00:00"
},
{
"name": "clue/stream-filter",
@ -3455,16 +3455,16 @@
},
{
"name": "google/apiclient-services",
"version": "v0.334.0",
"version": "v0.335.0",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-api-php-client-services.git",
"reference": "5d2ebd6199b34b4b207eff2118bb783ae7b6f413"
"reference": "3e6cea8f43066378babdf00e718f01c7c55233fd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/5d2ebd6199b34b4b207eff2118bb783ae7b6f413",
"reference": "5d2ebd6199b34b4b207eff2118bb783ae7b6f413",
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/3e6cea8f43066378babdf00e718f01c7c55233fd",
"reference": "3e6cea8f43066378babdf00e718f01c7c55233fd",
"shasum": ""
},
"require": {
@ -3493,9 +3493,9 @@
],
"support": {
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.334.0"
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.335.0"
},
"time": "2024-02-04T01:06:40+00:00"
"time": "2024-02-12T01:08:15+00:00"
},
{
"name": "google/auth",
@ -5326,16 +5326,16 @@
},
{
"name": "laravel/framework",
"version": "v10.43.0",
"version": "v10.44.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "4f7802dfc9993cb57cf69615491ce1a7eb2e9529"
"reference": "1199dbe361787bbe9648131a79f53921b4148cf6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/4f7802dfc9993cb57cf69615491ce1a7eb2e9529",
"reference": "4f7802dfc9993cb57cf69615491ce1a7eb2e9529",
"url": "https://api.github.com/repos/laravel/framework/zipball/1199dbe361787bbe9648131a79f53921b4148cf6",
"reference": "1199dbe361787bbe9648131a79f53921b4148cf6",
"shasum": ""
},
"require": {
@ -5383,6 +5383,7 @@
"conflict": {
"carbonphp/carbon-doctrine-types": ">=3.0",
"doctrine/dbal": ">=4.0",
"phpunit/phpunit": ">=11.0.0",
"tightenco/collect": "<5.5.33"
},
"provide": {
@ -5527,7 +5528,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2024-01-30T16:25:02+00:00"
"time": "2024-02-13T16:01:16+00:00"
},
{
"name": "laravel/prompts",
@ -5709,16 +5710,16 @@
},
{
"name": "laravel/socialite",
"version": "v5.11.0",
"version": "v5.12.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/socialite.git",
"reference": "4f6a8af6f3f7c18da03d19842dd0514315501c10"
"reference": "ffeeb2cdf723b4c88b25479968e2d3a61a83dbe5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/socialite/zipball/4f6a8af6f3f7c18da03d19842dd0514315501c10",
"reference": "4f6a8af6f3f7c18da03d19842dd0514315501c10",
"url": "https://api.github.com/repos/laravel/socialite/zipball/ffeeb2cdf723b4c88b25479968e2d3a61a83dbe5",
"reference": "ffeeb2cdf723b4c88b25479968e2d3a61a83dbe5",
"shasum": ""
},
"require": {
@ -5775,7 +5776,7 @@
"issues": "https://github.com/laravel/socialite/issues",
"source": "https://github.com/laravel/socialite"
},
"time": "2023-12-02T18:22:36+00:00"
"time": "2024-02-11T18:29:55+00:00"
},
{
"name": "laravel/tinker",
@ -8024,16 +8025,16 @@
},
{
"name": "nordigen/nordigen-php",
"version": "1.1.1",
"version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/nordigen/nordigen-php.git",
"reference": "1770384ceb8042c7275cb0e404d8b7131bdccc56"
"reference": "573a9935fc7444ba84d0cdd7dba46e033dbf7bd5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nordigen/nordigen-php/zipball/1770384ceb8042c7275cb0e404d8b7131bdccc56",
"reference": "1770384ceb8042c7275cb0e404d8b7131bdccc56",
"url": "https://api.github.com/repos/nordigen/nordigen-php/zipball/573a9935fc7444ba84d0cdd7dba46e033dbf7bd5",
"reference": "573a9935fc7444ba84d0cdd7dba46e033dbf7bd5",
"shasum": ""
},
"require": {
@ -8073,9 +8074,9 @@
],
"support": {
"issues": "https://github.com/nordigen/nordigen-php/issues",
"source": "https://github.com/nordigen/nordigen-php/tree/1.1.1"
"source": "https://github.com/nordigen/nordigen-php/tree/1.1.2"
},
"time": "2023-06-22T10:53:06+00:00"
"time": "2024-02-13T14:06:32+00:00"
},
{
"name": "nunomaduro/termwind",
@ -15831,36 +15832,36 @@
"packages-dev": [
{
"name": "barryvdh/laravel-debugbar",
"version": "v3.9.2",
"version": "v3.10.4",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-debugbar.git",
"reference": "bfd0131c146973cab164e50f5cdd8a67cc60cab1"
"reference": "09d3dc77d7dc1b063e3728a6029c39ee0fbebf1d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/bfd0131c146973cab164e50f5cdd8a67cc60cab1",
"reference": "bfd0131c146973cab164e50f5cdd8a67cc60cab1",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/09d3dc77d7dc1b063e3728a6029c39ee0fbebf1d",
"reference": "09d3dc77d7dc1b063e3728a6029c39ee0fbebf1d",
"shasum": ""
},
"require": {
"illuminate/routing": "^9|^10",
"illuminate/session": "^9|^10",
"illuminate/support": "^9|^10",
"maximebf/debugbar": "^1.18.2",
"illuminate/routing": "^9|^10|^11",
"illuminate/session": "^9|^10|^11",
"illuminate/support": "^9|^10|^11",
"maximebf/debugbar": "~1.20.1",
"php": "^8.0",
"symfony/finder": "^6"
"symfony/finder": "^6|^7"
},
"require-dev": {
"mockery/mockery": "^1.3.3",
"orchestra/testbench-dusk": "^5|^6|^7|^8",
"orchestra/testbench-dusk": "^5|^6|^7|^8|^9",
"phpunit/phpunit": "^8.5.30|^9.0",
"squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.8-dev"
"dev-master": "3.10-dev"
},
"laravel": {
"providers": [
@ -15899,7 +15900,7 @@
],
"support": {
"issues": "https://github.com/barryvdh/laravel-debugbar/issues",
"source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.9.2"
"source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.10.4"
},
"funding": [
{
@ -15911,7 +15912,7 @@
"type": "github"
}
],
"time": "2023-08-25T18:43:57+00:00"
"time": "2024-02-14T08:52:12+00:00"
},
{
"name": "barryvdh/laravel-ide-helper",
@ -16507,16 +16508,16 @@
},
{
"name": "fidry/cpu-core-counter",
"version": "1.0.0",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/theofidry/cpu-core-counter.git",
"reference": "85193c0b0cb5c47894b5eaec906e946f054e7077"
"reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/85193c0b0cb5c47894b5eaec906e946f054e7077",
"reference": "85193c0b0cb5c47894b5eaec906e946f054e7077",
"url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42",
"reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42",
"shasum": ""
},
"require": {
@ -16556,7 +16557,7 @@
],
"support": {
"issues": "https://github.com/theofidry/cpu-core-counter/issues",
"source": "https://github.com/theofidry/cpu-core-counter/tree/1.0.0"
"source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0"
},
"funding": [
{
@ -16564,7 +16565,7 @@
"type": "github"
}
],
"time": "2023-09-17T21:38:23+00:00"
"time": "2024-02-07T09:43:46+00:00"
},
{
"name": "filp/whoops",
@ -16884,16 +16885,16 @@
},
{
"name": "larastan/larastan",
"version": "v2.8.1",
"version": "v2.9.0",
"source": {
"type": "git",
"url": "https://github.com/larastan/larastan.git",
"reference": "b7cc6a29c457a7d4f3de90466392ae9ad3e17022"
"reference": "35fa9cbe1895e76215bbe74571a344f2705fbe01"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/larastan/larastan/zipball/b7cc6a29c457a7d4f3de90466392ae9ad3e17022",
"reference": "b7cc6a29c457a7d4f3de90466392ae9ad3e17022",
"url": "https://api.github.com/repos/larastan/larastan/zipball/35fa9cbe1895e76215bbe74571a344f2705fbe01",
"reference": "35fa9cbe1895e76215bbe74571a344f2705fbe01",
"shasum": ""
},
"require": {
@ -16961,7 +16962,7 @@
],
"support": {
"issues": "https://github.com/larastan/larastan/issues",
"source": "https://github.com/larastan/larastan/tree/v2.8.1"
"source": "https://github.com/larastan/larastan/tree/v2.9.0"
},
"funding": [
{
@ -16981,26 +16982,26 @@
"type": "patreon"
}
],
"time": "2024-01-08T09:11:17+00:00"
"time": "2024-02-13T11:49:22+00:00"
},
{
"name": "maximebf/debugbar",
"version": "v1.19.1",
"version": "v1.20.1",
"source": {
"type": "git",
"url": "https://github.com/maximebf/php-debugbar.git",
"reference": "03dd40a1826f4d585ef93ef83afa2a9874a00523"
"reference": "06ebf922ccedfa4cc43015825697ee8c1fb80f7e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/03dd40a1826f4d585ef93ef83afa2a9874a00523",
"reference": "03dd40a1826f4d585ef93ef83afa2a9874a00523",
"url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/06ebf922ccedfa4cc43015825697ee8c1fb80f7e",
"reference": "06ebf922ccedfa4cc43015825697ee8c1fb80f7e",
"shasum": ""
},
"require": {
"php": "^7.1|^8",
"psr/log": "^1|^2|^3",
"symfony/var-dumper": "^4|^5|^6"
"symfony/var-dumper": "^4|^5|^6|^7"
},
"require-dev": {
"phpunit/phpunit": ">=7.5.20 <10.0",
@ -17014,7 +17015,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.18-dev"
"dev-master": "1.20-dev"
}
},
"autoload": {
@ -17045,9 +17046,9 @@
],
"support": {
"issues": "https://github.com/maximebf/php-debugbar/issues",
"source": "https://github.com/maximebf/php-debugbar/tree/v1.19.1"
"source": "https://github.com/maximebf/php-debugbar/tree/v1.20.1"
},
"time": "2023-10-12T08:10:52+00:00"
"time": "2024-02-13T19:03:14+00:00"
},
{
"name": "mockery/mockery",
@ -17488,16 +17489,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.10.57",
"version": "1.10.58",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "1627b1d03446904aaa77593f370c5201d2ecc34e"
"reference": "a23518379ec4defd9e47cbf81019526861623ec2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e",
"reference": "1627b1d03446904aaa77593f370c5201d2ecc34e",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2",
"reference": "a23518379ec4defd9e47cbf81019526861623ec2",
"shasum": ""
},
"require": {
@ -17546,7 +17547,7 @@
"type": "tidelift"
}
],
"time": "2024-01-24T11:51:34+00:00"
"time": "2024-02-12T20:02:57+00:00"
},
{
"name": "phpunit/php-code-coverage",
@ -19101,16 +19102,16 @@
},
{
"name": "spatie/laravel-ignition",
"version": "2.4.1",
"version": "2.4.2",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-ignition.git",
"reference": "005e1e7b1232f3b22d7e7be3f602693efc7dba67"
"reference": "351504f4570e32908839fc5a2dc53bf77d02f85e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/005e1e7b1232f3b22d7e7be3f602693efc7dba67",
"reference": "005e1e7b1232f3b22d7e7be3f602693efc7dba67",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/351504f4570e32908839fc5a2dc53bf77d02f85e",
"reference": "351504f4570e32908839fc5a2dc53bf77d02f85e",
"shasum": ""
},
"require": {
@ -19189,7 +19190,7 @@
"type": "github"
}
],
"time": "2024-01-12T13:14:58+00:00"
"time": "2024-02-09T16:08:40+00:00"
},
{
"name": "spaze/phpstan-stripe",

4
config/ninja.php
View File

@ -17,8 +17,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.8.24'),
'app_tag' => env('APP_TAG', '5.8.24'),
'app_version' => env('APP_VERSION', '5.8.25'),
'app_tag' => env('APP_TAG', '5.8.25'),
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),

2
resources/views/email/template/admin_premium.blade.php.enc
View File

File diff suppressed because one or more lines are too long

1
resources/views/email/template/client.blade.php
View File

@ -3,7 +3,6 @@
$email_alignment = isset($settings->email_alignment) ? $settings->email_alignment : 'center';
@endphp
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">

2
resources/views/email/template/client_premium.blade.php.enc
View File

File diff suppressed because one or more lines are too long

2
tests/Feature/PaymentLink/PaymentLinkTest.php
View File

@ -9,7 +9,7 @@
* @license https://www.elastic.co/licensing/elastic-license
*/
namespace Tests\Feature;
namespace Tests\Feature\PaymentLink;
use Tests\TestCase;
use App\Models\Invoice;