Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 03:14:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for admin urls

Browse Source
This commit is contained in:
David Bomba 2023-06-07 17:15:04 +10:00
parent 055596cfe6
commit e6e190240f
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Jobs/Quote/QuoteCheckExpired.php
View File

@ -95,7 +95,6 @@ class QuoteCheckExpired implements ShouldQueue
private function queueExpiredQuoteNotification(Quote $quote) private function queueExpiredQuoteNotification(Quote $quote)
{ {
$nmo = new NinjaMailerObject; $nmo = new NinjaMailerObject;
$nmo->mailable = new NinjaMailer((new QuoteExpiredObject($quote, $quote->company))->build());
$nmo->company = $quote->company; $nmo->company = $quote->company;
$nmo->settings = $quote->company->settings; $nmo->settings = $quote->company->settings;
@ -107,6 +106,8 @@ class QuoteCheckExpired implements ShouldQueue
if (! $user) { if (! $user) {
continue; continue;
} }
$nmo->mailable = new NinjaMailer((new QuoteExpiredObject($quote, $quote->company, $company_user->portalType()))->build());
/* Returns an array of notification methods */ /* Returns an array of notification methods */
$methods = $this->findUserNotificationTypes($quote->invitations()->first(), $company_user, 'quote', ['all_notifications', 'quote_expired', 'quote_expired_all', 'quote_expired_user']); $methods = $this->findUserNotificationTypes($quote->invitations()->first(), $company_user, 'quote', ['all_notifications', 'quote_expired', 'quote_expired_all', 'quote_expired_user']);

2
app/Listeners/Quote/QuoteApprovedNotification.php
View File

@ -61,7 +61,7 @@ class QuoteApprovedNotification implements ShouldQueue
unset($methods[$key]); unset($methods[$key]);
$nmo = new NinjaMailerObject; $nmo = new NinjaMailerObject;
$nmo->mailable = new NinjaMailer((new QuoteApprovedObject($quote, $event->company))->build()); $nmo->mailable = new NinjaMailer((new QuoteApprovedObject($quote, $event->company, $company_user->portalType()))->build());
$nmo->company = $quote->company; $nmo->company = $quote->company;
$nmo->settings = $quote->company->settings; $nmo->settings = $quote->company->settings;

2
app/Mail/Admin/QuoteExpiredObject.php
View File

@ -84,7 +84,7 @@ class QuoteExpiredObject
] ]
), ),
'url' => $this->quote->invitations->first()->getAdminLink($this->use_react_url), 'url' => $this->quote->invitations->first()->getAdminLink($this->use_react_url),
'button' => ctrans('texts.view_quote'), 'button' => $this->use_react_url ? ctrans('texts.view_quote') : ctrans('texts.login'),
'signature' => $settings->email_signature, 'signature' => $settings->email_signature,
'logo' => $this->company->present()->logo(), 'logo' => $this->company->present()->logo(),
'settings' => $settings, 'settings' => $settings,

2
app/Models/PurchaseOrderInvitation.php
View File

@ -203,7 +203,7 @@ class PurchaseOrderInvitation extends BaseModel
{ {
$entity_type = Str::snake(class_basename($this->entityType())); $entity_type = Str::snake(class_basename($this->entityType()));
return config('ninja.app_url')."/#/{$entity_type}/{$this->{$entity_type}->hashed_id}/edit"; return config('ninja.react_url')."/{$entity_type}s/{$this->{$entity_type}->hashed_id}/edit";
} }
} }

2
app/PaymentDrivers/StripePaymentDriver.php
View File

@ -664,7 +664,7 @@ class StripePaymentDriver extends BaseDriver
} }
public function processWebhookRequest(PaymentWebhookRequest $request) public function processWebhookRequest(PaymentWebhookRequest $request)
{nlog($request->all()); {
if ($request->type === 'customer.source.updated') { if ($request->type === 'customer.source.updated') {
$ach = new ACH($this); $ach = new ACH($this);
$ach->updateBankAccount($request->all()); $ach->updateBankAccount($request->all());