Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix group/sum in report

Browse Source
This commit is contained in:
Hillel Coren 2018-02-16 15:20:07 +02:00
parent 4d618b87ea
commit d3454d1fea
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/views/reports/report_builder.blade.php
View File

@ -3,6 +3,8 @@
@section('head') @section('head')
@parent @parent
@include('money_script')
<script src="{{ asset('js/daterangepicker.min.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script> <script src="{{ asset('js/daterangepicker.min.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
<link href="{{ asset('css/daterangepicker.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/> <link href="{{ asset('css/daterangepicker.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
@ -446,9 +448,9 @@
var sumColumns = []; var sumColumns = [];
@foreach ($columns as $column => $class) @foreach ($columns as $column => $class)
sumColumns.push("{{ in_array($column, ['amount', 'paid', 'balance', 'cost', 'duration', 'tax']) ? trans("texts.{$column}") : false }}"); sumColumns.push("{{ in_array($column, ['amount', 'paid', 'balance', 'cost', 'duration', 'tax', 'qty']) ? trans("texts.{$column}") : false }}");
@endforeach @endforeach
console.log(sumColumns);
$(function() { $(function() {
$('.start_date .input-group-addon').click(function() { $('.start_date .input-group-addon').click(function() {
toggleDatePicker('start_date'); toggleDatePicker('start_date');
@ -501,6 +503,7 @@
if (str.indexOf(':') >= 0) { if (str.indexOf(':') >= 0) {
return roundToTwo(moment.duration(str).asHours()); return roundToTwo(moment.duration(str).asHours());
} else { } else {
return NINJA.parseFloat(str);
var number = Number(str.replace(/[^0-9\-]+/g, '')); var number = Number(str.replace(/[^0-9\-]+/g, ''));
return number / 100; return number / 100;
} }