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

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-02-17 11:58:35 +03:00
commit 71e0306eb2
74 changed files with 175 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifest.json
View File

@ -3,8 +3,8 @@
"short_name": "Akaunting",
"start_url": ".",
"display": "standalone",
"theme_color": "#6da252",
"background_color": "#6F679B",
"theme_color": "#3c3f72",
"background_color": "#3c3f72",
"orientation": "any",
"splash": {
"640x1136": "public/img/icons/splash-640x1136.png",
@ -30,7 +30,12 @@
"sizes": "96x96"
},
{
"src": "public/img/images/icons/akaunting-128x128.png",
"src": "public/img/icons/akaunting-120x120.png",
"type": "image/png",
"sizes": "120x120"
},
{
"src": "public/img/icons/akaunting-128x128.png",
"type": "image/png",
"sizes": "128x128"
},
@ -44,6 +49,11 @@
"type": "image/png",
"sizes": "152x152"
},
{
"src": "public/img/icons/akaunting-180x180.png",
"type": "image/png",
"sizes": "180x180"
},
{
"src": "public/img/icons/akaunting-192x192.png",
"type": "image/png",

57
public/css/custom.css vendored
View File

@ -743,6 +743,43 @@ table .align-items-center td span.badge {
/*--------Modal Dialog Resizing Finish--------*/
/*--Save Buttons Responsive--*/
.save-buttons
{
float: right !important;
}
/*--Save Buttons Responsive Finish--*/
/*--Left Menu Stabilize--*/
.g-sidenav-show .sidenav {
max-width: 250px !important;
}
.g-sidenav-show .sidenav .navbar-brand,
.g-sidenav-show .sidenav .navbar-heading {
display: block;
}
.g-sidenav-show .sidenav.fixed-left + .main-content {
margin-left: 250px;
}
.g-sidenav-show .sidenav.fixed-right + .main-content {
margin-right: 250px;
}
.g-sidenav-show .sidenav {
-webkit-transform: translateX(0);
transform: translateX(0);
}
.sidenav-show .navbar-top .navbar-brand {
display: none;
}
/*--Left Menu Stabilize Finish--*/
/*--------Responsive--------*/
/*--Xs Breakpoint--*/
@media (max-width: 575.98px)
@ -839,6 +876,26 @@ table .align-items-center td span.badge {
width: 100% !important;
margin-top: 1rem;
}
.save-buttons
{
float: none !important;
}
.g-sidenav-show .sidenav
{
display: none !important;
}
.g-sidenav-show.g-sidenav-hidden .sidenav
{
display: none !important;
}
.g-sidenav-show.g-sidenav-pinned .sidenav
{
display: block !important;
}
}
/*--Xs Breakpoint Finish--*/

BIN
public/img/icons/akaunting-120x120.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
public/img/icons/akaunting-128x128.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
public/img/icons/akaunting-144x144.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
public/img/icons/akaunting-152x152.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
public/img/icons/akaunting-180x180.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
public/img/icons/akaunting-192x192.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
public/img/icons/akaunting-384x384.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
public/img/icons/akaunting-512x512.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
public/img/icons/akaunting-640x1136.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
public/img/icons/akaunting-72x72.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
public/img/icons/akaunting-96x96.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
public/img/icons/splash-1242x2208.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

BIN
public/img/icons/splash-1242x2688.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 53 KiB

BIN
public/img/icons/splash-1536x2048.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 46 KiB

BIN
public/img/icons/splash-1668x2224.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 49 KiB

BIN
public/img/icons/splash-1668x2388.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 50 KiB

BIN
public/img/icons/splash-2048x2732.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 58 KiB

BIN
public/img/icons/splash-640x1136.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
public/img/icons/splash-750x1334.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
public/img/icons/splash-828x1792.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 34 KiB

2
resources/views/auth/permissions/create.blade.php
View File

@ -26,7 +26,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('permissions.index') }}
</div>
</div>

2
resources/views/auth/permissions/edit.blade.php
View File

@ -28,7 +28,7 @@
@permission('update-auth-permissions')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('permissions.index') }}
</div>
</div>

2
resources/views/auth/roles/create.blade.php
View File

@ -79,7 +79,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('roles.index') }}
</div>
</div>

2
resources/views/auth/roles/edit.blade.php
View File

@ -81,7 +81,7 @@
@permission('update-auth-roles')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('roles.index') }}
</div>
</div>

