close #1340 Fixed: Missing edit invoice and bill item taxes.

akaunting · Mar 10, 2020 · 397b050 · 397b050
1 parent f05425b
commit 397b050
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 0 deletions.
diff --git a/app/Models/Purchase/BillItem.php b/app/Models/Purchase/BillItem.php
@@ -27,6 +27,15 @@ class BillItem extends Model
      */
     public $cloneable_relations = ['taxes'];
 
+    public static function boot()
+    {
+        parent::boot();
+
+        static::retrieved(function($model) {
+            $model->setTaxIds();
+        });
+    }
+
     public function bill()
     {
         return $this->belongsTo('App\Models\Purchase\Bill');
@@ -74,4 +83,20 @@ public function setTaxAttribute($value)
     {
         $this->attributes['tax'] = (double) $value;
     }
+
+    /**
+     * Convert tax to Array.
+     *
+     * @return void
+     */
+    public function setTaxIds()
+    {
+        $tax_ids = [];
+
+        foreach ($this->taxes as $tax) {
+            $tax_ids[] = (string) $tax->tax_id;
+        }
+
+        $this->setAttribute('tax_id', $tax_ids);
+    }
 }
diff --git a/app/Models/Sale/InvoiceItem.php b/app/Models/Sale/InvoiceItem.php
@@ -26,6 +26,15 @@ class InvoiceItem extends Model
      */
     public $cloneable_relations = ['taxes'];
 
+    public static function boot()
+    {
+        parent::boot();
+
+        static::retrieved(function($model) {
+            $model->setTaxIds();
+        });
+    }
+
     public function invoice()
     {
         return $this->belongsTo('App\Models\Sale\Invoice');
@@ -73,4 +82,20 @@ public function setTaxAttribute($value)
     {
         $this->attributes['tax'] = (double) $value;
     }
+
+    /**
+     * Convert tax to Array.
+     *
+     * @return void
+     */
+    public function setTaxIds()
+    {
+        $tax_ids = [];
+
+        foreach ($this->taxes as $tax) {
+            $tax_ids[] = (string) $tax->tax_id;
+        }
+
+        $this->setAttribute('tax_id', $tax_ids);
+    }
 }