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

Merge pull request #8409 from turbo124/v5-develop

Browse Source 
v5.5.101
This commit is contained in:
David Bomba 2023-03-30 16:50:17 +11:00 committed by GitHub
commit 1a5073bb0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.5.100
5.5.101

2
app/Services/Recurring/UpdatePrice.php
View File

@ -33,7 +33,7 @@ class UpdatePrice extends AbstractService
->first();
if ($product) {
$line_items[$key]->cost = floatval($product->cost);
$line_items[$key]->cost = floatval($product->price);
}
}

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.100',
'app_tag' => '5.5.100',
'app_version' => '5.5.101',
'app_tag' => '5.5.101',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),

7
tests/Feature/RecurringInvoiceTest.php
View File

@ -93,6 +93,7 @@ class RecurringInvoiceTest extends TestCase
'company_id' => $this->company->id,
'user_id' => $this->user->id,
'cost' => 20,
'price' => 20,
'product_key' => 'pink',
]);
@ -128,6 +129,7 @@ class RecurringInvoiceTest extends TestCase
'company_id' => $this->company->id,
'user_id' => $this->user->id,
'cost' => 10,
'price' => 10,
'product_key' => 'pink',
]);
@ -152,6 +154,7 @@ class RecurringInvoiceTest extends TestCase
$this->assertEquals(10, $recurring_invoice->amount);
$p->cost = 20;
$p->price = 20;
$p->save();
$recurring_invoice->service()->updatePrice();
@ -175,6 +178,7 @@ class RecurringInvoiceTest extends TestCase
'company_id' => $this->company->id,
'user_id' => $this->user->id,
'cost' => 10,
'price' => 10,
'product_key' => 'pink',
]);
@ -182,6 +186,7 @@ class RecurringInvoiceTest extends TestCase
'company_id' => $this->company->id,
'user_id' => $this->user->id,
'cost' => 20,
'price' => 20,
'product_key' => 'floyd',
]);
@ -220,9 +225,11 @@ class RecurringInvoiceTest extends TestCase
$this->assertEquals(30, $recurring_invoice->amount);
$p1->cost = 20;
$p1->price = 20;
$p1->save();
$p2->cost = 40;
$p2->price = 40;
$p2->save();
$recurring_invoice->service()->updatePrice();