Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2021-05-21 07:58:51 +10:00
commit ee0518d34f
8 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/ConnectedAccountController.php
View File

@ -160,6 +160,9 @@ class ConnectedAccountController extends BaseController
'email_verified_at' =>now() 'email_verified_at' =>now()
]; ];
if(auth()->user()->email != $google->harvestEmail($user))
return response()->json(['message' => 'Primary Email differs to OAuth email. Emails must match.'], 400);
auth()->user()->update($connected_account); auth()->user()->update($connected_account);
auth()->user()->email_verified_at = now(); auth()->user()->email_verified_at = now();
auth()->user()->save(); auth()->user()->save();

2
app/Http/Requests/Company/StoreCompanyRequest.php
View File

@ -49,7 +49,7 @@ class StoreCompanyRequest extends Request
} else { } else {
if(Ninja::isHosted()){ if(Ninja::isHosted()){
$rules['subdomain'] = ['nullable|alpha_num', new ValidSubdomain($this->all())]; $rules['subdomain'] = ['nullable', 'alpha_num', new ValidSubdomain($this->all())];
} }
else else
$rules['subdomain'] = 'nullable|alpha_num'; $rules['subdomain'] = 'nullable|alpha_num';

2
app/Http/Requests/Company/UpdateCompanyRequest.php
View File

@ -50,7 +50,7 @@ class UpdateCompanyRequest extends Request
} else { } else {
if(Ninja::isHosted()){ if(Ninja::isHosted()){
$rules['subdomain'] = ['nullable|alpha_num', new ValidSubdomain($this->all())]; $rules['subdomain'] = ['nullable', 'alpha_num', new ValidSubdomain($this->all())];
} }
else else
$rules['subdomain'] = 'nullable|alpha_num'; $rules['subdomain'] = 'nullable|alpha_num';

3
app/Listeners/Invoice/InvoiceEmailFailedActivity.php
View File

@ -43,6 +43,9 @@ class InvoiceEmailFailedActivity implements ShouldQueue
MultiDB::setDb($event->company->db); MultiDB::setDb($event->company->db);
if(strpos($event->message, 'shared/public') !== false)
$event->message = "Unable to open attachment file for reading";
$fields = new stdClass; $fields = new stdClass;
$fields->invoice_id = $event->invitation->invoice->id; $fields->invoice_id = $event->invitation->invoice->id;

7
app/Mail/Engine/CreditEmailEngine.php
View File

@ -95,9 +95,12 @@ class CreditEmailEngine extends BaseEmailEngine
->setInvitation($this->invitation); ->setInvitation($this->invitation);
if ($this->client->getSetting('pdf_email_attachment') !== false && $this->credit->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) { if ($this->client->getSetting('pdf_email_attachment') !== false && $this->credit->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
$this->setAttachments([$this->credit->pdf_file_path()]);
// $this->setAttachments(['path' => $this->credit->pdf_file_path(), 'name' => basename($this->credit->pdf_file_path())]); if(Ninja::isHosted())
$this->setAttachments([$this->credit->pdf_file_path(null, 'url', true)]);
else
$this->setAttachments([$this->credit->pdf_file_path()]);
} }
//attach third party documents //attach third party documents

7
app/Mail/Engine/InvoiceEmailEngine.php
View File

@ -106,7 +106,12 @@ class InvoiceEmailEngine extends BaseEmailEngine
->setInvitation($this->invitation); ->setInvitation($this->invitation);
if ($this->client->getSetting('pdf_email_attachment') !== false && $this->invoice->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) { if ($this->client->getSetting('pdf_email_attachment') !== false && $this->invoice->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
$this->setAttachments([$this->invoice->pdf_file_path()]);
if(Ninja::isHosted())
$this->setAttachments([$this->invoice->pdf_file_path(null, 'url', true)]);
else
$this->setAttachments([$this->invoice->pdf_file_path()]);
// $this->setAttachments(['path' => $this->invoice->pdf_file_path(), 'name' => basename($this->invoice->pdf_file_path())]); // $this->setAttachments(['path' => $this->invoice->pdf_file_path(), 'name' => basename($this->invoice->pdf_file_path())]);
} }

7
app/Mail/Engine/QuoteEmailEngine.php
View File

@ -97,8 +97,11 @@ class QuoteEmailEngine extends BaseEmailEngine
if ($this->client->getSetting('pdf_email_attachment') !== false && $this->quote->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) { if ($this->client->getSetting('pdf_email_attachment') !== false && $this->quote->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
$this->setAttachments([$this->quote->pdf_file_path()]);
//$this->setAttachments(['path' => $this->quote->pdf_file_path(), 'name' => basename($this->quote->pdf_file_path())]); if(Ninja::isHosted())
$this->setAttachments([$this->quote->pdf_file_path(null, 'url', true)]);
else
$this->setAttachments([$this->quote->pdf_file_path()]);
} }

16
app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
View File

@ -74,15 +74,15 @@ class UpdatePaymentMethods
$this->addOrUpdateCard($method, $token, GatewayType::SOFORT); $this->addOrUpdateCard($method, $token, GatewayType::SOFORT);
} }
$bank_accounts = Customer::allSources( // $bank_accounts = Customer::allSources(
$token->gateway_customer_reference, // $token->gateway_customer_reference,
['object' => 'bank_account', 'limit' => 300] // ['object' => 'bank_account', 'limit' => 300]
); // );
foreach($bank_accounts as $bank_account) // foreach($bank_accounts as $bank_account)
{ // {
$this->addOrUpdateBankAccount($bank_account, $token); // $this->addOrUpdateBankAccount($bank_account, $token);
} // }
}); });