Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes for subscriptions

Browse Source
This commit is contained in:
David Bomba 2021-04-01 20:33:50 +11:00
parent 7cb4806a65
commit 1e83b729d5
6 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Requests/Subscription/StoreSubscriptionRequest.php
View File

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

1
app/Models/Subscription.php
View File

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

1
app/Transformers/SubscriptionTransformer.php
View File

@ -40,6 +40,7 @@ class SubscriptionTransformer extends EntityTransformer
'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),

1
app/Utils/HtmlEngine.php
View File

@ -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')];

1
app/Utils/SystemHealth.php
View File

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

30
database/migrations/2021_04_01_093128_modify_column_on_subscriptions_table.php Normal file
View File

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