Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 17:04:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8254 from turbo124/v5-develop

Browse Source 
fixes for light design
This commit is contained in:
David Bomba 2023-02-06 08:33:56 +11:00 committed by GitHub
commit f06a6caa80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.5.67
5.5.68

6
app/PaymentDrivers/BaseDriver.php
View File

@ -359,7 +359,11 @@ class BaseDriver extends AbstractPaymentDriver
event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
if (property_exists($this->payment_hash->data, 'billing_context') && $status == Payment::STATUS_COMPLETED) {
$billing_subscription = \App\Models\Subscription::find($this->decodePrimaryKey($this->payment_hash->data->billing_context->subscription_id));
if(is_int($this->payment_hash->data->billing_context->subscription_id))
$billing_subscription = \App\Models\Subscription::find($this->payment_hash->data->billing_context->subscription_id);
else
$billing_subscription = \App\Models\Subscription::find($this->decodePrimaryKey($this->payment_hash->data->billing_context->subscription_id));
// To access campaign hash => $this->payment_hash->data->billing_context->campaign;
// To access campaign data => Cache::get(CAMPAIGN_HASH)

4
config/ninja.php
View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.5.67',
'app_tag' => '5.5.67',
'app_version' => '5.5.68',
'app_tag' => '5.5.68',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),

12
resources/views/email/template/client.blade.php
View File

@ -110,20 +110,14 @@
position: relative;
}
.doc_links {
a.doc_links {
text-decoration: none;
padding-bottom: 10px;
display: inline-block;
}
a {
text-decoration: none;
color: inherit !important;
}
</style>
<!--[if gte mso 9]>