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

refs #1421

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-04-22 14:50:30 +03:00
parent 5ed4cd2da9
commit 5b1306cab4
86 changed files with 1244 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/views/layouts/admin.blade.php
View File

@@ -2,7 +2,12 @@
@include('partials.admin.head')
<body id="leftMenu" class="g-sidenav-show g-sidenav-pinned">
@mobile
<body id="leftMenu" class="g-sidenav-hidden">
@elsemobile
<body id="leftMenu" class="g-sidenav-show">
@endmobile
@stack('body_start')
@include('partials.admin.menu')

5
resources/views/partials/admin/menu.blade.php
View File

@@ -1,14 +1,13 @@
@stack('menu_start')
<nav class="sidenav navbar navbar-vertical fixed-left navbar-expand-sm navbar-light bg-default" id="sidenav-main">
<nav class="sidenav navbar navbar-vertical fixed-left navbar-expand-xs navbar-light bg-default" id="sidenav-main">
<div class="scrollbar-inner">
<div class="sidenav-header d-flex align-items-center ml-4">
<div class="sidenav-header d-flex align-items-center">
<ul class="navbar-nav">
<li class="nav-item dropdown">
<a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="avatar menu-avatar background-unset">
<img class="border-radius-none border-0 mr-3" alt="Akaunting" src="{{ asset('public/img/akaunting-logo-white.svg') }}">
</span>
<span class="nav-link-text long-texts pl-2 mwpx-100">{{ Str::limit(setting('company.name'), 22) }}</span>
@permission('read-common-companies')
<i class="fas fa-sort-down pl-2"></i>

5
resources/views/partials/portal/menu.blade.php
View File

@@ -1,5 +1,5 @@
@stack('menu_start')
<nav class="sidenav navbar navbar-vertical fixed-left navbar-expand-sm navbar-light bg-default" id="sidenav-main">
<nav class="sidenav navbar navbar-vertical fixed-left navbar-expand-xs navbar-light bg-default" id="sidenav-main">
<div class="scrollbar-inner">
<div class="sidenav-header d-flex align-items-center ml-4">
<ul class="navbar-nav">
@@ -8,12 +8,10 @@
<span class="avatar menu-avatar background-unset">
<img class="border-radius-none border-0 mr-3" alt="Image placeholder" src="{{ setting('company.logo') ? Storage::url(setting('company.logo')) : asset('public/img/akaunting-logo-white.svg') }}">
</span>
<span class="nav-link-text long-texts pl-2 mwpx-100">{{ Str::limit(setting('company.name'), 22) }}</span>
</a>
</li>
</ul>
<div class="ml-auto left-menu-toggle-position">
<div class="sidenav-toggler d-none d-xl-block left-menu-toggle" data-action="sidenav-unpin" data-target="#sidenav-main">
<div class="sidenav-toggler-inner">
@@ -24,7 +22,6 @@
</div>
</div>
</div>
{!! menu('portal') !!}
</div>
</nav>

2
resources/views/partials/reports/table/rows.blade.php
View File

@@ -1,6 +1,6 @@
@php $row_total = 0; @endphp
<tr class="row rp-border-top-1 font-size-unset">
<td class="{{ $class->column_name_width }}">{{ $class->row_names[$table][$id] }}</td>
<td class="{{ $class->column_name_width }} long-texts pr-0">{{ $class->row_names[$table][$id] }}</td>
@foreach($rows as $row)
@php $row_total += $row; @endphp
<td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>

2
resources/views/partials/wizard/content.blade.php
View File

@@ -13,6 +13,6 @@
@yield('content')
@stack('content_content_end')
<notifications></notifications>
<component v-bind:is="component"></component>
@stack('content_end')

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

@@ -236,7 +236,7 @@
<div class="table-responsive">
<table class="table">
<tbody>
@foreach ($invoice->totals as $total)
@foreach ($invoice->totals_sorted as $total)
@if ($total->code != 'total')
@stack($total->code . '_td_start')
<tr>

2
resources/views/portal/invoices/signed.blade.php
View File

@@ -184,7 +184,7 @@
<div class="table-responsive">
<table class="table">
<tbody>
@foreach($invoice->totals as $total)
@foreach($invoice->totals_sorted as $total)
@if($total->code != 'total')
<tr>
<th>{{ trans($total['name']) }}:</th>

2
resources/views/purchases/bills/create.blade.php
View File

