form stuff done

akaunting · Apr 26, 2018 · b5e937b · b5e937b
1 parent 1e4d4cf
commit b5e937b
Show file tree

Hide file tree

Showing 23 changed files with 345 additions and 56 deletions.
diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php
@@ -242,6 +242,20 @@ public function store(Request $request)
             'description' => trans('messages.success.added', ['type' => $bill->bill_number]),
         ]);
 
+        // Recurring
+        if ($request->get('recurring_frequency') != 'no') {
+            $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
+            $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
+
+            $bill->recurring()->create([
+                'company_id' => session('company_id'),
+                'frequency' => $frequency,
+                'interval' => $interval,
+                'started_at' => $request['billed_at'],
+                'count' => (int) $request['recurring_count'],
+            ]);
+        }
+
         // Fire the event to make it extendible
         event(new BillCreated($bill));
 
@@ -444,6 +458,28 @@ public function update(Bill $bill, Request $request)
         $bill->totals()->delete();
         $this->addTotals($bill, $request, $taxes, $sub_total, $discount_total, $tax_total);
 
+        // Recurring
+        if ($request->get('recurring_frequency') != 'no') {
+            $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
+            $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
+
+            if ($bill->has('recurring')->count()) {
+                $function = 'update';
+            } else {
+                $function = 'create';
+            }
+
+            $bill->recurring()->$function([
+                'company_id' => session('company_id'),
+                'frequency' => $frequency,
+                'interval' => $interval,
+                'started_at' => $request['billed_at'],
+                'count' => (int) $request['recurring_count'],
+            ]);
+        } else {
+            $bill->recurring()->delete();
+        }
+
         // Fire the event to make it extendible
         event(new BillUpdated($bill));
 

diff --git a/app/Http/Controllers/Expenses/Payments.php b/app/Http/Controllers/Expenses/Payments.php
@@ -96,6 +96,20 @@ public function store(Request $request)
             $payment->attachMedia($media, 'attachment');
         }
 
+        // Recurring
+        if ($request->get('recurring_frequency') != 'no') {
+            $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
+            $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
+
+            $payment->recurring()->create([
+                'company_id' => session('company_id'),
+                'frequency' => $frequency,
+                'interval' => $interval,
+                'started_at' => $request['paid_at'],
+                'count' => (int) $request['recurring_count'],
+            ]);
+        }
+
         $message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]);
 
         flash($message)->success();
@@ -195,6 +209,28 @@ public function update(Payment $payment, Request $request)
             $payment->attachMedia($media, 'attachment');
         }
 
+        // Recurring
+        if ($request->get('recurring_frequency') != 'no') {
+            $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
+            $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
+
+            if ($payment->has('recurring')->count()) {
+                $function = 'update';
+            } else {
+                $function = 'create';
+            }
+
+            $payment->recurring()->$function([
+                'company_id' => session('company_id'),
+                'frequency' => $frequency,
+                'interval' => $interval,
+                'started_at' => $request['paid_at'],
+                'count' => (int) $request['recurring_count'],
+            ]);
+        } else {
+            $payment->recurring()->delete();
+        }
+
         $message = trans('messages.success.updated', ['type' => trans_choice('general.payments', 1)]);
 
         flash($message)->success();

diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php
@@ -260,6 +260,20 @@ public function store(Request $request)
         // Update next invoice number
         $this->increaseNextInvoiceNumber();
 
+        // Recurring
+        if ($request->get('recurring_frequency') != 'no') {
+            $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
+            $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
+
+            $invoice->recurring()->create([
+                'company_id' => session('company_id'),
+                'frequency' => $frequency,
+                'interval' => $interval,
+                'started_at' => $request['invoiced_at'],
+                'count' => (int) $request['recurring_count'],
+            ]);
+        }
+
         // Fire the event to make it extendible
         event(new InvoiceCreated($invoice));
 
@@ -465,6 +479,28 @@ public function update(Invoice $invoice, Request $request)
         $invoice->totals()->delete();
         $this->addTotals($invoice, $request, $taxes, $sub_total, $discount_total, $tax_total);
 
+        // Recurring
+        if ($request->get('recurring_frequency') != 'no') {
+            $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
+            $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
+
+            if ($invoice->has('recurring')->count()) {
+                $function = 'update';
+            } else {
+                $function = 'create';
+            }
+
+            $invoice->recurring()->$function([
+                'company_id' => session('company_id'),
+                'frequency' => $frequency,
+                'interval' => $interval,
+                'started_at' => $request['invoiced_at'],
+                'count' => (int) $request['recurring_count'],
+            ]);
+        } else {
+            $invoice->recurring()->delete();
+        }
+
         // Fire the event to make it extendible
         event(new InvoiceUpdated($invoice));
 

diff --git a/app/Http/Controllers/Incomes/Revenues.php b/app/Http/Controllers/Incomes/Revenues.php
@@ -98,6 +98,20 @@ public function store(Request $request)
             $revenue->attachMedia($media, 'attachment');
         }
 
+        // Recurring
+        if ($request->get('recurring_frequency') != 'no') {
+            $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
+            $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
+
+            $revenue->recurring()->create([
+                'company_id' => session('company_id'),
+                'frequency' => $frequency,
+                'interval' => $interval,
+                'started_at' => $request['paid_at'],
+                'count' => (int) $request['recurring_count'],
+            ]);
+        }
+
         $message = trans('messages.success.added', ['type' => trans_choice('general.revenues', 1)]);
 
         flash($message)->success();
