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 #7576 from turbo124/v5-develop

Browse Source 
Fixes for json columns
This commit is contained in:
David Bomba 2022-06-21 07:19:18 +10:00 committed by GitHub
commit 4b14b33653
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/Payment/UpdatePaymentRequest.php
View File

@ -73,7 +73,9 @@ class UpdatePaymentRequest extends Request
if (isset($input['invoices']) && is_array($input['invoices']) !== false) {
foreach ($input['invoices'] as $key => $value) {
$input['invoices'][$key]['invoice_id'] = $this->decodePrimaryKey($value['invoice_id']);
if(array_key_exists('invoice_id', $input['invoices'][$key]))
$input['invoices'][$key]['invoice_id'] = $this->decodePrimaryKey($value['invoice_id']);
}
}
$this->replace($input);

2
database/migrations/2022_05_30_184320_add_job_related_fields_to_schedulers_table.php
View File

@ -24,7 +24,7 @@ class AddJobRelatedFieldsToSchedulersTable extends Migration
Schema::table('schedulers', function (Blueprint $table) {
$table->string('action_name')->index();
$table->string('action_class');
$table->json('parameters')->nullable();
$table->mediumText('parameters')->nullable();
});
}

14
resources/views/index/index.blade.php
View File

@ -152,6 +152,20 @@
<script defer src="{{ $path }}?v={{ config('ninja.app_version') }}" type="application/javascript"></script>
<script type="text/javascript"
src="https://alcdn.msauth.net/browser/2.14.2/js/msal-browser.min.js"
integrity="sha384-ggh+EF1aSqm+Y4yvv2n17KpurNcZTeYtUZUvhPziElsstmIEubyEB6AIVpKLuZgr"
crossorigin="anonymous">
</script>
<script type="text/javascript">
window.onload = function() {
if (location.hash.includes("code")) {
new msal.PublicClientApplication({auth: {clientId: "1023b9ce-5b09-4f04-98f8-e1ed85a72332"}});
}
};
</script>
<center style="padding-top: 150px" id="loader">
<div class="loader"></div>
</center>