report alignment and big test values fixed
This commit is contained in:
		
							
								
								
									
										7
									
								
								public/css/custom.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								public/css/custom.css
									
									
									
									
										vendored
									
									
								
							@@ -690,6 +690,13 @@ table .align-items-center td span.badge {
 | 
			
		||||
}
 | 
			
		||||
/*--------Font Size 50 Finish--------*/
 | 
			
		||||
 | 
			
		||||
/*--------Report Column--------*/
 | 
			
		||||
.report-column
 | 
			
		||||
{
 | 
			
		||||
    width: 160px !important;
 | 
			
		||||
    max-width: 100px !important;
 | 
			
		||||
}
 | 
			
		||||
/*--------Report Column Finish--------*/
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*----------------RESPONSIVE START LINE----------------*/
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,13 @@
 | 
			
		||||
 | 
			
		||||
@section('new_button')
 | 
			
		||||
    <span>
 | 
			
		||||
        <a href="{{ url($class->getUrl('print')) }}" target="_blank" class="btn btn-white btn-sm"><span class="fa fa-print"></span>  {{ trans('general.print') }}</a>
 | 
			
		||||
        <a href="{{ url($class->getUrl('print')) }}" target="_blank" class="btn btn-white btn-sm">
 | 
			
		||||
            <span class="fa fa-print"></span>  {{ trans('general.print') }}
 | 
			
		||||
        </a>
 | 
			
		||||
    </span>
 | 
			
		||||
    <span>
 | 
			
		||||
        <a href="{{ url($class->getUrl('export')) }}" class="btn btn-white btn-sm"><span class="fa fa-upload"></span>  {{ trans('general.export') }}</a>
 | 
			
		||||
        <a href="{{ url($class->getUrl('export')) }}" class="btn btn-white btn-sm">
 | 
			
		||||
            <span class="fa fa-upload"></span>  {{ trans('general.export') }}
 | 
			
		||||
        </a>
 | 
			
		||||
    </span>
 | 
			
		||||
@endsection
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,5 @@
 | 
			
		||||
<div class="table-responsive overflow-auto">
 | 
			
		||||
    <table class="table align-items-center table-hover">
 | 
			
		||||
<div class="table-responsive overflow-auto mt-5">
 | 
			
		||||
    <table class="table align-items-center">
 | 
			
		||||
        @include($class->views['table.header'])
 | 
			
		||||
            <tbody>
 | 
			
		||||
                @if (!empty($class->rows[$table]))
 | 
			
		||||
 
 | 
			
		||||
@@ -1,11 +1,11 @@
 | 
			
		||||
<tfoot>
 | 
			
		||||
    <tr>
 | 
			
		||||
        <th>{{ trans_choice('general.totals', 1) }}</th>
 | 
			
		||||
        <th class="long-texts report-column">{{ trans_choice('general.totals', 1) }}</th>
 | 
			
		||||
        @php $total_total = 0; @endphp
 | 
			
		||||
        @foreach($class->totals[$table] as $total)
 | 
			
		||||
            @php $total_total += $total; @endphp
 | 
			
		||||
            <th class="text-right pl-0">@money($total, setting('default.currency'), true)</th>
 | 
			
		||||
            <th class="long-texts report-column">@money($total, setting('default.currency'), true)</th>
 | 
			
		||||
        @endforeach
 | 
			
		||||
        <th class="text-right pl-0">@money($total_total, setting('default.currency'), true)</th>
 | 
			
		||||
        <th class="long-texts report-column">@money($total_total, setting('default.currency'), true)</th>
 | 
			
		||||
    </tr>
 | 
			
		||||
</tfoot>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,9 +1,9 @@
 | 
			
		||||
@php $row_total = 0; @endphp
 | 
			
		||||
<tr>
 | 
			
		||||
    <td>{{ $class->getTableRowList()[$id] }}</td>
 | 
			
		||||
    <td class="long-texts report-column">{{ $class->getTableRowList()[$id] }}</td>
 | 
			
		||||
    @foreach($items as $item)
 | 
			
		||||
        @php $row_total += $item; @endphp
 | 
			
		||||
        <td class="text-right pl-0">@money($item, setting('default.currency'), true)</td>
 | 
			
		||||
        <td class="long-texts report-column">@money($item, setting('default.currency'), true)</td>
 | 
			
		||||
    @endforeach
 | 
			
		||||
    <th class="text-right pl-0">@money($row_total, setting('default.currency'), true)</th>
 | 
			
		||||
    <td class="long-texts report-column">@money($row_total, setting('default.currency'), true)</td>
 | 
			
		||||
