From f69531eec7c3e1490f74e98e65669cfe264f19dc Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Mon, 27 Nov 2017 01:41:51 +0300
Subject: [PATCH] fixed #73

---
 app/Http/Controllers/Settings/Currencies.php    | 2 +-
 app/Traits/Currencies.php                       | 4 ++--
 composer.json                                   | 2 +-
 config/app.php                                  | 2 +-
 config/{clicknow.money.php => money.php}        | 0
 resources/views/expenses/bills/show.blade.php   | 2 +-
 resources/views/incomes/invoices/show.blade.php | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename config/{clicknow.money.php => money.php} (100%)

diff --git a/app/Http/Controllers/Settings/Currencies.php b/app/Http/Controllers/Settings/Currencies.php
index 7133a0ffc..05bad07b1 100644
--- a/app/Http/Controllers/Settings/Currencies.php
+++ b/app/Http/Controllers/Settings/Currencies.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Settings;
 
+use Akaunting\Money\Currency as MoneyCurrency;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Setting\Currency as Request;
 use App\Models\Banking\Account;
 use App\Models\Setting\Currency;
-use ClickNow\Money\Currency as MoneyCurrency;
 
 class Currencies extends Controller
 {
diff --git a/app/Traits/Currencies.php b/app/Traits/Currencies.php
index bee742369..45a3f05e7 100644
--- a/app/Traits/Currencies.php
+++ b/app/Traits/Currencies.php
@@ -2,8 +2,8 @@
 
 namespace App\Traits;
 
-use ClickNow\Money\Money;
-use ClickNow\Money\Currency;
+use Akaunting\Money\Money;
+use Akaunting\Money\Currency;
 
 trait Currencies
 {
diff --git a/composer.json b/composer.json
index dd1941bfc..4fe4b6b1d 100644
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,7 @@
     "require": {
         "php": ">=5.6.4",
         "akaunting/language": "1.0.*",
+        "akaunting/money": "1.0.*",
         "akaunting/setting": "1.0.*",
         "akaunting/version": "1.0.*",
         "almasaeed2010/adminlte": "2.3.*",
@@ -15,7 +16,6 @@
         "barryvdh/laravel-dompdf": "0.*",
         "barryvdh/laravel-ide-helper": "2.3.*",
         "bkwld/cloner": "3.2.*",
-        "cknow/laravel-money": "1.0.*",
         "dingo/api": "1.0.0-beta8",
         "fzaninotto/faker": "1.6.*",
         "guzzlehttp/guzzle": "6.3.*",
diff --git a/config/app.php b/config/app.php
index 305e5c6a4..bebb54ee9 100644
--- a/config/app.php
+++ b/config/app.php
@@ -184,11 +184,11 @@ return [
          * Vendor Service Providers...
          */
         Akaunting\Language\Provider::class,
+        Akaunting\Money\Provider::class,
         Akaunting\Setting\Provider::class,
         Akaunting\Version\Provider::class,
         Barryvdh\DomPDF\ServiceProvider::class,
         Bkwld\Cloner\ServiceProvider::class,
-        ClickNow\Money\MoneyServiceProvider::class,
         Collective\Html\HtmlServiceProvider::class,
         Dingo\Api\Provider\LaravelServiceProvider::class,
         EloquentFilter\ServiceProvider::class,
diff --git a/config/clicknow.money.php b/config/money.php
similarity index 100%
rename from config/clicknow.money.php
rename to config/money.php
diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php
index 80047a964..a4a288a7d 100644
--- a/resources/views/expenses/bills/show.blade.php
+++ b/resources/views/expenses/bills/show.blade.php
@@ -127,7 +127,7 @@
                                     @if ($bill->paid)
                                         <tr class="text-success">
                                             <th>{{ trans('invoices.paid') }}:</th>
-                                            <td class="text-right">@money('-' . $bill->paid, $bill->currency_code, true)</td>
+                                            <td class="text-right">- @money($bill->paid, $bill->currency_code, true)</td>
                                         </tr>
                                     @endif
                                     <tr>
diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php
index 7d88541a0..afce0396c 100644
--- a/resources/views/incomes/invoices/show.blade.php
+++ b/resources/views/incomes/invoices/show.blade.php
@@ -127,7 +127,7 @@
                                     @if ($invoice->paid)
                                         <tr class="text-success">
                                             <th>{{ trans('invoices.paid') }}:</th>
-                                            <td class="text-right">@money('-' . $invoice->paid, $invoice->currency_code, true)</td>
+                                            <td class="text-right">- @money($invoice->paid, $invoice->currency_code, true)</td>
                                         </tr>
                                     @endif
                                     <tr>