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

Merge branch 'master' into feature/add-tests

Browse Source
This commit is contained in:
Berkay GÜRE 2018-07-25 17:02:17 +03:00 committed by GitHub
commit a2e42ada8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 161 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/Users.php
View File

@ -282,7 +282,7 @@ class Users extends Controller
}
// Redirect to items
return redirect('items/items');
return redirect('common/items');
}
public function autocomplete(ARequest $request)

20
app/Http/Controllers/Expenses/Bills.php
View File

@ -66,9 +66,15 @@ class Bills extends Controller
$paid = 0;
foreach ($bill->payments as $item) {
$item->default_currency_code = $bill->currency_code;
$amount = $item->amount;
$paid += $item->getDynamicConvertedAmount();
if ($bill->currency_code != $item->currency_code) {
$item->default_currency_code = $bill->currency_code;
$amount = $item->getDynamicConvertedAmount();
}
$paid += $amount;
}
$bill->paid = $paid;
@ -713,9 +719,15 @@ class Bills extends Controller
$paid = 0;
foreach ($bill->payments as $item) {
$item->default_currency_code = $bill->currency_code;
$amount = $item->amount;
$paid += $item->getDynamicConvertedAmount();
if ($bill->currency_code != $item->currency_code) {
$item->default_currency_code = $bill->currency_code;
$amount = $item->getDynamicConvertedAmount();
}
$paid += $amount;
}
$bill->paid = $paid;

12
app/Http/Controllers/Incomes/Invoices.php
View File

@ -675,9 +675,15 @@ class Invoices extends Controller
$paid = 0;
foreach ($invoice->payments as $item) {
$item->default_currency_code = $invoice->currency_code;
$amount = $item->amount;
$paid += $item->getDynamicConvertedAmount();
if ($invoice->currency_code != $item->currency_code) {
$item->default_currency_code = $invoice->currency_code;
$amount = $item->getDynamicConvertedAmount();
}
$paid += $amount;
}
$amount = $invoice->amount - $paid;
@ -691,7 +697,7 @@ class Invoices extends Controller
$request['payment_method'] = setting('general.default_payment_method', 'offlinepayment.cash.1');
$request['currency_code'] = $invoice->currency_code;
$request['amount'] = $amount;
$request['paid_at'] = Date::now();
$request['paid_at'] = Date::now()->format('Y-m-d');
$request['_token'] = csrf_token();
$this->payment($request);

6
app/Http/Controllers/Reports/ExpenseSummary.php
View File