</tr>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,13 +1,15 @@
 | 
			
		||||
<div class="table-responsive mt-4 overflow-auto">
 | 
			
		||||
<div class="table-responsive overflow-auto mt-5">
 | 
			
		||||
    <table class="table align-items-center">
 | 
			
		||||
        <thead class="border-top-style">
 | 
			
		||||
        <tfoot class="border-top-style">
 | 
			
		||||
            <tr>
 | 
			
		||||
                <th style="width: 179px;">{{ trans('reports.net_profit') }}</th>
 | 
			
		||||
                <th class="long-texts report-column">{{ trans('reports.net_profit') }}</th>
 | 
			
		||||
                @foreach($class->net_profit as $profit)
 | 
			
		||||
                    <th class="text-right">@money($profit, setting('default.currency'), true)</th>
 | 
			
		||||
                    <th class="long-texts report-column">@money($profit, setting('default.currency'), true)</th>
 | 
			
		||||
                @endforeach
 | 
			
		||||
                <th class="text-right">@money(array_sum($class->net_profit), setting('default.currency'), true)</th>
 | 
			
		||||
                <th class="long-texts report-column">
 | 
			
		||||
                    @money(array_sum($class->net_profit), setting('default.currency'), true)
 | 
			
		||||
                </th>
 | 
			
		||||
            </tr>
 | 
			
		||||
        </thead>
 | 
			
		||||
        </tfoot>
 | 
			
		||||
    </table>
 | 
			
		||||
</div>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,11 +2,13 @@
 | 
			
		||||
    <table class="table align-items-center">
 | 
			
		||||
        <thead class="border-top-style">
 | 
			
		||||
            <tr>
 | 
			
		||||
                <th style="width: 152px;"></th>
 | 
			
		||||
                <th class="long-texts report-column"></th>
 | 
			
		||||
                @foreach($class->dates as $date)
 | 
			
		||||
                    <th class="text-right">{{ $date }}</th>
 | 
			
		||||
                    <th class="long-texts report-column">{{ $date }}</th>
 | 
			
		||||
                @endforeach
 | 
			
		||||
                <th class="text-right">{{ trans_choice('general.totals', 1) }}</th>
 | 
			
		||||
                <th class="long-texts report-column">
 | 
			
		||||
                    <h5>{{ trans_choice('general.totals', 1) }}</h5>
 | 
			
		||||
                </th>
 | 
			
		||||
            </tr>
 | 
			
		||||
        </thead>
 | 
			
		||||
    </table>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,11 +1,11 @@
 | 
			
		||||
<tfoot>
 | 
			
		||||
    <tr>
 | 
			
		||||
        <th style="width: 179px;">{{ trans_choice('general.totals', 1) }}</th>
 | 
			
		||||
        <th class="long-texts report-column">{{ trans_choice('general.totals', 1) }}</th>
 | 
			
		||||
        @php $total_total = 0; @endphp
 | 
			
		||||
        @foreach($class->totals[$table] as $date => $total)
 | 
			
		||||
            @php $total_total += $total; @endphp
 | 
			
		||||
            <th class="text-right">@money($total, setting('default.currency'), true)</th>
 | 
			
		||||
            <th class="long-texts report-column">@money($total, setting('default.currency'), true)</th>
 | 
			
		||||
        @endforeach
 | 
			
		||||
        <th class="text-right">@money($total_total, setting('default.currency'), true)</th>
 | 
			
		||||
        <th class="long-texts report-column">@money($total_total, setting('default.currency'), true)</th>
 | 
			
		||||
    </tr>
 | 
			
		||||
</tfoot>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,7 @@
 | 
			
		||||
<thead class="border-top-style">
 | 
			
		||||
    <tr>
 | 
			
		||||
        <th colspan="{{ count($class->dates) + 2 }}">{{ $table }}</th>
 | 
			
		||||
        <th colspan="{{ count($class->dates) + 2 }}">
 | 
			
		||||
            <h5>{{ $table }}</h5>
 | 
			
		||||
        </th>
 | 
			
		||||
    </tr>
 | 
			
		||||