@@ -127,7 +127,7 @@
<i class="fa fa-percent"></i>
</span>
</div>
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}
</div>
</div>
<div class="col-sm-6">

2
resources/views/purchases/bills/edit.blade.php
View File

@@ -128,7 +128,7 @@
<i class="fa fa-percent"></i>
</span>
</div>
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}
</div>
</div>
<div class="col-sm-6">

2
resources/views/purchases/bills/print.blade.php
View File

@@ -173,7 +173,7 @@
<div class="col-42">
<div class="text company pr-2">
@foreach ($bill->totals as $total)
@foreach ($bill->totals_sorted as $total)
@if ($total->code != 'total')
@stack($total->code . '_td_start')
<div class="border-top-1 py-2">

4
resources/views/purchases/bills/show.blade.php
View File

@@ -412,7 +412,7 @@
<div class="table-responsive">
<table class="table">
<tbody>
@foreach ($bill->totals as $total)
@foreach ($bill->totals_sorted as $total)
@if ($total->code != 'total')
@stack($total->code . '_td_start')
<tr>
@@ -472,7 +472,7 @@
@stack('button_group_start')
<div class="dropup header-drop-top">
<button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false">{{ trans('general.more_actions') }}</button>
<button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-chevron-up"></i>&nbsp; {{ trans('general.more_actions') }}</button>
<div class="dropdown-menu" role="menu">
@if ($bill->status != 'cancelled')

2
resources/views/sales/invoices/create.blade.php
View File

@@ -127,7 +127,7 @@
<i class="fa fa-percent"></i>
</span>
</div>
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}
</div>
</div>
<div class="col-sm-6">

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

@@ -28,7 +28,7 @@
{{ Form::textGroup('invoice_number', trans('invoices.invoice_number'), 'file') }}
{{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart',[]) }}
{{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart', []) }}
<div class="col-sm-12 mb-4">
@php $item_colspan = in_array(setting('localisation.discount_location', 'total'), ['item', 'both']) ? '6' : '5' @endphp
@@ -128,7 +128,7 @@
<i class="fa fa-percent"></i>
</span>
</div>
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}
</div>
</div>
<div class="col-sm-6">

4
resources/views/sales/invoices/print_classic.blade.php
View File

@@ -111,7 +111,7 @@
<span class="float-right">@date($invoice->due_at)</span><br><br>
@stack('due_at_input_end')
@foreach ($invoice->totals as $total)
@foreach ($invoice->totals_sorted as $total)
@if ($total->code == 'total')
<strong>{{ trans($total->name) }}:</strong>
<span class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span><br><br>
@@ -189,7 +189,7 @@
<div class="col-42 float-right text-right">
<div class="text company pr-2">
@foreach ($invoice->totals as $total)
@foreach ($invoice->totals_sorted as $total)
@if ($total->code != 'total')
@stack($total->code . '_td_start')
<div class="border-top-dashed py-2">

2
resources/views/sales/invoices/print_default.blade.php
View File

@@ -177,7 +177,7 @@
<div class="col-42 float-right text-right">
<div class="text company">
@foreach ($invoice->totals as $total)
@foreach ($invoice->totals_sorted as $total)
@if ($total->code != 'total')
@stack($total->code . '_td_start')
<div class="border-top-1 py-2">

2
resources/views/sales/invoices/print_modern.blade.php
View File

@@ -158,7 +158,7 @@
<div class="col-42 float-right text-right">
<div class="text company pr-2">
@foreach ($invoice->totals as $total)
@foreach ($invoice->totals_sorted as $total)
@if ($total->code != 'total')
@stack($total->code . '_td_start')
<strong class="float-left">{{ trans($total->title) }}:</strong>

4
resources/views/sales/invoices/show.blade.php
View File

@@ -427,7 +427,7 @@
<div class="table-responsive">
<table class="table">
<tbody>
@foreach ($invoice->totals as $total)
@foreach ($invoice->totals_sorted as $total)
@if ($total->code != 'total')
@stack($total->code . '_td_start')
<tr>
@@ -495,7 +495,7 @@
@stack('button_group_start')
<div class="dropup header-drop-top">
<button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false">{{ trans('general.more_actions') }}</button>
<button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-chevron-up"></i>&nbsp; {{ trans('general.more_actions') }}</button>
<div class="dropdown-menu" role="menu">
@if ($invoice->status != 'cancelled')
@stack('button_pay_start')