shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed #73

Browse Source
This commit is contained in:
denisdulici 2017-11-27 01:41:51 +03:00
parent 5e923024c2
commit f69531eec7
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Settings/Currencies.php
View File

@ -2,11 +2,11 @@
namespace App\Http\Controllers\Settings; namespace App\Http\Controllers\Settings;
use Akaunting\Money\Currency as MoneyCurrency;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Setting\Currency as Request; use App\Http\Requests\Setting\Currency as Request;
use App\Models\Banking\Account; use App\Models\Banking\Account;
use App\Models\Setting\Currency; use App\Models\Setting\Currency;
use ClickNow\Money\Currency as MoneyCurrency;
class Currencies extends Controller class Currencies extends Controller
{ {

4
app/Traits/Currencies.php
View File

@ -2,8 +2,8 @@
namespace App\Traits; namespace App\Traits;
use ClickNow\Money\Money; use Akaunting\Money\Money;
use ClickNow\Money\Currency; use Akaunting\Money\Currency;
trait Currencies trait Currencies
{ {

2
composer.json
View File

@ -8,6 +8,7 @@
"require": { "require": {
"php": ">=5.6.4", "php": ">=5.6.4",
"akaunting/language": "1.0.*", "akaunting/language": "1.0.*",
"akaunting/money": "1.0.*",
"akaunting/setting": "1.0.*", "akaunting/setting": "1.0.*",
"akaunting/version": "1.0.*", "akaunting/version": "1.0.*",
"almasaeed2010/adminlte": "2.3.*", "almasaeed2010/adminlte": "2.3.*",
@ -15,7 +16,6 @@
"barryvdh/laravel-dompdf": "0.*", "barryvdh/laravel-dompdf": "0.*",
"barryvdh/laravel-ide-helper": "2.3.*", "barryvdh/laravel-ide-helper": "2.3.*",
"bkwld/cloner": "3.2.*", "bkwld/cloner": "3.2.*",
"cknow/laravel-money": "1.0.*",
"dingo/api": "1.0.0-beta8", "dingo/api": "1.0.0-beta8",
"fzaninotto/faker": "1.6.*", "fzaninotto/faker": "1.6.*",
"guzzlehttp/guzzle": "6.3.*", "guzzlehttp/guzzle": "6.3.*",

2
config/app.php
View File

@ -184,11 +184,11 @@ return [
* Vendor Service Providers... * Vendor Service Providers...
*/ */
Akaunting\Language\Provider::class, Akaunting\Language\Provider::class,
Akaunting\Money\Provider::class,
Akaunting\Setting\Provider::class, Akaunting\Setting\Provider::class,
Akaunting\Version\Provider::class, Akaunting\Version\Provider::class,
Barryvdh\DomPDF\ServiceProvider::class, Barryvdh\DomPDF\ServiceProvider::class,
Bkwld\Cloner\ServiceProvider::class, Bkwld\Cloner\ServiceProvider::class,
ClickNow\Money\MoneyServiceProvider::class,
Collective\Html\HtmlServiceProvider::class, Collective\Html\HtmlServiceProvider::class,
Dingo\Api\Provider\LaravelServiceProvider::class, Dingo\Api\Provider\LaravelServiceProvider::class,
EloquentFilter\ServiceProvider::class, EloquentFilter\ServiceProvider::class,

0
config/clicknow.money.php → config/money.php
View File

2
resources/views/expenses/bills/show.blade.php
View File

@ -127,7 +127,7 @@
@if ($bill->paid) @if ($bill->paid)
<tr class="text-success"> <tr class="text-success">
<th>{{ trans('invoices.paid') }}:</th> <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> </tr>
@endif @endif
<tr> <tr>

2
resources/views/incomes/invoices/show.blade.php
View File

@ -127,7 +127,7 @@
@if ($invoice->paid) @if ($invoice->paid)
<tr class="text-success"> <tr class="text-success">
<th>{{ trans('invoices.paid') }}:</th> <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> </tr>
@endif @endif
<tr> <tr>