mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-21 08:51:34 +02:00
Merge pull request #5972 from turbo124/v5-develop
Create Ninja User on hosted platform
This commit is contained in:
commit
6d9bbf0fd3
@ -212,7 +212,7 @@ class Import implements ShouldQueue
|
||||
}
|
||||
|
||||
// if(Ninja::isHosted() && array_key_exists('ninja_tokens', $data))
|
||||
// $this->processNinjaTokens($data['ninja_tokens']);
|
||||
$this->processNinjaTokens($data['ninja_tokens']);
|
||||
|
||||
$this->setInitialCompanyLedgerBalances();
|
||||
|
||||
|
@ -98,7 +98,7 @@ class PayPalExpressPaymentDriver extends BaseDriver
|
||||
|
||||
$message = [
|
||||
'server_response' => $response->getMessage(),
|
||||
'data' => $this->checkout->payment_hash->data,
|
||||
'data' => $this->payment_hash->data,
|
||||
];
|
||||
|
||||
SystemLogger::dispatch(
|
||||
|
@ -630,7 +630,7 @@ class SubscriptionService
|
||||
*/
|
||||
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];
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user