Explorar o código

Uniform UI for transactions + template updates

Vijayakrishnan Krishnan %!s(int64=4) %!d(string=hai) anos
pai
achega
9397948f0d

+ 83 - 69
resources/views/app/practice-management/financial-transactions.blade.php

@@ -1,72 +1,86 @@
-@extends ('layouts.practice-management')
+@extends ('layouts/template')
 
-@section('section-title')
-    Financial Transactions
-@endsection
-
-@section('inner-content')
-    <div class="mcp-theme-1">
-        <table class="table table-sm" style="table-layout: fixed">
-            <thead>
-                <tr>
-                    <th>Date</th>
-                    <th>Type</th>
-                    <th>Client</th>
-                    {{--<th>Care Month</th>
-                    <th>Bill/Code</th>--}}
-                    <th>Reason</th>
-                    <th>Memo</th>
-                    <th>Amount</th>
-                    <th>Balance</th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach($transactions as $transaction)
-                    <tr>
-                        <td>
-                            {{ friendly_date_time($transaction->created_at, true) }}
-                        </td>
-                        <td>
-                            {{ $transaction->plus_or_minus === 'PLUS' ? 'Credit' : 'Debit' }}
-                        </td>
-                        <td>
-                            <a href="/patients/view/{{ $transaction->client->uid }}">
-                                <b>{{ implode(", ", [$transaction->client->name_last, $transaction->client->name_first]) }}</b>
-                            </a>
-                        </td>
-                        {{--<td>
-                            <a href="/patients/view/{{ $transaction->client->uid }}/care-months/view/{{ $transaction->bill->careMonth->uid }}">
-                                <b>{{ friendly_month($transaction->bill->careMonth->start_date) }}</b>
-                            </a>
-                        </td>
-                        <td>
-                            <b>{{ $transaction->bill->code }}</b>
-                            <div class="text-secondary text-sm">Created: {{ friendly_date_time($transaction->bill->created_at, true) }}</div>
-                        </td>--}}
-                        <td class="stag-no-wrap-td">
-                            @if($transaction->bill->careMonth)
-                                <b>{{ $transaction->bill->code }}</b>
-                                -
-                                <a href="/patients/view/{{ $transaction->client->uid }}/care-months/view/{{ $transaction->bill->careMonth->uid }}">
-                                    <b>{{ friendly_month($transaction->bill->careMonth->start_date) }}</b>
-                                </a>
-                            @elseif($transaction->bill->note)
-                                <b>{{ $transaction->bill->code }}</b>
-                                -
-                                <a href="/patients/view/{{ $transaction->client->uid }}/notes/view/{{ $transaction->bill->note->uid }}">
-                                    <b>Note</b>
-                                </a>
-                            @endif
-                            @if(!empty($transaction->bill->reason1))
-                            <div class="text-secondary text-sm stag-no-wrap" title="{{ $transaction->bill->reason1 }}">{{ $transaction->bill->reason1 }}</div>
-                            @endif
-                        </td>
-                        <td>{{ $transaction->custom_memo ? $transaction->custom_memo : '-' }}</td>
-                        <td>${{ $transaction->amount }}</td>
-                        <td>${{ $transaction->resulting_balance }}</td>
-                    </tr>
-                @endforeach
-            </tbody>
-        </table>
+@section('content')
+    <div class="p-3 mcp-theme-1">
+        <div class="card">
+            <div class="card-header p-3 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    Financial Transactions
+                </strong>
+                <div class="ml-auto">
+                    <span class="">
+                        <strong>Current Balance:</strong> ${{ $pro->balance }}
+                    </span>&nbsp;
+                    <span>
+                        <?php $lastPayment = $pro->lastPayment(); ?>
+                        <strong>Last Payment:</strong>
+                        {{ $lastPayment ? '$' . $lastPayment->amount . ' (' . friendly_date_time($lastPayment->created_at, false) . ')' : '-' }}
+                    </span>
+                </div>
+            </div>
+            <div class="card-body p-0">
+                <table class="table table-sm table-condensed p-0 m-0" style="table-layout: fixed">
+                    <thead class="bg-light">
+                        <tr>
+                            <th class="px-3 border-0">Date</th>
+                            <th class="border-0">Type</th>
+                            <th class="border-0">Client</th>
+                            <th class="border-0">Reason</th>
+                            <th class="border-0">Memo</th>
+                            <th class="border-0">Amount</th>
+                            <th class="border-0">Balance</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($transactions as $transaction)
+                            <tr>
+                                <td class="px-3">
+                                    {{ friendly_date_time($transaction->created_at, true) }}
+                                </td>
+                                <td>
+                                    {{ $transaction->plus_or_minus === 'PLUS' ? 'Credit' : 'Debit' }}
+                                </td>
+                                <td>
+                                    <a href="/patients/view/{{ $transaction->client->uid }}">
+                                        <b>{{ implode(", ", [$transaction->client->name_last, $transaction->client->name_first]) }}</b>
+                                    </a>
+                                </td>
+                                {{--<td>
+                                    <a href="/patients/view/{{ $transaction->client->uid }}/care-months/view/{{ $transaction->bill->careMonth->uid }}">
+                                        <b>{{ friendly_month($transaction->bill->careMonth->start_date) }}</b>
+                                    </a>
+                                </td>
+                                <td>
+                                    <b>{{ $transaction->bill->code }}</b>
+                                    <div class="text-secondary text-sm">Created: {{ friendly_date_time($transaction->bill->created_at, true) }}</div>
+                                </td>--}}
+                                <td class="stag-no-wrap-td">
+                                    @if($transaction->bill->careMonth)
+                                        <b>{{ $transaction->bill->code }}</b>
+                                        -
+                                        <a href="/patients/view/{{ $transaction->client->uid }}/care-months/view/{{ $transaction->bill->careMonth->uid }}">
+                                            <b>{{ friendly_month($transaction->bill->careMonth->start_date) }}</b>
+                                        </a>
+                                    @elseif($transaction->bill->note)
+                                        <b>{{ $transaction->bill->code }}</b>
+                                        -
+                                        <a href="/patients/view/{{ $transaction->client->uid }}/notes/view/{{ $transaction->bill->note->uid }}">
+                                            <b>Note</b>
+                                        </a>
+                                    @endif
+                                    @if(!empty($transaction->bill->reason1))
+                                    <div class="text-secondary text-sm stag-no-wrap" title="{{ $transaction->bill->reason1 }}">{{ $transaction->bill->reason1 }}</div>
+                                    @endif
+                                </td>
+                                <td>{{ $transaction->custom_memo ? $transaction->custom_memo : '-' }}</td>
+                                <td>${{ $transaction->amount }}</td>
+                                <td>${{ $transaction->resulting_balance }}</td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
     </div>
 @endsection

