Merge pull request #5311 from turbo124/v5-develop

Fixes for subscriptions

app/Http/Requests/Subscription/StoreSubscriptionRequest.php

@@ -54,7 +54,7 @@ class StoreSubscriptionRequest extends Request
             'plan_map' => ['sometimes'],
             'refund_period' => ['sometimes'],
             'webhook_configuration' => ['array'],
-            'name' => Rule::unique('subscriptions')->where('company_id', auth()->user()->company()->id)
+            'name' => ['required', Rule::unique('subscriptions')->where('company_id', auth()->user()->company()->id)]
         ];
     }
 
@@ -62,12 +62,6 @@ class StoreSubscriptionRequest extends Request
     {
         $input = $this->all();
 
-        // if(array_key_exists('webhook_configuration', $input) && (!is_object(json_decode($input['webhook_configuration']))))
-        //     $input['webhook_configuration'] = new \stdClass;
-        
-        // if(!array_key_exists('webhook_configuration', $input))
-        //     $input['webhook_configuration'] = new \stdClass;
-
         $this->replace($input);
     }
 }

app/Models/Subscription.php

@@ -21,6 +21,7 @@ class Subscription extends BaseModel
     use HasFactory, SoftDeletes;
 
     protected $fillable = [
+        'assigned_user_id',
         'product_ids',
         'recurring_product_ids',
         'frequency_id',

app/Transformers/SubscriptionTransformer.php

@@ -33,13 +33,13 @@ class SubscriptionTransformer extends EntityTransformer
 
     public function transform(Subscription $subscription): array
     {
-        $std = new \stdClass;
 
         return [
             'id' => $this->encodePrimaryKey($subscription->id),
             'user_id' => $this->encodePrimaryKey($subscription->user_id),
             'group_id' => $this->encodePrimaryKey($subscription->group_id),
             'product_ids' => (string)$subscription->product_ids,
+            'name' => (string)$subscription->name,
             'recurring_product_ids' => (string)$subscription->recurring_product_ids,
             'assigned_user_id' => $this->encodePrimaryKey($subscription->assigned_user_id),
             'company_id' => $this->encodePrimaryKey($subscription->company_id),
@@ -60,7 +60,7 @@ class SubscriptionTransformer extends EntityTransformer
             'allow_plan_changes' => (bool)$subscription->allow_plan_changes,
             'plan_map' => (string)$subscription->plan_map,
             'refund_period' => (int)$subscription->refund_period,
-            'webhook_configuration' => $subscription->webhook_configuration ?: $std,
+            'webhook_configuration' => $subscription->webhook_configuration ?: [],
             'purchase_page' => (string)route('client.subscription.purchase', $subscription->hashed_id),
             'is_deleted' => (bool)$subscription->is_deleted,
             'created_at' => (int)$subscription->created_at,

app/Utils/HtmlEngine.php

@@ -192,6 +192,7 @@ class HtmlEngine
         $data['$taxes'] = ['value' => Number::formatMoney($this->entity_calc->getItemTotalTaxes(), $this->client) ?: ' ', 'label' => ctrans('texts.taxes')];
         $data['$invoice.taxes'] = &$data['$taxes'];
 
+        $data['$user.name'] = ['value' => $this->entity->user->present()->name(), 'label' => ctrans('texts.name')];
         $data['$user_iban'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'company1', $this->settings->custom_value1, $this->client) ?: ' ', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'company1')];
         $data['$invoice.custom1'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'invoice1', $this->entity->custom_value1, $this->client) ?: ' ', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'invoice1')];
         $data['$invoice.custom2'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'invoice2', $this->entity->custom_value2, $this->client) ?: ' ', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'invoice2')];

app/Utils/SystemHealth.php

@@ -79,6 +79,7 @@ class SystemHealth
             'exec' => (bool)self::checkExecWorks(),
             'open_basedir' => (bool)self::checkOpenBaseDir(),
             'mail_mailer' => (string)self::checkMailMailer(),
+            'flutter_renderer' => (string)config('ninja.flutter_canvas_kit'),
         ];
     }
 

database/migrations/2021_04_01_093128_modify_column_on_subscriptions_table.php

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

tests/Feature/SubscriptionApiTest.php

@@ -11,14 +11,15 @@
 
 namespace Tests\Feature;
 
-use App\Models\Subscription;
 use App\Models\Product;
+use App\Models\Subscription;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Str;
 use Tests\MockAccountData;
 use Tests\TestCase;
 
@@ -55,6 +56,7 @@ class SubscriptionApiTest extends TestCase
         $billing_subscription = Subscription::factory()->create([
             'product_ids' => $product->id,
             'company_id' => $this->company->id,
+            'name' => Str::random(5)
         ]);
 
 
@@ -78,7 +80,7 @@ class SubscriptionApiTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/subscriptions', ['product_ids' => $product->id, 'allow_cancellation' => true]);
+        ])->post('/api/v1/subscriptions', ['product_ids' => $product->id, 'allow_cancellation' => true, 'name' => Str::random(5)]);
 
         // nlog($response);
         $response->assertStatus(200);
@@ -93,7 +95,7 @@ class SubscriptionApiTest extends TestCase
 
         $response1 = $this
             ->withHeaders(['X-API-SECRET' => config('ninja.api_secret'),'X-API-TOKEN' => $this->token])
-            ->post('/api/v1/subscriptions', ['product_ids' => $product->id])
+            ->post('/api/v1/subscriptions', ['product_ids' => $product->id,            'name' => Str::random(5)])
             ->assertStatus(200)
             ->json();
 
@@ -126,6 +128,7 @@ class SubscriptionApiTest extends TestCase
         $billing_subscription = Subscription::factory()->create([
             'product_ids' => $product->id,
             'company_id' => $this->company->id,
+            'name' => Str::random(5)
         ]);
 
         $response = $this