2
resources/views/auth/users/create.blade.php
View File

@ -56,7 +56,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('users.index') }}
</div>
</div>

2
resources/views/auth/users/edit.blade.php
View File

@ -58,7 +58,7 @@
@permission('update-auth-users')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('users.index') }}
</div>
</div>

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

@ -38,7 +38,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('accounts.index') }}
</div>
</div>

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

@ -40,7 +40,7 @@
@permission('update-banking-accounts')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('accounts.index') }}
</div>
</div>

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

@ -37,7 +37,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('transfers.index') }}
</div>
</div>

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

@ -39,7 +39,7 @@
@permission('update-banking-transfers')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('transfers.index') }}
</div>
</div>

2
resources/views/common/companies/create.blade.php
View File

@ -34,7 +34,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('companies.index') }}
</div>
</div>

2
resources/views/common/companies/edit.blade.php
View File

@ -36,7 +36,7 @@
@permission('update-common-companies')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('companies.index') }}
</div>
</div>

2
resources/views/common/dashboards/create.blade.php
View File

@ -28,7 +28,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('dashboards.index') }}
</div>
</div>

2
resources/views/common/dashboards/edit.blade.php
View File

@ -30,7 +30,7 @@
@permission('update-common-dashboards')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('dashboards.index') }}
</div>
</div>

8
resources/views/common/import/create.blade.php
View File

@ -39,9 +39,11 @@
</div>
<div class="card-footer">
<div class="float-right">
<a href="{{ url($path) }}" class="btn btn-outline-secondary header-button-top"><span class="fa fa-times"></span> &nbsp;{{ trans('general.cancel') }}</a>
{!! Form::button('<span class="fa fa-download"></span> &nbsp;' . trans('import.import'), ['type' => 'submit', 'class' => 'btn btn-success header-button-top']) !!}
<div class="row save-buttons">
<div class="col-xs-12 col-sm-12">
<a href="{{ url($path) }}" class="btn btn-outline-secondary header-button-top"><span class="fa fa-times"></span> &nbsp;{{ trans('general.cancel') }}</a>
{!! Form::button('<span class="fa fa-download"></span> &nbsp;' . trans('import.import'), ['type' => 'submit', 'class' => 'btn btn-success header-button-top']) !!}
</div>
</div>
</div>
{!! Form::close() !!}

4
resources/views/common/items/create.blade.php
View File

@ -27,7 +27,7 @@
{{ Form::textGroup('purchase_price', trans('items.purchase_price'), 'money-bill-wave-alt') }}
{{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=item']) }}
{{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['path' => route('modals.categories.create') . '?type=item']) }}
{{ Form::fileGroup('picture', trans_choice('general.pictures', 1), 'plus') }}
@ -36,7 +36,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('items.index') }}
</div>
</div>

4
resources/views/common/items/edit.blade.php
View File

@ -28,7 +28,7 @@
{{ Form::textGroup('purchase_price', trans('items.purchase_price'), 'money-bill-wave-alt') }}
{{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $item->category_id, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=item']) }}
{{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $item->category_id, ['path' => route('modals.categories.create') . '?type=item']) }}
{{ Form::fileGroup('picture', trans_choice('general.pictures', 1)) }}
@ -38,7 +38,7 @@
@permission('update-common-items')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('items.index') }}
</div>
</div>

2
resources/views/common/reports/create.blade.php
View File

@ -29,7 +29,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('reports.index') }}
</div>
</div>

2
resources/views/common/reports/edit.blade.php
View File

@ -62,7 +62,7 @@
@permission('update-common-reports')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('reports.index') }}
</div>
</div>

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

@ -2,7 +2,7 @@
@include('partials.admin.head')
<body class="g-sidenav-show g-sidenav-pinned">
<body class="g-sidenav-show">
@stack('body_start')
@include('partials.admin.menu')

2
resources/views/layouts/auth.blade.php
View File

@ -51,7 +51,7 @@
<div class="col-xl-12">
<div class="copyright text-center text-white">
<small>
{{ trans('footer.powered') }}: <a href="{{ trans('footer.link') }}" target="_blank" class="text-white">{{ trans('footer.software') }}</a>
{{ trans('footer.powered') }}: <a href="{{ trans('footer.link') }}" target="_blank">{{ trans('footer.software') }}</a>
</small>
</div>
</div>

