form stuff done

app/Models/Expense/Bill.php

@@ -58,26 +58,21 @@ class Bill extends Model
      *
      * @var array
      */
-    protected $cloneable_relations = ['items', 'totals'];
+    protected $cloneable_relations = ['items', 'recurring', 'totals'];
 
     public function category()
     {
         return $this->belongsTo('App\Models\Setting\Category');
     }
 
-    public function vendor()
-    {
-        return $this->belongsTo('App\Models\Expense\Vendor');
-    }
-
     public function currency()
     {
         return $this->belongsTo('App\Models\Setting\Currency', 'currency_code', 'code');
     }
 
-    public function status()
+    public function histories()
     {
-        return $this->belongsTo('App\Models\Expense\BillStatus', 'bill_status_code', 'code');
+        return $this->hasMany('App\Models\Expense\BillHistory');
     }
 
     public function items()
@@ -85,19 +80,29 @@ class Bill extends Model
         return $this->hasMany('App\Models\Expense\BillItem');
     }
 
-    public function totals()
-    {
-        return $this->hasMany('App\Models\Expense\BillTotal');
-    }
-
     public function payments()
     {
         return $this->hasMany('App\Models\Expense\BillPayment');
     }
 
-    public function histories()
+    public function recurring()
     {
-        return $this->hasMany('App\Models\Expense\BillHistory');
+        return $this->morphOne('App\Models\Common\Recurring', 'recurrable');
+    }
+
+    public function status()
+    {
+        return $this->belongsTo('App\Models\Expense\BillStatus', 'bill_status_code', 'code');
+    }
+
+    public function totals()
+    {
+        return $this->hasMany('App\Models\Expense\BillTotal');
+    }
+
+    public function vendor()
+    {
+        return $this->belongsTo('App\Models\Expense\Vendor');
     }
 
     public function scopeDue($query, $date)

app/Models/Expense/Payment.php

@@ -44,24 +44,31 @@ class Payment extends Model
         'description'  ,
     ];
 
+    /**
+     * Clonable relationships.
+     *
+     * @var array
+     */
+    protected $cloneable_relations = ['recurring'];
+
     public function account()
     {
         return $this->belongsTo('App\Models\Banking\Account');
     }
 
-    public function currency()
-    {
-        return $this->belongsTo('App\Models\Setting\Currency', 'currency_code', 'code');
-    }
-
     public function category()
     {
         return $this->belongsTo('App\Models\Setting\Category');
     }
 
-    public function vendor()
+    public function currency()
     {
-        return $this->belongsTo('App\Models\Expense\Vendor');
+        return $this->belongsTo('App\Models\Setting\Currency', 'currency_code', 'code');
+    }
+
+    public function recurring()
+    {
+        return $this->morphOne('App\Models\Common\Recurring', 'recurrable');
     }
 
     public function transfers()
@@ -69,6 +76,11 @@ class Payment extends Model
         return $this->hasMany('App\Models\Banking\Transfer');
     }
 
+    public function vendor()
+    {
+        return $this->belongsTo('App\Models\Expense\Vendor');
+    }
+
     /**
      * Get only transfers.
      *