Merge pull request #108 from khalidmaquilang/hotfix/si-123-remaining-sort-bug

SI-123 | Hotfix | add virtual field

Author: khalidmaquilang

app/Models/PurchaseOrder.php

@@ -49,24 +49,15 @@ class PurchaseOrder extends Model
      * @var string[]
      */
     protected $appends = [
-        'remaining_amount',
         'formatted_remaining_amount',
     ];
 
-    /**
-     * @return float
-     */
-    public function getRemainingAmountAttribute(): float
-    {
-        return $this->total_amount - $this->paid_amount;
-    }
-
     /**
      * @return string
      */
     public function getFormattedRemainingAmountAttribute(): string
     {
-        return number_format($this->getRemainingAmountAttribute(), 2).' '.$this->company->getCurrency();
+        return number_format($this->remaining_amount, 2).' '.$this->company->getCurrency();
     }
 
     /**

app/Models/Sale.php

@@ -62,25 +62,16 @@ class Sale extends Model
      * @var string[]
      */
     protected $appends = [
-        'remaining_amount',
         'formatted_remaining_amount',
         'formatted_discount',
     ];
 
-    /**
-     * @return float
-     */
-    public function getRemainingAmountAttribute(): float
-    {
-        return $this->total_amount - $this->paid_amount;
-    }
-
     /**
      * @return string
      */
     public function getFormattedRemainingAmountAttribute(): string
     {
-        return number_format($this->getRemainingAmountAttribute(), 2).' '.$this->company->getCurrency();
+        return number_format($this->remaining_amount, 2).' '.$this->company->getCurrency();
     }
 
     /**

database/migrations/2024_06_26_114807_alter_purchase_orders_table_additional_virtual_remaining_amount_field.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('purchase_orders', function (Blueprint $table) {
+            $table->decimal('remaining_amount')->virtualAs('total_amount - paid_amount')->after('paid_amount');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('purchase_orders', function (Blueprint $table) {
+            $table->dropColumn('remaining_amount');
+        });
+    }
+};

database/migrations/2024_06_26_114944_alter_sales_table_additional_virtual_remaining_amount_field.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('sales', function (Blueprint $table) {
+            $table->decimal('remaining_amount')->virtualAs('total_amount - paid_amount')->after('paid_amount');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('sales', function (Blueprint $table) {
+            $table->dropColumn('remaining_amount');
+        });
+    }
+};