diff --git a/app/Models/Subscription.php b/app/Models/Subscription.php index 6bac62e44341..41ac945b2866 100644 --- a/app/Models/Subscription.php +++ b/app/Models/Subscription.php @@ -54,6 +54,9 @@ class Subscription extends BaseModel 'price', 'name', 'currency_id', + 'registration_required', + 'optional_product_ids', + 'optional_recurring_product_ids', ]; protected $casts = [ diff --git a/app/Transformers/BankTransactionTransformer.php b/app/Transformers/BankTransactionTransformer.php index ccd0de45687a..f633e050e8cd 100644 --- a/app/Transformers/BankTransactionTransformer.php +++ b/app/Transformers/BankTransactionTransformer.php @@ -67,6 +67,7 @@ class BankTransactionTransformer extends EntityTransformer 'invoice_ids' => (string) $bank_transaction->invoice_ids ?: '', 'expense_id'=> (string) $this->encodePrimaryKey($bank_transaction->expense_id) ?: '', 'vendor_id'=> (string) $this->encodePrimaryKey($bank_transaction->vendor_id) ?: '', + 'bank_rule_id' => (string) $this->encodePrimaryKey($bank_transaction->bank_rule_id) ?: '', 'is_deleted' => (bool) $bank_transaction->is_deleted, 'created_at' => (int) $bank_transaction->created_at, 'updated_at' => (int) $bank_transaction->updated_at, diff --git a/database/migrations/2022_11_22_215618_lock_tasks_when_invoiced.php b/database/migrations/2022_11_22_215618_lock_tasks_when_invoiced.php index 19f7f4b594a8..52dea5fad0bc 100644 --- a/database/migrations/2022_11_22_215618_lock_tasks_when_invoiced.php +++ b/database/migrations/2022_11_22_215618_lock_tasks_when_invoiced.php @@ -27,6 +27,15 @@ return new class extends Migration { $table->bigInteger('bank_rule_id')->nullable(); }); + + Schema::table('subscriptions', function (Blueprint $table) + { + $table->boolean('registration_required')->default(false); + $table->text('optional_product_ids')->nullable(); + $table->text('optional_recurring_product_ids')->nullable(); + + }); + } /**