Merge pull request #4234 from turbo124/v5-develop

Fixes for task status id on update

app/Http/Requests/Task/UpdateTaskRequest.php

@@ -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);
     }
 }

app/Jobs/Ninja/RefundCancelledAccount.php

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

database/migrations/2020_10_29_204434_tasks_table_project_nullable.php

@@ -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()
+    {
+        //
+    }
+}