Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-30 20:24:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for tests

Browse Source
This commit is contained in:
David Bomba 2023-05-28 18:44:08 +10:00
parent 89ce1f737a
commit 74be2dd141
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Entity/CreateEntityPdf.php
View File

@ -47,7 +47,7 @@ class CreateEntityPdf implements ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, NumberFormatter, MakesInvoiceHtml, PdfMaker, MakesHash, PageNumbering; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, NumberFormatter, MakesInvoiceHtml, PdfMaker, MakesHash, PageNumbering;
public Invoice | Quote | Credit | RecurringInvoice $entity; public $entity;
public $company; public $company;

21
resources/views/portal/ninja2020/plan/trial.blade.php
View File

@ -1458,7 +1458,8 @@ Ensure the default browser behavior of the `hidden` attribute.
id="name" id="name"
placeholder="{{ ctrans('texts.name') }}" placeholder="{{ ctrans('texts.name') }}"
name="name" name="name"
value="{{$client->present()->name()}}" value="{{$client->name}}"
required
/> />
</div> </div>
<div class="form-group mb-[10px]"> <div class="form-group mb-[10px]">
@ -1822,6 +1823,23 @@ var country_value = e.options[e.selectedIndex].value;
.getElementById('pay-now') .getElementById('pay-now')
.addEventListener('click', () => { .addEventListener('click', () => {
//make sure the user has entered their name
if (document.querySelector('input[name=name]').value == '') {
let errors = document.getElementById('errors');
let payNowButton = document.getElementById('pay-now');
errors.textContent = '';
errors.textContent = "{{ ctrans('texts.please_enter_a_name') }}";
errors.hidden = false;
payNowButton.disabled = false;
payNowButton.querySelector('svg').classList.add('hidden');
payNowButton.querySelector('span').classList.remove('hidden');
return;
}
let payNowButton = document.getElementById('pay-now'); let payNowButton = document.getElementById('pay-now');
payNowButton = payNowButton; payNowButton = payNowButton;
payNowButton.disabled = true; payNowButton.disabled = true;
@ -1832,6 +1850,7 @@ var country_value = e.options[e.selectedIndex].value;
payment_method_data: { payment_method_data: {
billing_details: { billing_details: {
name: document.querySelector('input[name=name]').content, name: document.querySelector('input[name=name]').content,
email: '{{ $client->present()->email() }}',
address: { address: {
line1: document.querySelector('input[name=address1]').content, line1: document.querySelector('input[name=address1]').content,
line2: document.querySelector('input[name=address2]').content, line2: document.querySelector('input[name=address2]').content,

4
tests/MockAccountData.php
View File

@ -184,6 +184,8 @@ trait MockAccountData
*/ */
public $scheduler; public $scheduler;
public $contact;
public function makeTestData() public function makeTestData()
{ {
config(['database.default' => config('ninja.db.default')]); config(['database.default' => config('ninja.db.default')]);
@ -326,6 +328,8 @@ trait MockAccountData
'send_email' => true, 'send_email' => true,
]); ]);
$this->contact = $contact;
$this->payment = Payment::factory()->create([ $this->payment = Payment::factory()->create([
'user_id' => $user_id, 'user_id' => $user_id,
'client_id' => $this->client->id, 'client_id' => $this->client->id,