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

Merge pull request #4234 from turbo124/v5-develop

Browse Source 
Fixes for task status id on update
This commit is contained in:
David Bomba 2020-10-30 08:01:04 +11:00 committed by GitHub
commit a11dd92fba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/Task/UpdateTaskRequest.php
View File

@ -50,6 +50,10 @@ class UpdateTaskRequest extends Request
{
$input = $this->decodePrimaryKeys($this->all());
if (array_key_exists('status_id', $input) && is_string($input['status_id'])) {
$input['status_id'] = $this->decodePrimaryKey($input['status_id']);
}
$this->replace($input);
}
}

12
app/Jobs/Ninja/RefundCancelledAccount.php
View File

@ -41,15 +41,17 @@ class RefundCancelledAccount implements ShouldQueue
$plan_details = $this->account->getPlanDetails();
/* Trial user cancelling early.... */
if ($plan_details['trial_active']) {
if(!$plan_details)
return;
/* Trial user cancelling early.... */
if ($plan_details['trial_plan'])
return;
}
/* Is the plan Active? */
if (! $plan_details['active']) {
if (! $plan_details['active'])
return;
}
/* Refundable client! */

32
database/migrations/2020_10_29_204434_tasks_table_project_nullable.php Normal file
View File

@ -0,0 +1,32 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class TasksTableProjectNullable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('projects', function(Blueprint $table) {
$table->unsignedInteger('assigned_user_id')->nullable()->change();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
}