Merge pull request #31 from coolerParty/feature_24_detailed_statement…

…_of_financial_position Detailed Statement of financial position Report/PDF added. Account Ch…
coolerParty · Nov 25, 2022 · 66af0d2 · 66af0d2
2 parents b5b0b3c + 579820f
commit 66af0d2
Show file tree

Hide file tree

Showing 8 changed files with 1,279 additions and 588 deletions.
diff --git a/app/Http/Controllers/FinancialStatementReportController.php b/app/Http/Controllers/FinancialStatementReportController.php
diff --git a/app/Models/AccountChart.php b/app/Models/AccountChart.php
@@ -11,7 +11,7 @@ class AccountChart extends Model
     protected $table = "account_charts";
 
     protected $fillable = [
-        'code', 'name','acctgrp_id','mjracctgrp_id','submjracctgrp_id'
+        'code', 'name','acctgrp_id','mjracctgrp_id','submjracctgrp_id', 'current_non'
     ];
 
     public function accountGroup()

diff --git a/app/Models/AccountGroup.php b/app/Models/AccountGroup.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class AccountGroup extends Model
 {
@@ -14,4 +15,9 @@ class AccountGroup extends Model
     protected $fillable = [
         'code', 'name','seq_no'
     ];
+
+    public function accountCharts() : HasMany
+    {
+        return $this->hasMany(AccountChart::Class,'acctgrp_id');
+    }
 }
diff --git a/app/Models/MajorAccountGroup.php b/app/Models/MajorAccountGroup.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class MajorAccountGroup extends Model
 {
@@ -15,4 +16,8 @@ class MajorAccountGroup extends Model
         'code', 'name','seq_no'
     ];
 
+    public function accountCharts() : HasMany
+    {
+        return $this->hasMany(AccountChart::Class,'mjracctgrp_id');
+    }
 }
diff --git a/app/Models/SubMajorAccountGroup.php b/app/Models/SubMajorAccountGroup.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class SubMajorAccountGroup extends Model
 {
@@ -15,4 +16,9 @@ class SubMajorAccountGroup extends Model
         'code', 'name','seq_no'
     ];
 
+    public function accountCharts() : HasMany
+    {
+        return $this->hasMany(AccountChart::Class,'submjracctgrp_id');
+    }
+
 }
diff --git a/database/migrations/2022_06_23_102742_create_account_charts_table.php b/database/migrations/2022_06_23_102742_create_account_charts_table.php
@@ -20,6 +20,7 @@ public function up()
             $table->BigInteger('acctgrp_id')->unsigned()->nullable();
             $table->BigInteger('mjracctgrp_id')->unsigned()->nullable();
             $table->BigInteger('submjracctgrp_id')->unsigned()->nullable();
+            $table->tinyInteger('current_non')->nullable(); // 1=Current, 2, Non-current,
             $table->timestamps();
             $table->foreign('acctgrp_id')->references('id')->on('account_groups');
             $table->foreign('mjracctgrp_id')->references('id')->on('major_account_groups');

diff --git a/database/seeders/AccountChartSeeder.php b/database/seeders/AccountChartSeeder.php