2
resources/views/layouts/error.blade.php
View File

@ -2,7 +2,7 @@
@include('partials.admin.head')
<body class="g-sidenav-show g-sidenav-pinned">
<body class="g-sidenav-show">
@stack('body_start')
<div class="main-content" id="panel">

2
resources/views/layouts/modules.blade.php
View File

@ -2,7 +2,7 @@
@include('partials.modules.head')
<body class="g-sidenav-show g-sidenav-pinned">
<body class="g-sidenav-show">
@stack('body_start')
@include('partials.admin.menu')

2
resources/views/layouts/portal.blade.php
View File

@ -2,7 +2,7 @@
@include('partials.portal.head')
<body class="g-sidenav-show g-sidenav-pinned">
<body class="g-sidenav-show">
@stack('body_start')
@include('partials.portal.menu')

38
resources/views/partials/pwa/pwa.blade.php
View File

@ -1,39 +1,39 @@
<!-- Web Application Manifest -->
<link rel="manifest" href="{{asset('manifest.json')}}">
<link rel="manifest" href="{{ asset('manifest.json') }}">
<!-- Chrome for Android theme color -->
<meta name="theme-color" content="#6da252">
<meta name="theme-color" content="#3c3f72">
<!-- Add to homescreen for Chrome on Android -->
<meta name="mobile-web-app-capable" content="yes">
<meta name="application-name" content="Akaunting">
<link rel="icon" sizes="512x512" href="{{asset('public/img/icons/icon-512x512.png')}}">
<link rel="icon" sizes="512x512" href="{{ asset('public/img/icons/icon-512x512.png') }}">
<!-- Add to homescreen for Safari on iOS -->
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="#6da252">
<meta name="apple-mobile-web-app-status-bar-style" content="#3c3f72">
<meta name="apple-mobile-web-app-title" content="Akaunting">
<link rel="apple-touch-icon" href="{{asset('public/img/icons/icon-512x512.png')}}">
<link rel="apple-touch-icon" href="{{ asset('public/img/icons/icon-512x512.png') }}">
<link href="{{asset('public/img/icons/splash-640x1136.png')}}" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="{{asset('public/img/icons/splash-750x1334.png')}}" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="{{asset('public/img/icons/splash-1242x2208.png')}}" media="(device-width: 621px) and (device-height: 1104px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />
<link href="{{asset('public/img/icons/splash-1125x2436.png')}}" media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />
<link href="{{asset('public/img/icons/splash-828x1792.png')}}" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="{{asset('public/img/icons/splash-1242x2688.png')}}" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />
<link href="{{asset('public/img/icons/splash-1536x2048.png')}}" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="{{asset('public/img/icons/splash-1668x2224.png')}}" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="{{asset('public/img/icons/splash-1668x2388.png')}}" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="{{asset('public/img/icons/splash-2048x2732.png')}}" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="{{ asset('public/img/icons/splash-640x1136.png') }}" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="{{ asset('public/img/icons/splash-750x1334.png') }}" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="{{ asset('public/img/icons/splash-1242x2208.png') }}" media="(device-width: 621px) and (device-height: 1104px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />
<link href="{{ asset('public/img/icons/splash-1125x2436.png') }}" media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />
<link href="{{ asset('public/img/icons/splash-828x1792.png') }}" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="{{ asset('public/img/icons/splash-1242x2688.png') }}" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />
<link href="{{ asset('public/img/icons/splash-1536x2048.png') }}" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="{{ asset('public/img/icons/splash-1668x2224.png') }}" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="{{ asset('public/img/icons/splash-1668x2388.png') }}" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="{{ asset('public/img/icons/splash-2048x2732.png') }}" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<!-- Tile for Win8 -->
<meta name="msapplication-TileColor" content="#6da252">
<meta name="msapplication-TileImage" content="{{asset('public/img/icons/icon-512x512.png')}}">
<meta name="msapplication-TileColor" content="#3c3f72">
<meta name="msapplication-TileImage" content="{{ asset('public/img/icons/icon-512x512.png') }}">
<script type="text/javascript">
if ('serviceWorker' in navigator) {
navigator.serviceWorker.register("{{asset('serviceworker.js')}}");
navigator.serviceWorker.register("{{ asset('serviceworker.js') }}");
}
</script>
</script>

2
resources/views/portal/profile/edit.blade.php
View File