+ 0 - 18
resources/views/layouts/practice-management.blade.php

@@ -24,24 +24,6 @@
 
             {{--<main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">--}}
             <main role="main" class="col-12">
-                <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 mb-2">
-                    <h1 class="h2">@yield('section-title')</h1>
-                    <div class="mb-2 mb-md-0">
-                        <span class="">
-                            <strong>Current Balance:</strong> ${{ $pro->balance }}
-                        </span>&nbsp;
-                        {{--<span class="">
-                            <strong>Next Payment date:</strong> -
-                        </span>&nbsp;--}}
-                        <span>
-                            <?php
-                            $lastPayment = $pro->lastPayment();
-                            ?>
-                            <strong>Last Payment:</strong>
-                                {{ $lastPayment ? '$' . $lastPayment->amount . ' (' . friendly_date_time($lastPayment->created_at, false) . ')' : '-' }}
-                        </span>
-                    </div>
-                </div>
                 <div>
                     @yield('inner-content')
                 </div>

+ 4 - 3
resources/views/layouts/template.blade.php

@@ -56,10 +56,11 @@
                     <a class="nav-link dropdown-toggle" href="#" id="practice-management" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="mr-1 fas fa-tasks"></i> Practice Management</a>
                     <div class="dropdown-menu" aria-labelledby="practice-management">
                         {{--<a class="dropdown-item" href="{{ route('practice-management.dashboard') }}">Dashboard</a>--}}
-                        {{--<a class="dropdown-item" href="/practice-management/rates">Payment Rates</a>--}}
-                        {{--<a class="dropdown-item" href="/practice-management/previous-bills">Previous Bills</a>--}}
+                        <a class="dropdown-item" href="/practice-management/rates">Payment Rates</a>
+                        <a class="dropdown-item" href="/practice-management/bills/previous">Previous Bills</a>
                         <a class="dropdown-item" href="/practice-management/financial-transactions">Financial Transactions</a>
-                        {{--<a class="dropdown-item" href="/practice-management/pending-bills-to-sign">Pending Bills to Sign</a>--}}
+                        <a class="dropdown-item" href="/practice-management/bills/not-yet-signed">Pending Bills to Sign</a>
+                        <a class="dropdown-item" href="/practice-management/notes/not-yet-signed">Pending Notes to Sign</a>
                         {{--<a class="dropdown-item" href="/practice-management/hr">HR</a>--}}
                     </div>
                 </li>