From 05336abd014e0585f04fa6bb0632882e2206bd4e Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Wed, 15 Nov 2017 21:53:40 +0300
Subject: [PATCH] working on #40

---
 app/Http/Controllers/Incomes/Invoices.php     | 70 +++++++++----------
 resources/views/expenses/bills/show.blade.php |  4 --
 .../views/incomes/invoices/show.blade.php     |  4 --
 routes/web.php                                |  3 +-
 4 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php
index dd9573586..2a7698fcc 100644
--- a/app/Http/Controllers/Incomes/Invoices.php
+++ b/app/Http/Controllers/Incomes/Invoices.php
@@ -407,41 +407,6 @@ class Invoices extends Controller
         return redirect()->back();
     }
 
-    /**
-     * Mark the invoice as paid.
-     *
-     * @param  Invoice $invoice
-     *
-     * @return Response
-     */
-    public function payInvoice(Invoice $invoice)
-    {
-        $paid = 0;
-
-        foreach ($invoice->payments as $item) {
-            $item->default_currency_code = $invoice->currency_code;
-
-            $paid += $item->getDynamicConvertedAmount();
-        }
-
-        $amount = $invoice->amount - $paid;
-
-        $request = new PaymentRequest();
-
-        $request['company_id'] = $invoice->company_id;
-        $request['invoice_id'] = $invoice->id;
-        $request['account_id'] = setting('general.default_account');
-        $request['payment_method'] = setting('general.default_payment_method');
-        $request['currency_code'] = $invoice->currency_code;
-        $request['amount'] = $amount;
-        $request['paid_at'] = Date::now();
-        $request['_token'] = csrf_token();
-
-        $this->payment($request);
-
-        return redirect()->back();
-    }
-
     /**
      * Print the invoice.
      *
@@ -501,6 +466,41 @@ class Invoices extends Controller
         return $pdf->download($file_name);
     }
 
+    /**
+     * Mark the invoice as paid.
+     *
+     * @param  Invoice $invoice
+     *
+     * @return Response
+     */
+    public function markPaid(Invoice $invoice)
+    {
+        $paid = 0;
+
+        foreach ($invoice->payments as $item) {
+            $item->default_currency_code = $invoice->currency_code;
+
+            $paid += $item->getDynamicConvertedAmount();
+        }
+
+        $amount = $invoice->amount - $paid;
+
+        $request = new PaymentRequest();
+
+        $request['company_id'] = $invoice->company_id;
+        $request['invoice_id'] = $invoice->id;
+        $request['account_id'] = setting('general.default_account');
+        $request['payment_method'] = setting('general.default_payment_method');
+        $request['currency_code'] = $invoice->currency_code;
+        $request['amount'] = $amount;
+        $request['paid_at'] = Date::now();
+        $request['_token'] = csrf_token();
+
+        $this->payment($request);
+
+        return redirect()->back();
+    }
+
     /**
      * Add payment to the invoice.
      *
diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php
index f192f1f3a..80047a964 100644
--- a/resources/views/expenses/bills/show.blade.php
+++ b/resources/views/expenses/bills/show.blade.php
@@ -373,10 +373,6 @@
                 });
             });
 
-            $(document).on('click', '#button-pdf', function (e) {
-                location.href = "{{ url('expenses/bills/' . $bill->id . '/pdf') }}";
-            });
-
             $(document).on('click', '#button-email', function (e) {
                 $('#email-modal').remove();
 
diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php
index 24e621092..8a07b1325 100644
--- a/resources/views/incomes/invoices/show.blade.php
+++ b/resources/views/incomes/invoices/show.blade.php
@@ -378,10 +378,6 @@
                 });
             });
 
-            $(document).on('click', '#button-pdf', function (e) {
-                location.href = "{{ url('incomes/invoices/' . $invoice->id . '/pdf') }}";
-            });
-
             $(document).on('click', '#button-email', function (e) {
                 $('#email-modal').remove();
 
diff --git a/routes/web.php b/routes/web.php
index 1ca040427..4019d533b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -45,7 +45,8 @@ Route::group(['middleware' => 'language'], function () {
                 Route::get('customers/currency', 'Incomes\Customers@currency');
                 Route::resource('customers', 'Incomes\Customers');
                 Route::get('invoices/{invoice}/sent', 'Incomes\Invoices@markSent');
-                Route::get('invoices/{invoice}/pay', 'Incomes\Invoices@payInvoice');
+                Route::get('invoices/{invoice}/email', 'Incomes\Invoices@emailInvoice');
+                Route::get('invoices/{invoice}/pay', 'Incomes\Invoices@markPaid');
                 Route::get('invoices/{invoice}/print', 'Incomes\Invoices@printInvoice');
                 Route::get('invoices/{invoice}/pdf', 'Incomes\Invoices@pdfInvoice');
                 Route::post('invoices/payment', 'Incomes\Invoices@payment');