@ -40,7 +40,7 @@
@permission(['update-portal-profile'])
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('portal.dashboard') }}
</div>
</div>

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

@ -97,7 +97,7 @@
<div class="card d-none" :class="[{'show' : discount}]">
<div class="discount card-body">
<div class="row align-items-center">
<div class="col-md-6">
<div class="col-sm-6">
<div class="input-group input-group-merge">
<div class="input-group-prepend">
<span class="input-group-text" id="input-discount">
@ -107,7 +107,7 @@
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
</div>
</div>
<div class="col-md-6">
<div class="col-sm-6">
<div class="discount-description">
<strong>{{ trans('invoices.discount_desc') }}</strong>
</div>
@ -115,13 +115,12 @@
</div>
</div>
<div class="discount card-footer">
<div class="row text-center">
<div class="col-md-12">
<a href="javascript:void(0)" @click="discount = false" class="btn btn-icon btn-outline-secondary">
<span class="btn-inner--icon"><i class="fas fa-times"></i></span>
<span class="btn-inner--text">{{ trans('general.cancel') }}</span>
<div class="row float-right">
<div class="col-xs-12 col-sm-12">
<a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
{{ trans('general.cancel') }}
</a>
{!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success']) !!}
{!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
</div>
</div>
</div>
@ -189,7 +188,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('bills.index') }}
</div>
</div>

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

@ -98,7 +98,7 @@
<div class="card d-none" :class="[{'show' : discount}]">
<div class="discount card-body">
<div class="row align-items-center">
<div class="col-md-6">
<div class="col-sm-6">
<div class="input-group input-group-merge">
<div class="input-group-prepend">
<span class="input-group-text" id="input-discount">
@ -108,7 +108,7 @@
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
</div>
</div>
<div class="col-md-6">
<div class="col-sm-6">
<div class="discount-description">
<strong>{{ trans('invoices.discount_desc') }}</strong>
</div>
@ -116,13 +116,12 @@
</div>
</div>
<div class="discount card-footer">
<div class="row text-center">
<div class="col-md-12">
<a href="javascript:void(0)" @click="discount = false" class="btn btn-icon btn-outline-secondary">
<span class="btn-inner--icon"><i class="fas fa-times"></i></span>
<span class="btn-inner--text">{{ trans('general.cancel') }}</span>
<div class="row float-right">
<div class="col-xs-12 col-sm-12">
<a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
{{ trans('general.cancel') }}
</a>
{!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success']) !!}
{!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
</div>
</div>
</div>
@ -191,7 +190,7 @@
@permission('update-purchases-bills')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('bills.index') }}
</div>
</div>

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

@ -45,7 +45,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('payments.index') }}
</div>
</div>

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

@ -68,7 +68,7 @@
@permission('update-purchases-payments')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('payments.index') }}
</div>
</div>

2
resources/views/purchases/vendors/create.blade.php vendored
View File

@ -40,7 +40,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('vendors.index') }}
</div>
</div>

2
resources/views/purchases/vendors/edit.blade.php vendored
View File

@ -42,7 +42,7 @@
@permission('update-purchases-vendors')
<div class="card-footer">
<div class="float-right">
<div class="row save-buttons">
{{ Form::saveButtons('vendors.index') }}
</div>
</div>

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

@ -62,7 +62,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('customers.index') }}
</div>
</div>

2
resources/views/sales/customers/edit.blade.php
View File

@ -73,7 +73,7 @@
@permission('update-sales-customers')
<div class="card-footer">
<div class="float-right">
<div class="row save-buttons">
{{ Form::saveButtons('customers.index') }}
</div>
</div>

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

@ -97,7 +97,7 @@
<div class="card d-none" :class="[{'show' : discount}]">
<div class="discount card-body">
<div class="row align-items-center">
<div class="col-md-6">
<div class="col-sm-6">
<div class="input-group input-group-merge">
<div class="input-group-prepend">
<span class="input-group-text" id="input-discount">
@ -107,7 +107,7 @@
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
</div>
</div>
<div class="col-md-6">
<div class="col-sm-6">
<div class="discount-description">
<strong>{{ trans('invoices.discount_desc') }}</strong>
</div>
@ -115,13 +115,12 @@
</div>
</div>
<div class="discount card-footer">
<div class="row text-center">
<div class="col-md-12">
<a href="javascript:void(0)" @click="discount = false" class="btn btn-icon btn-outline-secondary">
<span class="btn-inner--icon"><i class="fas fa-times"></i></span>
<span class="btn-inner--text">{{ trans('general.cancel') }}</span>
<div class="row float-right">
<div class="col-xs-12 col-sm-12">
<a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
{{ trans('general.cancel') }}
</a>
{!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success']) !!}
{!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
</div>
</div>
</div>
@ -191,7 +190,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('invoices.index') }}
</div>
</div>

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

