mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2026-03-03 02:57:01 +00:00
Fixes for docuninja _key accessor keys
This commit is contained in:
@@ -88,7 +88,7 @@ class InvoiceController extends Controller
|
||||
if ($request->query('mode') === 'fullscreen') {
|
||||
return render('invoices.show-fullscreen', $data);
|
||||
}
|
||||
|
||||
|
||||
$default_flow = auth()->guard('contact')->user()->client->getSetting('payment_flow') == 'default';
|
||||
|
||||
if($default_flow){
|
||||
@@ -274,6 +274,7 @@ class InvoiceController extends Controller
|
||||
'total' => $total,
|
||||
'variables' => $variables,
|
||||
'invitation' => $invitation,
|
||||
'_key' => $invitation ? $invitation->key : false,
|
||||
'db' => $invitation->company->db,
|
||||
'docuninja_active' => false,
|
||||
'requires_signature' => $invoices->first()->client->getSetting('require_invoice_signature') && $invoices->first()->company->account->hasFeature(\App\Models\Account::FEATURE_INVOICE_SETTINGS),
|
||||
|
||||
@@ -159,6 +159,7 @@ class PaymentController extends Controller
|
||||
'entity_number' => $invitation->invoice->number,
|
||||
'db' => $invitation->company->db,
|
||||
'request_hash' => $request_hash,
|
||||
'_key' => $invitation->key,
|
||||
]);
|
||||
|
||||
}
|
||||
|
||||
@@ -121,6 +121,7 @@ class QuoteController extends Controller
|
||||
'entity_number' => $invitation->quote->number,
|
||||
'db' => $invitation->company->db,
|
||||
'request_hash' => $request_hash,
|
||||
'_key' => $invitation->key,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -120,6 +120,7 @@ class DocuNinja extends Component
|
||||
'invitation' => $this->document_invitation_id,
|
||||
'sig' => $this->sig,
|
||||
'company_key' => $this->company_key,
|
||||
'_key' => $this->_key,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
@@ -21,7 +21,9 @@ class Terms extends Component
|
||||
use WithSecureContext;
|
||||
|
||||
public $variables;
|
||||
|
||||
public $_key;
|
||||
|
||||
public function mount()
|
||||
{
|
||||
$this->variables = $this->getContext($this->_key)['variables'];
|
||||
|
||||
@@ -5,13 +5,11 @@ namespace App\Livewire;
|
||||
use Livewire\Component;
|
||||
use App\Libraries\MultiDB;
|
||||
use Livewire\Attributes\On;
|
||||
use App\DataMapper\InvoiceSync;
|
||||
use App\Models\QuoteInvitation;
|
||||
use App\Models\CreditInvitation;
|
||||
use App\Livewire\Flow2\DocuNinja;
|
||||
use App\Models\InvoiceInvitation;
|
||||
use Livewire\Attributes\Computed;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use App\Livewire\Flow2\DocuNinjaLoader;
|
||||
use App\Models\PurchaseOrderInvitation;
|
||||
use App\Utils\Traits\WithSecureContext;
|
||||
@@ -31,11 +29,13 @@ class Sign extends Component
|
||||
|
||||
public $initializing = true;
|
||||
|
||||
public $_key;
|
||||
|
||||
public function mount()
|
||||
{
|
||||
MultiDB::setDb($this->db);
|
||||
|
||||
$this->bulkSetContext([
|
||||
$this->bulkSetContext($this->_key, [
|
||||
'entity_type' => $this->entity_type,
|
||||
'db' => $this->db,
|
||||
'invitation_id' => $this->invitation_id,
|
||||
|
||||
@@ -6,5 +6,5 @@
|
||||
@endpush
|
||||
|
||||
@section('body')
|
||||
@livewire('sign', ['invitation_id' => $invitation_id, 'entity_type' => $entity_type, 'db' => $db, 'request_hash' => $request_hash, 'entity_number' => $entity_number])
|
||||
@livewire('sign', ['_key' => $_key, 'invitation_id' => $invitation_id, 'entity_type' => $entity_type, 'db' => $db, 'request_hash' => $request_hash, 'entity_number' => $entity_number])
|
||||
@endsection
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
@if($docuninja_active)
|
||||
<div id="docuninja-container" class="hidden">
|
||||
@livewire('sign', ['invitation_id' => $invitation->id ?? false, 'entity_type' => 'purchase_order', 'entity_number' => $purchase_order->number, 'db' => $purchase_order->company->db])
|
||||
@livewire('sign', ['invitation_id' => $invitation->id ?? false, 'entity_type' => 'purchase_order', 'entity_number' => $purchase_order->number, 'db' => $purchase_order->company->db, '_key' => $_key, 'request_hash' => $request_hash])
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user