@@ -197,6 +211,28 @@ public function update(Revenue $revenue, Request $request)
             $revenue->attachMedia($media, 'attachment');
         }
 
+        // Recurring
+        if ($request->get('recurring_frequency') != 'no') {
+            $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
+            $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
+
+            if ($revenue->has('recurring')->count()) {
+                $function = 'update';
+            } else {
+                $function = 'create';
+            }
+
+            $revenue->recurring()->$function([
+                'company_id' => session('company_id'),
+                'frequency' => $frequency,
+                'interval' => $interval,
+                'started_at' => $request['paid_at'],
+                'count' => (int) $request['recurring_count'],
+            ]);
+        } else {
+            $revenue->recurring()->delete();
+        }
+
         $message = trans('messages.success.updated', ['type' => trans_choice('general.revenues', 1)]);
 
         flash($message)->success();

diff --git a/app/Http/ViewComposers/Recurring.php b/app/Http/ViewComposers/Recurring.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\ViewComposers;
+
+use Illuminate\View\View;
+
+class Recurring
+{
+
+    /**
+     * Bind data to the view.
+     *
+     * @param  View  $view
+     * @return void
+     */
+    public function compose(View $view)
+    {
+        $recurring_frequencies = [
+            'no' => trans('general.no'),
+            'daily' => trans('recurring.daily'),
+            'weekly' => trans('recurring.weekly'),
+            'monthly' => trans('recurring.monthly'),
+            'yearly' => trans('recurring.yearly'),
+            'custom' => trans('recurring.custom'),
+        ];
+
+        $recurring_custom_frequencies = [
+            'daily' => trans('recurring.days'),
+            'weekly' => trans('recurring.weeks'),
+            'monthly' => trans('recurring.months'),
+            'yearly' => trans('recurring.years'),
+        ];
+
+        $view->with(['recurring_frequencies' => $recurring_frequencies, 'recurring_custom_frequencies' => $recurring_custom_frequencies]);
+    }
+}
diff --git a/app/Models/Common/Recurring.php b/app/Models/Common/Recurring.php
@@ -7,6 +7,16 @@
 class Recurring extends Model
 {
 
+    protected $table = 'recurrings';
+
+    /**
+     * Attributes that should be mass-assignable.
+     *
+     * @var array
+     */
+    protected $fillable = ['company_id', 'recurrable_id', 'recurrable_type', 'frequency', 'interval', 'started_at', 'count'];
+
+
     /**
      * Get all of the owning recurrable models.
      */

diff --git a/app/Models/Expense/Bill.php b/app/Models/Expense/Bill.php
@@ -58,46 +58,51 @@ 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()
     {
         return $this->hasMany('App\Models\Expense\BillItem');
     }
 
-    public function totals()
+    public function payments()
     {
-        return $this->hasMany('App\Models\Expense\BillTotal');
+        return $this->hasMany('App\Models\Expense\BillPayment');
     }
 
-    public function payments()
+    public function recurring()
     {
-        return $this->hasMany('App\Models\Expense\BillPayment');
+        return $this->morphOne('App\Models\Common\Recurring', 'recurrable');
     }
 
-    public function histories()
+    public function status()
     {
-        return $this->hasMany('App\Models\Expense\BillHistory');
+        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)

diff --git a/app/Models/Expense/Payment.php b/app/Models/Expense/Payment.php
@@ -44,31 +44,43 @@ 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()
+    public function category()
     {
-        return $this->belongsTo('App\Models\Setting\Currency', 'currency_code', 'code');
+        return $this->belongsTo('App\Models\Setting\Category');
     }
 
-    public function category()
+    public function currency()
     {
-        return $this->belongsTo('App\Models\Setting\Category');
+        return $this->belongsTo('App\Models\Setting\Currency', 'currency_code', 'code');
     }
 
-    public function vendor()
+    public function recurring()
     {
-        return $this->belongsTo('App\Models\Expense\Vendor');
+        return $this->morphOne('App\Models\Common\Recurring', 'recurrable');
     }
 
     public function transfers()
     {
         return $this->hasMany('App\Models\Banking\Transfer');
     }
 
+    public function vendor()
+    {
+        return $this->belongsTo('App\Models\Expense\Vendor');
+    }
+
     /**
      * Get only transfers.
      *

diff --git a/app/Models/Income/Invoice.php b/app/Models/Income/Invoice.php
@@ -59,7 +59,7 @@ class Invoice extends Model
      *
      * @var array
      */
-    protected $cloneable_relations = ['items', 'totals'];
+    protected $cloneable_relations = ['items', 'recurring', 'totals'];
 
     public function category()
     {
@@ -91,9 +91,9 @@ public function payments()
         return $this->hasMany('App\Models\Income\InvoicePayment');
     }
 
-    public function recurrings()
+    public function recurring()
     {
-        return $this->morphMany('App\Models\Common\Recurring', 'recurrable');
+        return $this->morphOne('App\Models\Common\Recurring', 'recurrable');
     }
 
     public function status()