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

Fixes for subscription webhooks

Browse Source
This commit is contained in:
David Bomba 2021-07-15 11:06:14 +10:00
parent a6146ee468
commit 46bc8fa495
3 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/Http/Requests/CompanyGateway/StoreCompanyGatewayRequest.php
View File

@ -47,27 +47,32 @@ class StoreCompanyGatewayRequest extends Request
$gateway = Gateway::where('key', $input['gateway_key'])->first();
$default_gateway_fields = json_decode($gateway->fields);
if($gateway);
{
/*Force gateway properties */
if (isset($input['config']) && is_object(json_decode($input['config']))) {
$default_gateway_fields = json_decode($gateway->fields);
foreach (json_decode($input['config']) as $key => $value) {
/*Force gateway properties */
if (isset($input['config']) && is_object(json_decode($input['config']))) {
$default_gateway_fields->{$key} = $value;
foreach (json_decode($input['config']) as $key => $value) {
$default_gateway_fields->{$key} = $value;
}
$input['config'] = json_encode($default_gateway_fields);
}
$input['config'] = json_encode($default_gateway_fields);
if (isset($input['config']))
$input['config'] = encrypt($input['config']);
if (isset($input['fees_and_limits']))
$input['fees_and_limits'] = $this->cleanFeesAndLimits($input['fees_and_limits']);
}
if (isset($input['config']))
$input['config'] = encrypt($input['config']);
if (isset($input['fees_and_limits']))
$input['fees_and_limits'] = $this->cleanFeesAndLimits($input['fees_and_limits']);
$this->replace($input);
}

2
app/Listeners/Invoice/InvoicePaidActivity.php
View File

@ -39,6 +39,7 @@ class InvoicePaidActivity implements ShouldQueue
*/
public function handle($event)
{
MultiDB::setDb($event->company->db);
$fields = new stdClass;
@ -53,6 +54,7 @@ class InvoicePaidActivity implements ShouldQueue
if($event->invoice->subscription()->exists())
{
nlog("subscription exists");
$event->invoice->subscription->service()->planPaid($event->invoice);
}

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

@ -695,10 +695,14 @@ nlog("handle plan change");
*/
public function triggerWebhook($context)
{
nlog("trigger webook");
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];
}
nlog("past first if");
$response = false;
$body = array_merge($context, [
@ -709,6 +713,8 @@ nlog("handle plan change");
$response = $this->sendLoad($this->subscription, $body);
nlog("after response");
/* Append the response to the system logger body */
if(is_array($response)){
@ -732,6 +738,7 @@ nlog("handle plan change");
$client->company,
);
nlog("ready to fire back");
if(is_array($body))
return $response;
@ -909,14 +916,24 @@ nlog("handle plan change");
public function planPaid($invoice)
{
nlog("this is a plan that has been paid");
$recurring_invoice_hashed_id = $invoice->recurring_invoice()->exists() ? $invoice->recurring_invoice->hashed_id : null;
$context = [
'context' => 'plan_paid',
'subscription' => $this->subscription->hashed_id,
'recurring_invoice' => $invoice->recurring_invoice->hashed_id,
'recurring_invoice' => $recurring_invoice_hashed_id,
'client' => $invoice->client->hashed_id,
'contact' => $invoice->client->primary_contact()->first()->hashed_id,
];
$this->triggerWebhook($context);
nlog($context);
$response = $this->triggerWebhook($context);
nlog($response);
return true;
}
}