Updated resources

This commit is contained in:
David Bomba 2025-08-26 15:37:57 +10:00
parent 174c5aeb05
commit 1d91fdb7ab
8 changed files with 21 additions and 7 deletions

View File

@ -1 +1 @@
5.12.18 5.12.19

View File

@ -222,6 +222,15 @@ class CreditController extends BaseController
if ($invoice) { if ($invoice) {
$invoice->status_id = Invoice::STATUS_REVERSED; $invoice->status_id = Invoice::STATUS_REVERSED;
$invoice->save(); $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();
});
});
} }
} }

View File

@ -127,7 +127,11 @@ class DeletePayment
$paymentable_invoice->delete(); $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->restore();
$paymentable_invoice->service() $paymentable_invoice->service()

View File

@ -236,10 +236,11 @@ class Purify
public static function clean(string $html): string 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); return str_replace('%24', '$', $html);
} }
$html = str_replace('%24', '$', $html); $html = str_replace('%24', '$', $html);
libxml_use_internal_errors(true); libxml_use_internal_errors(true);

View File

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

File diff suppressed because one or more lines are too long

1
public/build/assets/app-c818527d.css vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -385,7 +385,7 @@
"src": "resources/js/setup/setup.js" "src": "resources/js/setup/setup.js"
}, },
"resources/sass/app.scss": { "resources/sass/app.scss": {
"file": "assets/app-9454bf28.css", "file": "assets/app-c818527d.css",
"isEntry": true, "isEntry": true,
"src": "resources/sass/app.scss" "src": "resources/sass/app.scss"
} }