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

Merge pull request #5377 from turbo124/v5-develop

Browse Source 
v5.1.41
This commit is contained in:
David Bomba 2021-04-08 21:08:52 +10:00 committed by GitHub
commit 88a1fda199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.1.40 5.1.41

2
app/Http/Requests/Client/StoreClientRequest.php
View File

@ -81,7 +81,7 @@ class StoreClientRequest extends Request
{ {
$input = $this->all(); $input = $this->all();
//@todo implement feature permissions for > 100 clients //@todo implement feature permissions for > 50 clients
$settings = ClientSettings::defaults(); $settings = ClientSettings::defaults();

4
app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
View File

@ -97,7 +97,9 @@ class UpdateRecurringInvoiceRequest extends Request
} }
} }
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : []; if (isset($input['line_items'])) {
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
}
if (isset($input['auto_bill'])) { if (isset($input['auto_bill'])) {
$input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']); $input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']);

8
app/Models/Credit.php
View File

@ -70,10 +70,10 @@ class Credit extends BaseModel
'custom_surcharge2', 'custom_surcharge2',
'custom_surcharge3', 'custom_surcharge3',
'custom_surcharge4', 'custom_surcharge4',
'custom_surcharge_tax1', // 'custom_surcharge_tax1',
'custom_surcharge_tax2', // 'custom_surcharge_tax2',
'custom_surcharge_tax3', // 'custom_surcharge_tax3',
'custom_surcharge_tax4', // 'custom_surcharge_tax4',
'design_id', 'design_id',
'assigned_user_id', 'assigned_user_id',
'exchange_rate', 'exchange_rate',

12
app/Models/Invoice.php
View File

@ -84,10 +84,10 @@ class Invoice extends BaseModel
'custom_surcharge2', 'custom_surcharge2',
'custom_surcharge3', 'custom_surcharge3',
'custom_surcharge4', 'custom_surcharge4',
'custom_surcharge_tax1', // 'custom_surcharge_tax1',
'custom_surcharge_tax2', // 'custom_surcharge_tax2',
'custom_surcharge_tax3', // 'custom_surcharge_tax3',
'custom_surcharge_tax4', // 'custom_surcharge_tax4',
'design_id', 'design_id',
'assigned_user_id', 'assigned_user_id',
'exchange_rate', 'exchange_rate',
@ -103,10 +103,6 @@ class Invoice extends BaseModel
'updated_at' => 'timestamp', 'updated_at' => 'timestamp',
'created_at' => 'timestamp', 'created_at' => 'timestamp',
'deleted_at' => 'timestamp', 'deleted_at' => 'timestamp',
'custom_surcharge_tax1' => 'bool',
'custom_surcharge_tax2' => 'bool',
'custom_surcharge_tax3' => 'bool',
'custom_surcharge_tax4' => 'bool',
]; ];
protected $with = []; protected $with = [];

8
app/Models/Quote.php
View File

@ -71,10 +71,10 @@ class Quote extends BaseModel
'custom_surcharge2', 'custom_surcharge2',
'custom_surcharge3', 'custom_surcharge3',
'custom_surcharge4', 'custom_surcharge4',
'custom_surcharge_tax1', // 'custom_surcharge_tax1',
'custom_surcharge_tax2', // 'custom_surcharge_tax2',
'custom_surcharge_tax3', // 'custom_surcharge_tax3',
'custom_surcharge_tax4', // 'custom_surcharge_tax4',
'design_id', 'design_id',
'assigned_user_id', 'assigned_user_id',
'exchange_rate', 'exchange_rate',

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

@ -182,6 +182,11 @@ class SubscriptionService
} }
public function createChangePlanInvoice($data)
{
}
public function createInvoice($data): ?\App\Models\Invoice public function createInvoice($data): ?\App\Models\Invoice
{ {

3
app/Utils/Traits/GeneratesCounter.php
View File

@ -426,6 +426,9 @@ trait GeneratesCounter
} }
switch ($client->company->reset_counter_frequency_id) { switch ($client->company->reset_counter_frequency_id) {
case RecurringInvoice::FREQUENCY_DAILY:
$reset_date->addDay();
break;
case RecurringInvoice::FREQUENCY_WEEKLY: case RecurringInvoice::FREQUENCY_WEEKLY:
$reset_date->addWeek(); $reset_date->addWeek();
break; break;

2
config/ninja.php
View File

@ -14,7 +14,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''), 'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.1.40', 'app_version' => '5.1.41',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),