@ -98,7 +98,7 @@
<div class="card d-none" :class="[{'show' : discount}]">
<div class="discount card-body">
<div class="row align-items-center">
<div class="col-md-6">
<div class="col-sm-6">
<div class="input-group input-group-merge">
<div class="input-group-prepend">
<span class="input-group-text" id="input-discount">
@ -108,7 +108,7 @@
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
</div>
</div>
<div class="col-md-6">
<div class="col-sm-6">
<div class="discount-description">
<strong>{{ trans('invoices.discount_desc') }}</strong>
</div>
@ -116,13 +116,12 @@
</div>
</div>
<div class="discount card-footer">
<div class="row text-center">
<div class="col-md-12">
<a href="javascript:void(0)" @click="discount = false" class="btn btn-icon btn-outline-secondary">
<span class="btn-inner--icon"><i class="fas fa-times"></i></span>
<span class="btn-inner--text">{{ trans('general.cancel') }}</span>
<div class="row float-right">
<div class="col-xs-12 col-sm-12">
<a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
{{ trans('general.cancel') }}
</a>
{!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success']) !!}
{!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
</div>
</div>
</div>
@ -193,7 +192,7 @@
@permission('update-sales-invoices')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('invoices.index') }}
</div>
</div>

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

@ -45,7 +45,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('revenues.index') }}
</div>
</div>

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

@ -68,7 +68,7 @@
@permission('update-sales-revenues')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('revenues.index') }}
</div>
</div>

2
resources/views/settings/categories/create.blade.php
View File

@ -41,7 +41,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('categories.index') }}
</div>
</div>

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

@ -48,7 +48,7 @@
@permission('update-settings-categories')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('categories.index') }}
</div>
</div>

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

@ -34,7 +34,7 @@
@permission('update-settings-settings')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('settings.index') }}
</div>
</div>

2
resources/views/settings/currencies/create.blade.php
View File

@ -40,7 +40,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('currencies.index') }}
</div>
</div>

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

@ -42,7 +42,7 @@
@permission('update-settings-currencies')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('currencies.index') }}
</div>
</div>

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

@ -36,7 +36,7 @@
@permission('update-settings-settings')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('settings.index') }}
</div>
</div>

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

@ -89,7 +89,7 @@
<div class="row ml-0 mr-0">
<div class="card col-md-12">
<div class="card-body mr--3">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('settings.index') }}
</div>
</div>

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

@ -54,7 +54,7 @@
@permission('update-settings-settings')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('settings.index') }}
</div>
</div>

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

@ -32,7 +32,7 @@
@permission('update-settings-settings')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('settings.index') }}
</div>
</div>

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

@ -42,7 +42,7 @@
@permission('update-' . $module->getAlias() . '-settings')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('settings.index') }}
</div>
</div>

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

@ -37,7 +37,7 @@
@permission('update-settings-settings')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('settings.index') }}
</div>
</div>

2
resources/views/settings/taxes/create.blade.php
View File

@ -28,7 +28,7 @@
</div>
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('taxes.index') }}
</div>
</div>

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

@ -30,7 +30,7 @@
@permission('update-settings-taxes')
<div class="card-footer">
<div class="row float-right">
<div class="row save-buttons">
{{ Form::saveButtons('taxes.index') }}
</div>
</div>

2
serviceworker.js vendored
View File

@ -2,9 +2,11 @@ var staticCacheName = "pwa-v" + new Date().getTime();
var filesToCache = [
'public/img/icons/akaunting-72x72.png',
'public/img/icons/akaunting-96x96.png',
'public/img/icons/akaunting-120x120.png',
'public/img/icons/akaunting-128x128.png',
'public/img/icons/akaunting-144x144.png',
'public/img/icons/akaunting-152x152.png',
'public/img/icons/akaunting-180x180.png',
'public/img/icons/akaunting-192x192.png',
'public/img/icons/akaunting-384x384.png',
'public/img/icons/akaunting-512x512.png',