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

Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

Browse Source 
# Conflicts:
#	app/Http/Controllers/Common/Items.php
#	resources/views/modules/item/documentation.blade.php
#	resources/views/modules/item/show.blade.php
#	resources/views/partials/admin/header.blade.php
#	resources/views/purchases/bills/show.blade.php
#	resources/views/purchases/vendors/show.blade.php
#	resources/views/sales/customers/show.blade.php
#	resources/views/sales/invoices/show.blade.php
#	resources/views/wizard/companies/edit.blade.php
#	resources/views/wizard/currencies/index.blade.php
#	resources/views/wizard/finish/index.blade.php
#	resources/views/wizard/taxes/index.blade.php
This commit is contained in:
Cüneyt Şentürk
2020-08-28 19:24:26 +03:00
parent a99f2d63ad 7860a4fcf8
commit a3b5cc7ddd
824 changed files with 14086 additions and 5612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@
var url = '{{ url("/") }}';
var app_home = '{{ route("apps.home.index") }}';
var app_url = '{{ config("app.url") }}';
var aka_currency = {!! !empty($currency) ? $currency : 'false' !!};
//--></script>
@stack('js')

21
resources/views/partials/modules/pre_sale.blade.php
View File

@ -1,22 +1,25 @@
<div class="col-md-3">
<div class="card">
<div class="card-header py-2">
<div class="float-left ml--3">
<h4 class="mb-0"><a href="{{ route('apps.app.show', $module->slug) }}">{{ $module->name }}</a></h4>
</div>
<div class="float-right mr--3">
<span class="badge badge-pill badge-danger">{{ trans('modules.badge.pre_sale') }}</span>
</div>
<h4 class="ml--3 mb-0 float-left">
<a href="{{ route('apps.app.show', $module->slug) }}">{{ $module->name }}</a>
</h4>
<span class="mr--3 float-right">
<span class="badge bg-danger text-white">{{ trans('modules.badge.pre_sale') }}</span>
</span>
</div>
<a href="{{ route('apps.app.show', [module->slug) }}">
<a href="{{ route('apps.app.show', $module->slug) }}">
@foreach ($module->files as $file)
@if (($file->media_type == 'image') && ($file->pivot->zone == 'thumbnail'))
<img src="{{ $file->path_string }}" alt="{{ $module->name }}" class="card-img-top card-border">
<img src="{{ $file->path_string }}" alt="{{ $module->name }}" class="card-img-top border-radius-none">
@endif
@endforeach
</a>
<div class="card-footer py-2">
<div class="float-left ml--3 mt-1">
<div class="float-left ml--3 mt--1">
<small class="text-sm">
{{ trans('modules.pre_sale') }}
</small>