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

Fixes for event parameters

Browse Source
This commit is contained in:
David Bomba 2020-07-14 08:06:28 +10:00
parent 5af23a4072
commit 1d7ba6d1e6
6 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/DemoMode.php
View File

@ -7,6 +7,7 @@ use App\Events\Invoice\InvoiceWasCreated;
use App\Factory\InvoiceFactory; use App\Factory\InvoiceFactory;
use App\Factory\InvoiceItemFactory; use App\Factory\InvoiceItemFactory;
use App\Helpers\Invoice\InvoiceSum; use App\Helpers\Invoice\InvoiceSum;
use App\Jobs\Util\VersionCheck;
use App\Models\CompanyToken; use App\Models\CompanyToken;
use App\Models\Country; use App\Models\Country;
use App\Models\Product; use App\Models\Product;
@ -77,6 +78,7 @@ class DemoMode extends Command
$this->info("Seeding Random Data"); $this->info("Seeding Random Data");
$this->createSmallAccount(); $this->createSmallAccount();
VersionCheck::dispatchNow();
} }

2
app/Http/Controllers/ClientPortal/InvitationController.php
View File

@ -48,7 +48,7 @@ class InvitationController extends Controller
if (!request()->has('silent')) { if (!request()->has('silent')) {
$invitation->markViewed(); $invitation->markViewed();
event(new InvitationWasViewed($entity, $invitation, $entity->company, Ninja::eventVars())); event(new InvitationWasViewed($invitation->{$entity}, $invitation, $invitation->{$entity}->company, Ninja::eventVars()));
} }
return redirect()->route('client.'.$entity.'.show', [$entity => $this->encodePrimaryKey($invitation->{$key})]); return redirect()->route('client.'.$entity.'.show', [$entity => $this->encodePrimaryKey($invitation->{$key})]);

4
app/Listeners/Misc/InvitationViewedListener.php
View File

@ -40,9 +40,9 @@ class InvitationViewedListener implements ShouldQueue
*/ */
public function handle($event) public function handle($event)
{ {
MultiDB::setDb($event->company->db); MultiDB::setDb($event->company->db);
$entity_name = $event->entity; $entity_name = lcfirst(class_basename($event->entity));
$invitation = $event->invitation; $invitation = $event->invitation;
$notification = new EntityViewedNotification($invitation, $entity_name); $notification = new EntityViewedNotification($invitation, $entity_name);

3
app/Mail/Admin/EntityPaidObject.php
View File

@ -85,7 +85,8 @@ class EntityPaidObject
'invoice' => $invoice_texts, 'invoice' => $invoice_texts,
] ]
), ),
'url' => config('ninja.app_url') . '/payments/' . $this->payment->hashed_id, 'url' => config('ninja.app_url'),
// 'url' => config('ninja.app_url') . '/payments/' . $this->payment->hashed_id, //because we have no deep linking we cannot use this
'button' => ctrans('texts.view_payment'), 'button' => ctrans('texts.view_payment'),
'signature' => $settings->email_signature, 'signature' => $settings->email_signature,
'logo' => $this->company->present()->logo(), 'logo' => $this->company->present()->logo(),

1
app/PaymentDrivers/AuthorizePaymentDriver.php
View File

@ -14,6 +14,7 @@ namespace App\PaymentDrivers;
use App\Models\ClientGatewayToken; use App\Models\ClientGatewayToken;
use App\Models\GatewayType; use App\Models\GatewayType;
use App\Models\Invoice;
use App\Models\Payment; use App\Models\Payment;
use App\PaymentDrivers\Authorize\AuthorizeCreditCard; use App\PaymentDrivers\Authorize\AuthorizeCreditCard;
use App\PaymentDrivers\Authorize\AuthorizePaymentMethod; use App\PaymentDrivers\Authorize\AuthorizePaymentMethod;

6
app/Utils/Traits/Inviteable.php
View File

@ -55,14 +55,14 @@ trait Inviteable
switch ($this->company->portal_mode) { switch ($this->company->portal_mode) {
case 'subdomain': case 'subdomain':
return $domain .'/client/'. $entity_type .'/'. $this->key; return $domain .'client/'. $entity_type .'/'. $this->key;
break; break;
case 'iframe': case 'iframe':
return $domain .'/client/'. $entity_type .'/'. $this->key; return $domain .'client/'. $entity_type .'/'. $this->key;
//return $domain . $entity_type .'/'. $this->contact->client->client_hash .'/'. $this->key; //return $domain . $entity_type .'/'. $this->contact->client->client_hash .'/'. $this->key;
break; break;
case 'domain': case 'domain':
return $domain .'/client/'. $entity_type .'/'. $this->key; return $domain .'client/'. $entity_type .'/'. $this->key;
break; break;
} }