@ -101,6 +101,12 @@ class ExpenseSummary extends Controller
private function setAmount(&$graph, &$totals, &$expenses, $items, $type, $date_field)
{
foreach ($items as $item) {
if ($item['table'] == 'bill_payments') {
$bill = $item->bill;
$item->category_id = $bill->category_id;
}
$date = Date::parse($item->$date_field)->format('F');
if (!isset($expenses[$item->category_id])) {

6
app/Http/Controllers/Reports/IncomeExpenseSummary.php
View File

@ -138,6 +138,12 @@ class IncomeExpenseSummary extends Controller
private function setAmount(&$graph, &$totals, &$compares, $items, $type, $date_field)
{
foreach ($items as $item) {
if ($item['table'] == 'bill_payments' || $item['table'] == 'invoice_payments') {
$type_item = $item->$type;
$item->category_id = $type_item->category_id;
}
$date = Date::parse($item->$date_field)->format('F');
$group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense';

6
app/Http/Controllers/Reports/IncomeSummary.php
View File

@ -101,6 +101,12 @@ class IncomeSummary extends Controller
private function setAmount(&$graph, &$totals, &$incomes, $items, $type, $date_field)
{
foreach ($items as $item) {
if ($item['table'] == 'invoice_payments') {
$invoice = $item->invoice;
$item->category_id = $invoice->category_id;
}
$date = Date::parse($item->$date_field)->format('F');
if (!isset($incomes[$item->category_id])) {

6
app/Http/Controllers/Reports/ProfitLoss.php
View File

@ -155,6 +155,12 @@ class ProfitLoss extends Controller
private function setAmount(&$totals, &$compares, $items, $type, $date_field)
{
foreach ($items as $item) {
if ($item['table'] == 'bill_payments' || $item['table'] == 'invoice_payments') {
$type_item = $item->$type;
$item->category_id = $type_item->category_id;
}
$date = Date::parse($item->$date_field)->quarter;
$group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense';

6
app/Http/Controllers/Reports/TaxSummary.php
View File

@ -103,6 +103,12 @@ class TaxSummary extends Controller
private function setAmount(&$items, &$totals, $rows, $type, $date_field)
{
foreach ($rows as $row) {
if ($row['table'] == 'bill_payments' || $row['table'] == 'invoice_payments') {
$type_row = $row->$type;
$row->category_id = $type_row->category_id;
}
$date = Date::parse($row->$date_field)->format('M');
if ($date_field == 'paid_at') {

13
app/Utilities/Info.php
View File

@ -37,8 +37,13 @@ class Info
return phpversion();
}
public static function mysqlVersion()
{
return DB::selectOne('select version() as mversion')->mversion;
}
public static function mysqlVersion()
{
if(env('DB_CONNECTION') === 'mysql')
{
return DB::selectOne('select version() as mversion')->mversion;
}
return "N/A";
}
}

20
database/migrations/2017_12_09_000000_add_currency_columns.php
View File

@ -26,13 +26,15 @@ class AddCurrencyColumns extends Migration
* @return void
*/
public function down()
{
Schema::table('currencies', function ($table) {
$table->dropColumn('precision');
$table->dropColumn('symbol');
$table->dropColumn('symbol_first');
$table->dropColumn('decimal_mark');
$table->dropColumn('thousands_separator');
});
}
{
Schema::table('currencies', function ($table) {
$table->dropColumn([
'precision',
'symbol',
'symbol_first',
'decimal_mark',
'thousands_separator',
]);
});
}
}

28
database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php
View File

@ -4,21 +4,21 @@ use Illuminate\Database\Migrations\Migration;
class AddCategoryColumnInvoicesBills extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('invoices', function ($table) {
$table->integer('category_id');
});
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('invoices', function ($table) {
$table->integer('category_id')->default();
});
Schema::table('bills', function ($table) {
$table->integer('category_id');
});
}
Schema::table('bills', function ($table) {
$table->integer('category_id')->default();
});
}
/**
* Reverse the migrations.

11
public/css/app.css vendored
View File

@ -662,3 +662,14 @@ input[type="number"] {
border-bottom: 20px solid transparent;
border-left: 20px solid #ecf0f5;
}
@-moz-document url-prefix() {
.show-calendar .calendar-table .table-condensed > tbody > tr > td,
.show-calendar .calendar-table .table-condensed > tbody > tr > th,
.show-calendar .calendar-table .table-condensed > tfoot > tr > td,
.show-calendar .calendar-table .table-condensed > tfoot > tr > th,
.show-calendar .calendar-table .table-condensed > thead > tr > td,
.show-calendar .calendar-table .table-condensed > thead > tr > th {
padding: 0;
}
}

11
resources/lang/en-GB/notifications.php Normal file
View File

@ -0,0 +1,11 @@
<?php
return [
'whoops' => 'Whoops!',
'hello' => 'Hello!',
'salutation' => 'Regards,<br> :company_name',
'subcopy' => 'If you’re having trouble clicking the ":text" button, copy and paste the URL below
into your web browser: [:url](:url)',
];

2
resources/views/banking/transfers/create.blade.php
View File

@ -14,7 +14,7 @@
{{ Form::textGroup('amount', trans('general.amount'), 'money') }}
{{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::now()->toDateString()) }}
{{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
{{ Form::textareaGroup('description', trans('general.description')) }}

2
resources/views/banking/transfers/edit.blade.php
View File

@ -18,7 +18,7 @@
{{ Form::textGroup('amount', trans('general.amount'), 'money') }}
{{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => 'yyyy-mm-dd']) }}
{{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => 'yyyy-mm-dd', 'autocomplete' => 'off']) }}
{{ Form::textareaGroup('description', trans('general.description')) }}

4
resources/views/expenses/bills/create.blade.php
View File

@ -22,9 +22,9 @@
{{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies, setting('general.default_currency')) }}
{{ Form::textGroup('billed_at', trans('bills.bill_date'), 'calendar',['id' => 'billed_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => ''],Date::now()->toDateString()) }}
{{ Form::textGroup('billed_at', trans('bills.bill_date'), 'calendar',['id' => 'billed_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => '', 'autocomplete' => 'off'],Date::now()->toDateString()) }}
{{ Form::textGroup('due_at', trans('bills.due_date'), 'calendar',['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => ''],Date::now()->toDateString()) }}
{{ Form::textGroup('due_at', trans('bills.due_date'), 'calendar',['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => '', 'autocomplete' => 'off'],Date::now()->toDateString()) }}
{{ Form::textGroup('bill_number', trans('bills.bill_number'), 'file-text-o') }}

4
resources/views/expenses/bills/edit.blade.php
View File

@ -12,9 +12,9 @@
{{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies) }}
{{ Form::textGroup('billed_at', trans('bills.bill_date'), 'calendar', ['id' => 'billed_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::parse($bill->billed_at)->toDateString()) }}
{{ Form::textGroup('billed_at', trans('bills.bill_date'), 'calendar', ['id' => 'billed_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::parse($bill->billed_at)->toDateString()) }}
{{ Form::textGroup('due_at', trans('bills.due_date'), 'calendar', ['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::parse($bill->due_at)->toDateString()) }}
{{ Form::textGroup('due_at', trans('bills.due_date'), 'calendar', ['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::parse($bill->due_at)->toDateString()) }}
{{ Form::textGroup('bill_number', trans('bills.bill_number'), 'file-text-o') }}

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

@ -334,7 +334,7 @@
html += ' {!! Form::label('paid_at', trans('general.date'), ['class' => 'control-label']) !!}';
html += ' <div class="input-group">';
html += ' <div class="input-group-addon"><i class="fa fa-calendar"></i></div>';
html += ' {!! Form::text('paid_at', \Date::now()->toDateString(), ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '']) !!}';
html += ' {!! Form::text('paid_at', \Date::now()->toDateString(), ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off']) !!}';
html += ' </div>';
html += ' </div>';
html += ' <div class="form-group col-md-6 required">';
@ -391,7 +391,9 @@
$('#paid_at').datepicker({
format: 'yyyy-mm-dd',
autoclose: true
weekStart: 1,
autoclose: true,
language: '{{ language()->getShortCode() }}'
});
$("#account_id").select2({

2
resources/views/expenses/payments/create.blade.php
View File

@ -8,7 +8,7 @@
{!! Form::open(['url' => 'expenses/payments', 'files' => true, 'role' => 'form']) !!}
<div class="box-body">
{{ Form::textGroup('paid_at', trans('general.date'), 'calendar',['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::now()->toDateString()) }}
{{ Form::textGroup('paid_at', trans('general.date'), 'calendar',['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
{!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', '', ['id' => 'currency_rate']) !!}

2
resources/views/expenses/payments/edit.blade.php
View File

@ -25,7 +25,7 @@
]) !!}
<div class="box-body">
{{ Form::textGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::parse($payment->paid_at)->toDateString()) }}
{{ Form::textGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::parse($payment->paid_at)->toDateString()) }}
{!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', null, ['id' => 'currency_rate']) !!}

4
resources/views/incomes/invoices/create.blade.php
View File

@ -22,9 +22,9 @@
{{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies, setting('general.default_currency')) }}
{{ Form::textGroup('invoiced_at', trans('invoices.invoice_date'), 'calendar',['id' => 'invoiced_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => ''], Date::now()->toDateString()) }}
{{ Form::textGroup('invoiced_at', trans('invoices.invoice_date'), 'calendar',['id' => 'invoiced_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
{{ Form::textGroup('due_at', trans('invoices.due_date'), 'calendar',['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => '']) }}
{{ Form::textGroup('due_at', trans('invoices.due_date'), 'calendar',['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => '', 'autocomplete' => 'off']) }}
{{ Form::textGroup('invoice_number', trans('invoices.invoice_number'), 'file-text-o', ['required' => 'required'], $number) }}

4
resources/views/incomes/invoices/edit.blade.php
View File

@ -12,9 +12,9 @@
{{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies) }}
{{ Form::textGroup('invoiced_at', trans('invoices.invoice_date'), 'calendar', ['id' => 'invoiced_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::parse($invoice->invoiced_at)->toDateString()) }}
{{ Form::textGroup('invoiced_at', trans('invoices.invoice_date'), 'calendar', ['id' => 'invoiced_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::parse($invoice->invoiced_at)->toDateString()) }}
{{ Form::textGroup('due_at', trans('invoices.due_date'), 'calendar', ['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::parse($invoice->due_at)->toDateString()) }}
{{ Form::textGroup('due_at', trans('invoices.due_date'), 'calendar', ['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::parse($invoice->due_at)->toDateString()) }}
{{ Form::textGroup('invoice_number', trans('invoices.invoice_number'), 'file-text-o') }}

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

@ -347,7 +347,7 @@
html += ' {!! Form::label('paid_at', trans('general.date'), ['class' => 'control-label']) !!}';
html += ' <div class="input-group">';
html += ' <div class="input-group-addon"><i class="fa fa-calendar"></i></div>';
html += ' {!! Form::text('paid_at', \Carbon\Carbon::now()->toDateString(), ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '']) !!}';
html += ' {!! Form::text('paid_at', \Carbon\Carbon::now()->toDateString(), ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off']) !!}';
html += ' </div>';
html += ' </div>';
html += ' <div class="form-group col-md-6 required">';
@ -404,7 +404,9 @@
$('#paid_at').datepicker({
format: 'yyyy-mm-dd',
autoclose: true
weekStart: 1,
autoclose: true,
language: '{{ language()->getShortCode() }}'
});
$("#account_id").select2({

4
resources/views/incomes/revenues/create.blade.php
View File

@ -8,7 +8,7 @@
{!! Form::open(['url' => 'incomes/revenues', 'files' => true, 'role' => 'form']) !!}
<div class="box-body">
{{ Form::textGroup('paid_at', trans('general.date'), 'calendar',['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::now()->toDateString()) }}
{{ Form::textGroup('paid_at', trans('general.date'), 'calendar',['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
{!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', '', ['id' => 'currency_rate']) !!}
@ -19,7 +19,7 @@
{!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-university"></i></div>
{!! Form::select('account_id', $accounts, setting('general.accounts', 1), array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!}
{!! Form::select('account_id', $accounts, setting('general.default_account'), array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!}
<div class="input-group-append">
{!! Form::text('currency', $account_currency_code, ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!}
</div>

2
resources/views/incomes/revenues/edit.blade.php
View File

@ -25,7 +25,7 @@
]) !!}
<div class="box-body">
{{ Form::textGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::parse($revenue->paid_at)->toDateString()) }}
{{ Form::textGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::parse($revenue->paid_at)->toDateString()) }}
{!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', null, ['id' => 'currency_rate']) !!}

2
resources/views/partials/admin/head.blade.php
View File

@ -24,7 +24,7 @@
<!-- Select2 -->
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/select2/select2.min.css') }}">
<!-- App style -->
<link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2') }}">
<link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2.12') }}">
<link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=1.2') }}">
<link rel="shortcut icon" href="{{ asset('public/img/favicon.ico') }}">

2
resources/views/partials/auth/head.blade.php
View File

@ -17,7 +17,7 @@
<!-- AdminLTE Skins -->
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-green-light.min.css') }}">
<!-- App style -->
<link rel="stylesheet" href="{{ asset('public/css/app.css') }}">
<link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2.12') }}">
<link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css') }}">
<link rel="shortcut icon" href="{{ asset('public/img/favicon.ico') }}">

9
resources/views/partials/bill/head.blade.php
View File

@ -3,6 +3,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Tell the browser to be responsive to screen width -->
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>@yield('title') - @setting('general.company_name')</title>
@ -18,7 +19,13 @@
folder instead of downloading all of them to reduce the load. -->
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/_all-skins.min.css') }}">
<!-- App style -->
<link rel="stylesheet" href="{{ asset('public/css/app.css') }}">
<link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2.12') }}">
<style type="text/css">
* {
font-family: "DejaVu Sans Mono", monospace;
}
</style>
@stack('css')

2
resources/views/partials/customer/head.blade.php
View File

@ -26,7 +26,7 @@
<!-- Select2 -->
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/select2/select2.min.css') }}">
<!-- App style -->
<link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2') }}">
<link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2.12') }}">
<link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=1.2') }}">
<link rel="shortcut icon" href="{{ asset('public/img/favicon.ico') }}">

9
resources/views/partials/invoice/head.blade.php
View File

@ -3,6 +3,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Tell the browser to be responsive to screen width -->
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>@yield('title') - @setting('general.company_name')</title>
@ -18,7 +19,13 @@
folder instead of downloading all of them to reduce the load. -->
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/_all-skins.min.css') }}">
<!-- App style -->
<link rel="stylesheet" href="{{ asset('public/css/app.css') }}">
<link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2.12') }}">
<style type="text/css">
* {
font-family: "DejaVu Sans Mono", monospace;
}
</style>
@stack('css')

2
resources/views/partials/modules/head.blade.php
View File

@ -24,7 +24,7 @@
<!-- Select2 -->
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/select2/select2.min.css') }}">
<!-- App style -->
<link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.0.7') }}">
<link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2.12') }}">
<link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=1.0.7') }}">
<link rel="stylesheet" href="{{ asset('public/css/modules.css?v=1.0.7') }}">

2
resources/views/settings/settings/edit.blade.php
View File

@ -42,7 +42,7 @@
</div>
<div class="tab-pane tab-margin" id="localisation">
{{ Form::selectGroup('date_format', trans('settings.localisation.date.format'), 'calendar', $date_formats, null, []) }}
{{ Form::selectGroup('date_format', trans('settings.localisation.date.format'), 'calendar', $date_formats, null, ['autocomplete' => 'off']) }}
{{ Form::selectGroup('date_separator', trans('settings.localisation.date.separator'), 'minus', $date_separators, null, []) }}

9
resources/views/vendor/notifications/email.blade.php vendored
View File

@ -4,9 +4,9 @@
# {{ $greeting }}
@else
@if ($level == 'error')
# Whoops!
# {{ trans('notifications.whoops') }}
@else
# Hello!
# {{ trans('notifications.hello') }}
@endif
@endif
@ -45,14 +45,13 @@
@if (! empty($salutation))
{{ $salutation }}
@else
Regards,<br>{{ setting('general.company_name', config('app.name')) }}
{!! trans('notifications.salutation', ['company_name' => setting('general.company_name', config('app.name'))]) !!}
@endif
<!-- Subcopy -->
@isset($actionText)
@component('mail::subcopy')
If you’re having trouble clicking the "{{ $actionText }}" button, copy and paste the URL below
into your web browser: [{{ $actionUrl }}]({{ $actionUrl }})
{!! trans('notifications.subcopy', ['text' => $actionText, 'url' => $actionUrl]) !!}
@endcomponent
@endisset
@endcomponent