Fix indent

This commit is contained in:
Gilbert Paquin 2017-08-02 11:14:14 -04:00
parent 4ad3b52942
commit 20285f9ae0

View File

@ -1,7 +1,7 @@
@extends('header') @extends('header')
@section('head') @section('head')
@parent @parent
<script src="{{ asset('js/daterangepicker.min.js') }}" type="text/javascript"></script> <script src="{{ asset('js/daterangepicker.min.js') }}" type="text/javascript"></script>
<link href="{{ asset('css/daterangepicker.css') }}" rel="stylesheet" type="text/css"/> <link href="{{ asset('css/daterangepicker.css') }}" rel="stylesheet" type="text/css"/>
@ -9,42 +9,42 @@
<link href="{{ asset('css/tablesorter.css') }}" rel="stylesheet" type="text/css"/> <link href="{{ asset('css/tablesorter.css') }}" rel="stylesheet" type="text/css"/>
<script src="{{ asset('js/tablesorter.min.js') }}" type="text/javascript"></script> <script src="{{ asset('js/tablesorter.min.js') }}" type="text/javascript"></script>
<style type="text/css"> <style type="text/css">
table.tablesorter th { table.tablesorter th {
color: white; color: white;
background-color: #777 !important; background-color: #777 !important;
} }
</style> </style>
@stop @stop
@section('content') @section('content')
@if (!Utils::isPro()) @if (!Utils::isPro())
<div class="alert alert-warning" style="font-size:larger;"> <div class="alert alert-warning" style="font-size:larger;">
<center> <center>
{!! trans('texts.pro_plan_reports', ['link'=>'<a href="javascript:showUpgradeModal()">' . trans('texts.pro_plan_remove_logo_link') . '</a>']) !!} {!! trans('texts.pro_plan_reports', ['link'=>'<a href="javascript:showUpgradeModal()">' . trans('texts.pro_plan_remove_logo_link') . '</a>']) !!}
</center> </center>
</div> </div>
@endif @endif
<script type="text/javascript"> <script type="text/javascript">
var chartStartDate = moment("{{ $startDate }}"); var chartStartDate = moment("{{ $startDate }}");
var chartEndDate = moment("{{ $endDate }}"); var chartEndDate = moment("{{ $endDate }}");
var dateRanges = {!! $account->present()->dateRangeOptions !!}; var dateRanges = {!! $account->present()->dateRangeOptions !!};
$(function() { $(function() {
if (isStorageSupported()) { if (isStorageSupported()) {
var lastRange = localStorage.getItem('last:report_range'); var lastRange = localStorage.getItem('last:report_range');
lastRange = dateRanges[lastRange]; lastRange = dateRanges[lastRange];
if (lastRange) { if (lastRange) {
chartStartDate = lastRange[0]; chartStartDate = lastRange[0];
chartEndDate = lastRange[1]; chartEndDate = lastRange[1];
} }
} }
// Initialize date range selector // Initialize date range selector
function cb(start, end, label) { function cb(start, end, label) {
@ -52,20 +52,20 @@
$('#start_date').val(start.format('YYYY-MM-DD')); $('#start_date').val(start.format('YYYY-MM-DD'));
$('#end_date').val(end.format('YYYY-MM-DD')); $('#end_date').val(end.format('YYYY-MM-DD'));
if (isStorageSupported() && label && label != "{{ trans('texts.custom_range') }}") { if (isStorageSupported() && label && label != "{{ trans('texts.custom_range') }}") {
localStorage.setItem('last:report_range', label); localStorage.setItem('last:report_range', label);
} }
} }
$('#reportrange').daterangepicker({ $('#reportrange').daterangepicker({
locale: { locale: {
format: "{{ $account->getMomentDateFormat() }}", format: "{{ $account->getMomentDateFormat() }}",
customRangeLabel: "{{ trans('texts.custom_range') }}", customRangeLabel: "{{ trans('texts.custom_range') }}",
}, },
startDate: chartStartDate, startDate: chartStartDate,
endDate: chartEndDate, endDate: chartEndDate,
linkedCalendars: false, linkedCalendars: false,
ranges: dateRanges, ranges: dateRanges,
}, cb); }, cb);
cb(chartStartDate, chartEndDate); cb(chartStartDate, chartEndDate);
@ -78,138 +78,138 @@
{!! Former::open()->addClass('report-form')->rules(['start_date' => 'required', 'end_date' => 'required']) !!} {!! Former::open()->addClass('report-form')->rules(['start_date' => 'required', 'end_date' => 'required']) !!}
<div style="display:none"> <div style="display:none">
{!! Former::text('action') !!} {!! Former::text('action') !!}
</div> </div>
{!! Former::populateField('start_date', $startDate) !!} {!! Former::populateField('start_date', $startDate) !!}
{!! Former::populateField('end_date', $endDate) !!} {!! Former::populateField('end_date', $endDate) !!}
@if ( ! request()->report_type) @if ( ! request()->report_type)
{!! Former::populateField('group_when_sorted', 1) !!} {!! Former::populateField('group_when_sorted', 1) !!}
{!! Former::populateField('group_dates_by', 'monthyear') !!} {!! Former::populateField('group_dates_by', 'monthyear') !!}
@endif @endif
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">{!! trans('texts.report_settings') !!}</h3> <h3 class="panel-title">{!! trans('texts.report_settings') !!}</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
{!! Former::select('report_type')->options($reportTypes, $reportType)->label(trans('texts.type')) !!} {!! Former::select('report_type')->options($reportTypes, $reportType)->label(trans('texts.type')) !!}
<div class="form-group"> <div class="form-group">
<label for="reportrange" class="control-label col-lg-4 col-sm-4"> <label for="reportrange" class="control-label col-lg-4 col-sm-4">
{{ trans('texts.date_range') }} {{ trans('texts.date_range') }}
</label> </label>
<div class="col-lg-8 col-sm-8"> <div class="col-lg-8 col-sm-8">
<div id="reportrange" style="background: #f9f9f9; cursor: pointer; padding: 9px 14px; border: 1px solid #dfe0e1; margin-top: 0px;"> <div id="reportrange" style="background: #f9f9f9; cursor: pointer; padding: 9px 14px; border: 1px solid #dfe0e1; margin-top: 0px;">
<i class="glyphicon glyphicon-calendar fa fa-calendar"></i>&nbsp; <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>&nbsp;
<span></span> <b class="caret"></b> <span></span> <b class="caret"></b>
</div> </div>
<div style="display:none"> <div style="display:none">
{!! Former::text('start_date') !!} {!! Former::text('start_date') !!}
{!! Former::text('end_date') !!} {!! Former::text('end_date') !!}
</div>
</div> </div>
</div> </div>
<div id="statusField" style="display:{{ in_array($reportType, [ENTITY_INVOICE, ENTITY_PRODUCT]) ? 'block' : 'none' }}">
{!! Former::select('invoice_status')->label('status')
->addOption(trans('texts.all'), 'all')
->addOption(trans('texts.draft'), 'draft')
->addOption(trans('texts.sent'), 'sent')
->addOption(trans('texts.unpaid'), 'unpaid')
->addOption(trans('texts.paid'), 'paid') !!}
</div>
<div id="dateField" style="display:{{ $reportType == ENTITY_TAX_RATE ? 'block' : 'none' }}">
{!! Former::select('date_field')->label(trans('texts.filter'))
->addOption(trans('texts.invoice_date'), FILTER_INVOICE_DATE)
->addOption(trans('texts.payment_date'), FILTER_PAYMENT_DATE) !!}
</div>
</div> </div>
<div class="col-md-6">
{!! Former::checkbox('group_when_sorted')->text('enable') !!} <div id="statusField" style="display:{{ in_array($reportType, [ENTITY_INVOICE, ENTITY_PRODUCT]) ? 'block' : 'none' }}">
{!! Former::select('group_dates_by') {!! Former::select('invoice_status')->label('status')
->addOption(trans('texts.day'), 'day') ->addOption(trans('texts.all'), 'all')
->addOption(trans('texts.month'), 'monthyear') ->addOption(trans('texts.draft'), 'draft')
->addOption(trans('texts.year'), 'year') !!} ->addOption(trans('texts.sent'), 'sent')
->addOption(trans('texts.unpaid'), 'unpaid')
->addOption(trans('texts.paid'), 'paid') !!}
</div>
<div id="dateField" style="display:{{ $reportType == ENTITY_TAX_RATE ? 'block' : 'none' }}">
{!! Former::select('date_field')->label(trans('texts.filter'))
->addOption(trans('texts.invoice_date'), FILTER_INVOICE_DATE)
->addOption(trans('texts.payment_date'), FILTER_PAYMENT_DATE) !!}
</div> </div>
</div> </div>
</div> <div class="col-md-6">
</div>
@if (!Auth::user()->hasFeature(FEATURE_REPORTS)) {!! Former::checkbox('group_when_sorted')->text('enable') !!}
<script> {!! Former::select('group_dates_by')
$(function() { ->addOption(trans('texts.day'), 'day')
$('form.report-form').find('input, button').prop('disabled', true); ->addOption(trans('texts.month'), 'monthyear')
}); ->addOption(trans('texts.year'), 'year') !!}
</script>
@endif </div>
</div>
</div>
</div>
@if (!Auth::user()->hasFeature(FEATURE_REPORTS))
<script>
$(function() {
$('form.report-form').find('input, button').prop('disabled', true);
});
</script>
@endif
<center> <center>
{!! Former::select('format') {!! Former::select('format')
->label(trans('texts.format_export')) ->label(trans('texts.format_export'))
->options(['csv' => 'CSV', 'pdf' => 'PDF', 'xlsx' => 'Excel']) !!} ->options(['csv' => 'CSV', 'pdf' => 'PDF', 'xlsx' => 'Excel']) !!}
{!! Button::primary(trans('texts.export')) {!! Button::primary(trans('texts.export'))
->withAttributes(array('onclick' => 'onExportClick()')) ->withAttributes(array('onclick' => 'onExportClick()'))
->appendIcon(Icon::create('export')) ->appendIcon(Icon::create('export'))
->large() !!} ->large() !!}
{!! Button::success(trans('texts.run')) {!! Button::success(trans('texts.run'))
->withAttributes(array('id' => 'submitButton')) ->withAttributes(array('id' => 'submitButton'))
->submit() ->submit()
->appendIcon(Icon::create('play')) ->appendIcon(Icon::create('play'))
->large() !!} ->large() !!}
</center><br/> </center><br/>
{!! Former::close() !!} {!! Former::close() !!}
@if (request()->report_type) @if (request()->report_type)
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
@if (count(array_values($reportTotals))) @if (count(array_values($reportTotals)))
<table class="tablesorter tablesorter-totals" style="display:none"> <table class="tablesorter tablesorter-totals" style="display:none">
<thead> <thead>
<tr> <tr>
<th>{{ trans("texts.totals") }}</th> <th>{{ trans("texts.totals") }}</th>
@foreach (array_values(array_values($reportTotals)[0])[0] as $key => $val) @foreach (array_values(array_values($reportTotals)[0])[0] as $key => $val)
<th>{{ trans("texts.{$key}") }}</th> <th>{{ trans("texts.{$key}") }}</th>
@endforeach @endforeach
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach ($reportTotals as $currencyId => $each) @foreach ($reportTotals as $currencyId => $each)
@foreach ($each as $dimension => $val) @foreach ($each as $dimension => $val)
<tr> <tr>
<td>{!! Utils::getFromCache($currencyId, 'currencies')->name !!} <td>{!! Utils::getFromCache($currencyId, 'currencies')->name !!}
@if ($dimension) @if ($dimension)
- {{ $dimension }} - {{ $dimension }}
@endif @endif
</td> </td>
@foreach ($val as $id => $field) @foreach ($val as $id => $field)
<td>{!! Utils::formatMoney($field, $currencyId) !!}</td> <td>{!! Utils::formatMoney($field, $currencyId) !!}</td>
@endforeach @endforeach
</tr> </tr>
@endforeach @endforeach
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
<p>&nbsp;</p> <p>&nbsp;</p>
@endif @endif
<!-- <!--
<div class="columnSelectorWrapper"> <div class="columnSelectorWrapper">
<input id="colSelect1" type="checkbox" class="hidden"> <input id="colSelect1" type="checkbox" class="hidden">
<label class="columnSelectorButton" for="colSelect1">Column</label> <label class="columnSelectorButton" for="colSelect1">Column</label>
@ -219,153 +219,153 @@
</div> </div>
--> -->
<table class="tablesorter tablesorter-data" style="display:none"> <table class="tablesorter tablesorter-data" style="display:none">
<thead> <thead>
<tr> <tr>
{!! $report->tableHeader() !!} {!! $report->tableHeader() !!}
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@if (count($displayData)) @if (count($displayData))
@foreach ($displayData as $record) @foreach ($displayData as $record)
<tr> <tr>
@foreach ($record as $field) @foreach ($record as $field)
<td>{!! $field !!}</td> <td>{!! $field !!}</td>
@endforeach @endforeach
</tr> </tr>
@endforeach @endforeach
@else @else
<tr> <tr>
<td colspan="10" style="text-align: center">{{ trans('texts.empty_table') }}</td> <td colspan="10" style="text-align: center">{{ trans('texts.empty_table') }}</td>
</tr> </tr>
@endif @endif
</tbody> </tbody>
</table> </table>
<br/> <br/>
<div style="color:#888888"> <div style="color:#888888">
{{ trans('texts.reports_help') }} {{ trans('texts.reports_help') }}
</div> </div>
</div>
</div>
</div> </div>
</div>
@endif </div>
<script type="text/javascript"> @endif
function onExportClick() { <script type="text/javascript">
$('#action').val('export');
$('#submitButton').click(); function onExportClick() {
$('#action').val(''); $('#action').val('export');
$('#submitButton').click();
$('#action').val('');
}
var sumColumns = [];
@foreach ($columns as $column)
sumColumns.push("{{ in_array($column, ['amount', 'paid', 'balance', 'cost', 'duration']) ? trans("texts.{$column}") : false }}");
@endforeach
$(function() {
$('.start_date .input-group-addon').click(function() {
toggleDatePicker('start_date');
});
$('.end_date .input-group-addon').click(function() {
toggleDatePicker('end_date');
});
$('#report_type').change(function() {
var val = $('#report_type').val();
if (val == '{{ ENTITY_TAX_RATE }}') {
$('#dateField').fadeIn();
} else {
$('#dateField').fadeOut();
} }
if (val == '{{ ENTITY_INVOICE }}' || val == '{{ ENTITY_PRODUCT }}') {
$('#statusField').fadeIn();
} else {
$('#statusField').fadeOut();
}
if (isStorageSupported()) {
localStorage.setItem('last:report_type', val);
}
});
var sumColumns = []; // parse 1,000.00 or 1.000,00
@foreach ($columns as $column) function convertStringToNumber(str) {
sumColumns.push("{{ in_array($column, ['amount', 'paid', 'balance', 'cost', 'duration']) ? trans("texts.{$column}") : false }}"); str = str + '' || '';
@endforeach if (str.indexOf(':') >= 0) {
return roundToTwo(moment.duration(str).asHours());
} else {
var number = Number(str.replace(/[^0-9]+/g, ''));
return number / 100;
}
}
$(function() { $(function(){
$('.start_date .input-group-addon').click(function() { $(".tablesorter-data").tablesorter({
toggleDatePicker('start_date'); @if (! request()->group_when_sorted)
}); sortList: [[0,0]],
$('.end_date .input-group-addon').click(function() { @endif
toggleDatePicker('end_date'); theme: 'bootstrap',
}); widgets: ['zebra', 'uitheme', 'filter'{!! request()->group_when_sorted ? ", 'group'" : "" !!}, 'columnSelector'],
headerTemplate : '{content} {icon}',
@if ($report)
dateFormat: '{{ $report->convertDateFormat() }}',
@endif
numberSorter: function(a, b, direction) {
var a = convertStringToNumber(a);
var b = convertStringToNumber(b);
return direction ? a - b : b - a;
},
widgetOptions : {
columnSelector_container : $('#columnSelector'),
filter_cssFilter: 'form-control',
group_collapsed: true,
group_saveGroups: false,
//group_formatter : function(txt, col, table, c, wo, data) {},
group_callback: function ($cell, $rows, column, table) {
for (var i=0; i<sumColumns.length; i++) {
var label = sumColumns[i];
if (!label) {
continue;
}
var subtotal = 0;
$rows.each(function() {
var txt = $(this).find("td").eq(i).text();
subtotal += convertStringToNumber(txt);
});
$cell.find(".group-count").append(' - ' + label + ': ' + roundToTwo(subtotal));
}
},
}
}).show();
$('#report_type').change(function() { $(".tablesorter-totals").tablesorter({
var val = $('#report_type').val(); theme: 'bootstrap',
if (val == '{{ ENTITY_TAX_RATE }}') { widgets: ['zebra', 'uitheme'],
$('#dateField').fadeIn(); }).show();
} else {
$('#dateField').fadeOut();
}
if (val == '{{ ENTITY_INVOICE }}' || val == '{{ ENTITY_PRODUCT }}') {
$('#statusField').fadeIn();
} else {
$('#statusField').fadeOut();
}
if (isStorageSupported()) {
localStorage.setItem('last:report_type', val);
}
});
// parse 1,000.00 or 1.000,00 var lastReportType = localStorage.getItem('last:report_type');
function convertStringToNumber(str) { if (lastReportType) {
str = str + '' || ''; $('#report_type').val(lastReportType);
if (str.indexOf(':') >= 0) { }
return roundToTwo(moment.duration(str).asHours()); });
} else { })
var number = Number(str.replace(/[^0-9]+/g, ''));
return number / 100;
}
}
$(function(){
$(".tablesorter-data").tablesorter({
@if (! request()->group_when_sorted)
sortList: [[0,0]],
@endif
theme: 'bootstrap',
widgets: ['zebra', 'uitheme', 'filter'{!! request()->group_when_sorted ? ", 'group'" : "" !!}, 'columnSelector'],
headerTemplate : '{content} {icon}',
@if ($report)
dateFormat: '{{ $report->convertDateFormat() }}',
@endif
numberSorter: function(a, b, direction) {
var a = convertStringToNumber(a);
var b = convertStringToNumber(b);
return direction ? a - b : b - a;
},
widgetOptions : {
columnSelector_container : $('#columnSelector'),
filter_cssFilter: 'form-control',
group_collapsed: true,
group_saveGroups: false,
//group_formatter : function(txt, col, table, c, wo, data) {},
group_callback: function ($cell, $rows, column, table) {
for (var i=0; i<sumColumns.length; i++) {
var label = sumColumns[i];
if (!label) {
continue;
}
var subtotal = 0;
$rows.each(function() {
var txt = $(this).find("td").eq(i).text();
subtotal += convertStringToNumber(txt);
});
$cell.find(".group-count").append(' - ' + label + ': ' + roundToTwo(subtotal));
}
},
}
}).show();
$(".tablesorter-totals").tablesorter({
theme: 'bootstrap',
widgets: ['zebra', 'uitheme'],
}).show();
var lastReportType = localStorage.getItem('last:report_type');
if (lastReportType) {
$('#report_type').val(lastReportType);
}
});
})
</script> </script>
@stop @stop
@section('onReady') @section('onReady')
$('#start_date, #end_date').datepicker({ $('#start_date, #end_date').datepicker({
autoclose: true, autoclose: true,
todayHighlight: true, todayHighlight: true,
keyboardNavigation: false keyboardNavigation: false
}); });
@stop @stop