</thead>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,11 +2,13 @@
 | 
			
		||||
    <table class="table align-items-center">
 | 
			
		||||
        <thead class="border-top-style">
 | 
			
		||||
            <tr>
 | 
			
		||||
                <th style="width: 152px;"></th>
 | 
			
		||||
                <th class="long-texts report-column"></th>
 | 
			
		||||
                @foreach($class->dates as $date)
 | 
			
		||||
                    <th class="text-right">{{ $date }}</th>
 | 
			
		||||
                    <th class="long-texts report-column">{{ $date }}</th>
 | 
			
		||||
                @endforeach
 | 
			
		||||
                <th class="text-right">{{ trans_choice('general.totals', 1) }}</th>
 | 
			
		||||
                <th class="long-texts report-column">
 | 
			
		||||
                    <h5>{{ trans_choice('general.totals', 1) }}</h5>
 | 
			
		||||
                </th>
 | 
			
		||||
            </tr>
 | 
			
		||||
        </thead>
 | 
			
		||||
    </table>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,11 +1,11 @@
 | 
			
		||||
<tfoot>
 | 
			
		||||
    <tr>
 | 
			
		||||
        <th style="width: 179px;">{{ trans('reports.net') }}</th>
 | 
			
		||||
        <th class="long-texts report-column">{{ trans('reports.net') }}</th>
 | 
			
		||||
        @php $total_total = 0; @endphp
 | 
			
		||||
        @foreach($class->totals[$table] as $total)
 | 
			
		||||
            @php $total_total += $total; @endphp
 | 
			
		||||
            <th class="text-right">@money($total, setting('default.currency'), true)</th>
 | 
			
		||||
            <th class="long-texts report-column">@money($total, setting('default.currency'), true)</th>
 | 
			
		||||
        @endforeach
 | 
			
		||||
        <th class="text-right">@money($total_total, setting('default.currency'), true)</th>
 | 
			
		||||
        <th class="long-texts report-column">@money($total_total, setting('default.currency'), true)</th>
 | 
			
		||||
    </tr>
 | 
			
		||||
</tfoot>
 | 
			
		||||
 
 | 
			
		||||
@@ -16,23 +16,15 @@
 | 
			
		||||
    @stack('name_td_start')
 | 
			
		||||
        <td class="col-md-3 border-right-0 border-bottom-0">
 | 
			
		||||
            @stack('name_input_start')
 | 
			
		||||
                {{ Form::selectAddNewGroup('name', '', '', $items, '', [
 | 
			
		||||
                    'data-item' => 'name',
 | 
			
		||||
                    'v-model' => 'row.name',
 | 
			
		||||
                    '@input' => 'onGetItem($event, index)',
 | 
			
		||||
                    'class' => 'form-control',
 | 
			
		||||
                    'autocomplete' => 'form-control',
 | 
			
		||||
                    'path' => route('modals.taxes.create')
 | 
			
		||||
                ], 'mb-0 select-item') }}
 | 
			
		||||
                <input name="items[][show]"
 | 
			
		||||
                       value="false"
 | 
			
		||||
                       v-model="row.show"
 | 
			
		||||
                       data-item="show"
 | 
			
		||||
                       type="hidden">
 | 
			
		||||
                <input name="items[][item_id]"
 | 
			
		||||
                       v-model="row.item_id"
 | 
			
		||||
                       data-item="item_id"
 | 
			
		||||
                       type="hidden">
 | 
			
		||||
                <input class="form-control text-center"
 | 
			
		||||
                       autocomplete="off"
 | 
			
		||||
                       required="required"
 | 
			
		||||
                       data-item="name"
 | 
			
		||||
                       v-model="row.name"
 | 
			
		||||
                       @input="onCalculateTotal"
 | 
			
		||||
                       name="item[][name]"
 | 
			
		||||
                       type="text">
 | 
			
		||||
                {!! $errors->first('item.name', '<p class="help-block">:message</p>') !!}
 | 
			
		||||
            @stack('name_input_end')
 | 
			
		||||
        </td>
 | 
			
		||||
    @stack('name_td_end')
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user