Updated resources
This commit is contained in:
parent
174c5aeb05
commit
1d91fdb7ab
|
|
@ -1 +1 @@
|
|||
5.12.18
|
||||
5.12.19
|
||||
|
|
@ -222,6 +222,15 @@ class CreditController extends BaseController
|
|||
if ($invoice) {
|
||||
$invoice->status_id = Invoice::STATUS_REVERSED;
|
||||
$invoice->save();
|
||||
|
||||
//2025-08-25 after convert to a credit note, we need to delete the payments associated with the invoice.
|
||||
$invoice->payments()->each(function ($p) {
|
||||
$p->pivot->forceDelete();
|
||||
$p->invoices()->each(function ($i) {
|
||||
$i->pivot->forceDelete();
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -127,7 +127,11 @@ class DeletePayment
|
|||
$paymentable_invoice->delete();
|
||||
}
|
||||
|
||||
} elseif (! $paymentable_invoice->is_deleted) {
|
||||
}
|
||||
elseif ($paymentable_invoice->status_id == Invoice::STATUS_REVERSED) {
|
||||
//do not mutate anything at this level!
|
||||
}
|
||||
elseif (! $paymentable_invoice->is_deleted) {
|
||||
$paymentable_invoice->restore();
|
||||
|
||||
$paymentable_invoice->service()
|
||||
|
|
|
|||
|
|
@ -236,10 +236,11 @@ class Purify
|
|||
|
||||
public static function clean(string $html): string
|
||||
{
|
||||
if (config('ninja.disable_purify_html')) {
|
||||
if (config('ninja.disable_purify_html') || strlen($html) <= 1) {
|
||||
return str_replace('%24', '$', $html);
|
||||
}
|
||||
|
||||
|
||||
$html = str_replace('%24', '$', $html);
|
||||
libxml_use_internal_errors(true);
|
||||
|
||||
|
|
|
|||
|
|
@ -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.12.18'),
|
||||
'app_tag' => env('APP_TAG', '5.12.18'),
|
||||
'app_version' => env('APP_VERSION', '5.12.19'),
|
||||
'app_tag' => env('APP_TAG', '5.12.19'),
|
||||
'minimum_client_version' => '5.0.16',
|
||||
'terms_version' => '1.0.1',
|
||||
'api_secret' => env('API_SECRET', false),
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -385,7 +385,7 @@
|
|||
"src": "resources/js/setup/setup.js"
|
||||
},
|
||||
"resources/sass/app.scss": {
|
||||
"file": "assets/app-9454bf28.css",
|
||||
"file": "assets/app-c818527d.css",
|
||||
"isEntry": true,
|
||||
"src": "resources/sass/app.scss"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue