Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 17:01:33 +02:00
Code Issues Releases Activity

Merge pull request #5972 from turbo124/v5-develop

Browse Source 
Create Ninja User on hosted platform
This commit is contained in:
David Bomba 2021-06-09 12:24:55 +10:00 committed by GitHub
commit 6d9bbf0fd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Util/Import.php
View File

@ -212,7 +212,7 @@ class Import implements ShouldQueue
} }
// if(Ninja::isHosted() && array_key_exists('ninja_tokens', $data)) // if(Ninja::isHosted() && array_key_exists('ninja_tokens', $data))
// $this->processNinjaTokens($data['ninja_tokens']); $this->processNinjaTokens($data['ninja_tokens']);
$this->setInitialCompanyLedgerBalances(); $this->setInitialCompanyLedgerBalances();

2
app/PaymentDrivers/PayPalExpressPaymentDriver.php
View File

@ -98,7 +98,7 @@ class PayPalExpressPaymentDriver extends BaseDriver
$message = [ $message = [
'server_response' => $response->getMessage(), 'server_response' => $response->getMessage(),
'data' => $this->checkout->payment_hash->data, 'data' => $this->payment_hash->data,
]; ];
SystemLogger::dispatch( SystemLogger::dispatch(

2
app/Services/Subscription/SubscriptionService.php
View File

@ -630,7 +630,7 @@ class SubscriptionService
*/ */
public function triggerWebhook($context) public function triggerWebhook($context)
{ {
if (empty($this->subscription->webhook_configuration['post_purchase_url']) || empty($this->subscription->webhook_configuration['post_purchase_rest_method'])) { if (empty($this->subscription->webhook_configuration['post_purchase_url']) || is_null($this->subscription->webhook_configuration['post_purchase_url']) || strlen($this->subscription->webhook_configuration['post_purchase_url']) < 1) {
return ["message" => "Success", "status_code" => 200]; return ["message" => "Success", "status_code" => 200];
} }