mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-31 21:54:35 -04:00
minor fixes
This commit is contained in:
parent
b566bf6a7f
commit
2d8fc80779
@ -33,6 +33,8 @@ class GmailTransport extends AbstractTransport
|
|||||||
nlog("In Do Send");
|
nlog("In Do Send");
|
||||||
$message = MessageConverter::toEmail($message->getOriginalMessage());
|
$message = MessageConverter::toEmail($message->getOriginalMessage());
|
||||||
|
|
||||||
|
|
||||||
|
/** @phpstan-ignore-next-line */
|
||||||
$token = $message->getHeaders()->get('gmailtoken')->getValue();
|
$token = $message->getHeaders()->get('gmailtoken')->getValue();
|
||||||
$message->getHeaders()->remove('gmailtoken');
|
$message->getHeaders()->remove('gmailtoken');
|
||||||
|
|
||||||
@ -52,6 +54,8 @@ class GmailTransport extends AbstractTransport
|
|||||||
if ($bccs) {
|
if ($bccs) {
|
||||||
$bcc_list = 'Bcc: ';
|
$bcc_list = 'Bcc: ';
|
||||||
|
|
||||||
|
|
||||||
|
/** @phpstan-ignore-next-line */
|
||||||
foreach ($bccs->getAddresses() as $address) {
|
foreach ($bccs->getAddresses() as $address) {
|
||||||
$bcc_list .= $address->getAddress() .',';
|
$bcc_list .= $address->getAddress() .',';
|
||||||
}
|
}
|
||||||
|
@ -186,7 +186,7 @@ class BillingPortalPurchase extends Component
|
|||||||
{
|
{
|
||||||
MultiDB::setDb($this->db);
|
MultiDB::setDb($this->db);
|
||||||
|
|
||||||
$this->subscription = Subscription::with('company')->find($this->subscription);
|
$this->subscription = Subscription::query()->with('company')->find($this->subscription);
|
||||||
|
|
||||||
$this->company = $this->subscription->company;
|
$this->company = $this->subscription->company;
|
||||||
|
|
||||||
|
@ -165,7 +165,7 @@ class BillingPortalPurchasev2 extends Component
|
|||||||
{
|
{
|
||||||
MultiDB::setDb($this->db);
|
MultiDB::setDb($this->db);
|
||||||
|
|
||||||
$this->subscription = Subscription::with('company')->find($this->subscription);
|
$this->subscription = Subscription::query()->with('company')->find($this->subscription);
|
||||||
|
|
||||||
$this->company = $this->subscription->company;
|
$this->company = $this->subscription->company;
|
||||||
|
|
||||||
|
@ -165,6 +165,7 @@ class WepaySignup extends Component
|
|||||||
}
|
}
|
||||||
|
|
||||||
$wepay_account = $wepay->request('account/create/', $account_details);
|
$wepay_account = $wepay->request('account/create/', $account_details);
|
||||||
|
$confirmation_required = false;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$wepay->request('user/send_confirmation/', []);
|
$wepay->request('user/send_confirmation/', []);
|
||||||
@ -173,6 +174,8 @@ class WepaySignup extends Component
|
|||||||
if ($ex->getMessage() == 'This access_token is already approved.') {
|
if ($ex->getMessage() == 'This access_token is already approved.') {
|
||||||
$confirmation_required = false;
|
$confirmation_required = false;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
/** @phpstan-ignore-next-line */
|
||||||
request()->session()->flash('message', $ex->getMessage());
|
request()->session()->flash('message', $ex->getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -195,6 +198,8 @@ class WepaySignup extends Component
|
|||||||
$cg->save();
|
$cg->save();
|
||||||
|
|
||||||
if ($confirmation_required) {
|
if ($confirmation_required) {
|
||||||
|
|
||||||
|
/** @phpstan-ignore-next-line */
|
||||||
request()->session()->flash('message', trans('texts.created_wepay_confirmation_required'));
|
request()->session()->flash('message', trans('texts.created_wepay_confirmation_required'));
|
||||||
} else {
|
} else {
|
||||||
$update_uri = $wepay->request('/account/get_update_uri', [
|
$update_uri = $wepay->request('/account/get_update_uri', [
|
||||||
|
@ -10,6 +10,7 @@ parameters:
|
|||||||
- 'app/Console/Commands/*'
|
- 'app/Console/Commands/*'
|
||||||
- 'app/DataMapper/Analytics/*'
|
- 'app/DataMapper/Analytics/*'
|
||||||
- 'app/PaymentDrivers/Authorize/*'
|
- 'app/PaymentDrivers/Authorize/*'
|
||||||
|
- 'app/Utils/Traits/*'
|
||||||
universalObjectCratesClasses:
|
universalObjectCratesClasses:
|
||||||
- App\DataMapper\Tax\RuleInterface
|
- App\DataMapper\Tax\RuleInterface
|
||||||
- App\DataMapper\FeesAndLimits
|
- App\DataMapper\FeesAndLimits
|
||||||
@ -18,4 +19,5 @@ parameters:
|
|||||||
- '#Call to an undefined method [a-zA-Z0-9\\_]+::company\(\)#'
|
- '#Call to an undefined method [a-zA-Z0-9\\_]+::company\(\)#'
|
||||||
- '#Call to an undefined method [a-zA-Z0-9\\_]+::entityFilter\(\)#'
|
- '#Call to an undefined method [a-zA-Z0-9\\_]+::entityFilter\(\)#'
|
||||||
- '#Call to an undefined method [a-zA-Z0-9\\_]+::exclude\(\)#'
|
- '#Call to an undefined method [a-zA-Z0-9\\_]+::exclude\(\)#'
|
||||||
|
- '#Array has 2 duplicate keys with value#'
|
||||||
- '#Undefined method#'
|
- '#Undefined method#'
|
Loading…
x
Reference in New Issue
Block a user