diff --git a/public/css/print.css b/public/css/print.css index f98bb8dbd..0b1d3ccbd 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -546,6 +546,11 @@ html[dir='rtl'] .text-alignment-right { /*--Print Template Classic Finish--*/ /*--Print Template Modern Start--*/ +.justify-content-between +{ + justify-content: space-between !important; +} + .align-items-center { align-items: center !important; diff --git a/resources/views/components/reports/summary.blade.php b/resources/views/components/reports/summary.blade.php index d99afd9c1..44741e6a2 100644 --- a/resources/views/components/reports/summary.blade.php +++ b/resources/views/components/reports/summary.blade.php @@ -1,9 +1,17 @@ +@php + $is_print = request()->routeIs('reports.print'); +@endphp + @include($class->views['summary.content.header']) @foreach($class->tables as $table_key => $table_name) -
+
@include($class->views['summary.table']) - @include($class->views['summary.chart']) + + @if (! $is_print) + @include($class->views['summary.chart']) + @endif
@endforeach diff --git a/resources/views/components/reports/summary/table/body.blade.php b/resources/views/components/reports/summary/table/body.blade.php index 9d0b56f8d..cee095c6a 100644 --- a/resources/views/components/reports/summary/table/body.blade.php +++ b/resources/views/components/reports/summary/table/body.blade.php @@ -1,10 +1,20 @@
-
-

{{ $table_name }}

- {{ $class->has_money ? money($grand_total, default_currency(), true) : $grand_total }} +
$is_print, + 'flex items-center justify-between text-xl text-black-400 border-b pb-2' => !$is_print + ]) + > +

{{ $table_name }}

+ {{ $class->has_money ? money($grand_total, default_currency(), true) : $grand_total }}
@if (!empty($class->row_values[$table_key])) -
    +
      $is_print, + 'space-y-2 my-3' => !$is_print + ]) + > @foreach($class->row_tree_nodes[$table_key] as $id => $node) @include($class->views['summary.table.row'], ['tree_level' => 0]) @endforeach diff --git a/resources/views/components/reports/summary/table/row.blade.php b/resources/views/components/reports/summary/table/row.blade.php index 6f71d7ccf..904de4eed 100644 --- a/resources/views/components/reports/summary/table/row.blade.php +++ b/resources/views/components/reports/summary/table/row.blade.php @@ -6,15 +6,25 @@ @if ($row_total = array_sum($rows)) @if (isset($parent_id)) -
    • +
    • $is_print, + 'collapse-sub' => !$is_print + ]) + data-collapse="child-{{ $parent_id }}"> @else
    • @endif -
      +
      $is_print, + 'flex justify-between border-0 m-0 p-0' => !$is_print + ]) + > @if (isset($parent_id)) -
      +
      @else -
      +
      @endif {{ $class->row_names[$table_key][$id] }}
      @@ -43,17 +53,24 @@ @if ($row_total = array_sum($parent_row_values)) @if (isset($parent_id)) -
    • +
    • $is_print, + 'collapse-sub' => !$is_print + ]) + data-collapse="child-{{ $parent_id }}"> @else
    • @endif -
      -
      +
      +
      {{ $class->row_names[$table_key][$id] }} - @if (array_sum($parent_row_values) != array_sum($class->row_values[$table_key][$id])) - + @if (!$is_print) + @if (array_sum($parent_row_values) != array_sum($class->row_values[$table_key][$id])) + + @endif @endif
      {{ $class->has_money ? money($row_total, setting('default.currency'), true) : $row_total }} @@ -64,9 +81,14 @@ @php $rows = $class->row_values[$table_key][$id]; @endphp @if (($row_total = array_sum($rows)) && array_sum($parent_row_values) != array_sum($rows)) -
    • -
      -
      +
    • $is_print, + 'collapse-sub' => !$is_print + ]) + data-collapse="child-{{ $id }}"> +
      +
      {{ $class->row_names[$table_key][$id] }}
      {{ $class->has_money ? money($row_total, setting('default.currency'), true) : $row_total }}