resolved conflicts

This commit is contained in:
2025-03-31 03:46:05 +03:00
6454 changed files with 1520539 additions and 9 deletions
@@ -0,0 +1,50 @@
@extends('layouts.main')
@section('content')
<div class="row bg-title">
<div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
<h4 class="page-title">{{ __('patient_payment_methods.add_payment_method') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('clinics.dashboard') }}</a></li>
<li><a href="/patient_payment_methods/">{{ __('patient_payment_methods.patient_payment_methods') }}</a></li>
<li class="active">{{ __('clinics.create') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('patient_finance::patient_payment_methods.menu')
</div>
</div>
@include('flash::message')
<div class="white-box">
{{ Form::open(['route' => 'patient_payment_methods.store', 'data-toggle' => 'validator']) }}
<div class="row">
<div class="col-md-6 form-group">
{{ Form::label('name', __('patient_payment_methods.patient_payment_method_name')) }}
{{ Form::text('name', '', ['class' => 'form-control compulsory', 'required']) }}
<div class="help-block with-errors"></div>
</div>
<div class="col-md-6 form-group">
{{ Form::label('is_ref_required',__('patient_payment_methods.is_ref_required')) }}
<br><br>
&nbsp;{{ __('patient_payment_methods.yes') }} {{ Form::radio('is_ref_required', 1, false, ['required']) }}
&nbsp;{{ __('patient_payment_methods.no') }} {{ Form::radio('is_ref_required', 0, false, ['required']) }}
<div class="help-block with-errors"></div>
</div>
</div>
{{ Form::button(__('clinics.submit'),['type'=>'submit','class'=>'btn btn-success waves-effect waves-light m-r-10 submit-btn']) }}
{{ Form::button(__('clinics.cancel'),['type'=>'reset','class'=>'btn btn-default waves-effect waves-light']) }}
{{ Form::close() }}
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/js/validator.js') }}"></script>
@endpush
@@ -0,0 +1,53 @@
@extends('layouts.main')
@section('content')
<div class="row bg-title">
<div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
<h4 class="page-title">{{ __('patient_payment_methods.edit_patient_payment_methods') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('clinics.dashboard') }}</a></li>
<li><a href="/clinics/index">{{ __('patient_payment_methods.patient_payment_methods') }}</a></li>
<li class="active">{{ __('clinics.edit') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('patient_finance::patient_payment_methods.menu')
</div>
</div>
<!--Flash messages at the top -->
@include('flash::message')
<div class="white-box">
{{ Form::model($method, ['method' => 'PUT', 'route' => ['patient_payment_methods.update',$method], 'data-toggle' => 'validator']) }}
<div class="row">
<div class="col-md-6 form-group">
{{ Form::label('name', __('patient_payment_methods.name')) }}
{{ Form::text('name', $method->name, ['class' => 'form-control compulsory', 'required']) }}
<div class="help-block with-errors"></div>
</div>
<div class="col-md-6 form-group">
{{ Form::label('is_ref_required',__('patient_payment_methods.is_ref_required')) }}
<br><br>
&nbsp;{{ __('patient_payment_methods.yes') }} {{ Form::radio('is_ref_required', 1, ($method->is_ref_required === 1), ['required']) }}
&nbsp;{{ __('patient_payment_methods.no') }} {{ Form::radio('is_ref_required', 0, ($method->is_ref_required === 0), ['required']) }}
<div class="help-block with-errors"></div>
</div>
</div>
{{ Form::button(__('clinics.submit'),['type'=>'submit','class'=>'btn btn-success waves-effect waves-light m-r-10']) }}
{{ Form::button(__('clinics.cancel'),['type'=>'reset','class'=>'btn btn-default waves-effect waves-light']) }}
{{ Form::close() }}
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/js/validator.js') }}"></script>
@endpush
@@ -0,0 +1,79 @@
@extends('layouts.main')
@push('styles')
<link href="{{ asset('/elite/bower_components/datatables/jquery.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('elite/tables/css/buttons.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
@endpush
@section('content')
<div class="row bg-title">
<div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
<h4 class="page-title">{{ __('patient_payment_methods.activate_payment_methods') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('clinics.dashboard') }}</a></li>
<li><a href="/patient_payment_methods">{{ __('patient_payment_methods.patient_payment_methods') }}</a></li>
<li class="active">{{ __('clinics.activate') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('patient_finance::patient_payment_methods.menu')
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="white-box">
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>{{ __('patient_payment_methods.name') }}</th>
<th>{{ __('patient_payment_methods.deleted_at') }}</th>
<th></th>
</tr>
</thead>
<tbody>
@foreach($methods as $method)
<tr>
<td>{{ $method->name }}</td>
<td>{{ streamline_date_time($method->deleted_at) }}</td>
<td>
<a href="/patient_payment_methods/activate/{{ $method->id }}/" class="btn btn-danger"><i class="fa fa-pencil"></i> {{ __('patient_payment_methods.activate') }}</a>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/bower_components/datatables/jquery.dataTables.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/dataTables.buttons.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.flash.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/jszip.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/pdfmake.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/vfs_fonts.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.html5.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.print.min.js') }}"></script>
<script>
$('.table').DataTable({
dom: 'Bfrtip',
buttons: [
'copy', 'csv', 'excel', 'pdf', 'print'
]
});
</script>
@endpush
@@ -0,0 +1,120 @@
@php use Streamline\Enums\IntegratedPayments; @endphp
@extends('layouts.main')
@push('styles')
<link href="{{ asset('/elite/bower_components/datatables/jquery.dataTables.min.css') }}" rel="stylesheet"
type="text/css"/>
<link href="{{ asset('elite/tables/css/buttons.dataTables.min.css') }}" rel="stylesheet" type="text/css"/>
@endpush
@section('content')
<div class="row bg-title">
<div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
<h4 class="page-title">{{ __('patient_payment_methods.payment_methods') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('clinics.dashboard') }}</a></li>
<li><a href="/patient_payment_methods">{{ __('patient_payment_methods.payment_methods') }}</a></li>
<li class="active">{{ __('clinics.view') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('patient_finance::patient_payment_methods.menu')
</div>
</div>
<div class="white-box">
@include('flash::message')
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>{{ __('patient_payment_methods.name') }}</th>
<th>{{ __('patient_payment_methods.created_at') }}</th>
<th>{{ __('patient_payment_methods.created_by') }}</th>
<th>{{ __('patient_payment_methods.integrated_payment') }}</th>
<th></th>
<th></th>
</tr>
</thead>
<tfoot>
<tr>
<th>{{ __('patient_payment_methods.name') }}</th>
<th>{{ __('patient_payment_methods.created_at') }}</th>
<th>{{ __('patient_payment_methods.created_by') }}</th>
<th>{{ __('patient_payment_methods.integrated_payment') }}</th>
<th></th>
<th></th>
</tr>
</tfoot>
<tbody>
@foreach($methods as $method)
<tr>
<td>{{ $method->name }}</td>
<td>{{ streamline_date_time($method->created_at) }}</td>
<td>{{ $users[$method->created_by] ?? '' }}</td>
<td>{{ $method->integrated_payment ?? '' }}</td>
<td>
<a href="/patient_payment_methods/{{ $method->id }}/edit/" class="btn btn-info"><i
class="fa fa-pencil"></i> {{ __('patient_payment_methods.edit') }}</a>
</td>
<td>
<a href="/patient_payment_methods/delete/{{ $method->id }}/" class="btn btn-danger"><i
class="fa fa-pencil"></i> {{ __('patient_payment_methods.delete') }}</a>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/bower_components/datatables/jquery.dataTables.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/dataTables.buttons.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.flash.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/jszip.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/pdfmake.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/vfs_fonts.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.html5.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.print.min.js') }}"></script>
<script>
$('.table').DataTable({
dom: 'Bfrtip',
buttons: [
'copy', 'csv', {
extend: 'pdf',
exportOptions: {
columns: [0]
},
title: 'Patient Payment Methods'
},
{
extend: 'print',
exportOptions: {
columns: [0]
},
title: 'Patient Payment Methods'
},
{
extend: 'excel',
exportOptions: {
columns: [0]
},
title: 'Patient Payment Methods'
}
]
});
</script>
@endpush
@@ -0,0 +1,7 @@
<div class="panel panel-default">
<div class="panel-body">
<a href="{{ route('patient_payment_methods.create') }}" class="nav-item btn btn-default ti-plus"> {{ __('patient_payment_methods.add_payment_method') }}</a>
<a href="{{ route('patient_payment_methods.index') }}" class="nav-item btn btn-default ti-pencil"> {{ __('patient_payment_methods.view_payment_methods') }}</a>
<a href="{{ route('patient_payment_methods.inactive') }}" class="nav-item btn btn-default ti-pencil"> {{ __('patient_payment_methods.activate_payment_methods') }}</a>
</div>
</div>
@@ -0,0 +1,190 @@
@extends('layouts.main')
@push('styles')
<link href="{{ asset('elite/bower_components/bootstrap-datepicker/bootstrap-datepicker.min.css') }}" rel="stylesheet" type="text/css"/>
<link href="{{ asset('elite/bower_components/select2/select2.min.css') }}" rel="stylesheet"/>
<link href="{{ asset('/elite/bower_components/datatables/jquery.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('elite/tables/css/buttons.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
@endpush
@section('content')
<div class="row bg-title">
<div class="col-md-6">
<h4 class="page-title">{{ __('patient_payment_methods.patient_payment_methods_report') }}</h4>
</div>
<div class="col-md-6">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('investigations.dashboard') }}</a></li>
<li class="active">{{ __('patient_payment_methods.report') }}</li>
</ol>
</div>
</div>
{{ Form::open(['route' => 'patient_payment_methods.reports' , 'data-toggle' => 'validator']) }}
<div class="white-box">
<div class="row">
<div class="col-md-2">
<div class="form-group">
{{ Form::label('staff_member', __('patient_payment_methods.collected_by')) }}
<select class="form-control compulsory required" name="staff_member" id="staff_member" required>
<option value="">-select-</option>
<option value="0">{{ __('patient_payment_methods.all_staff') }}</option>
@foreach($users as $id => $name)
<option value="{{ $id }}">{{ $name }}</option>
@endforeach
</select>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
{{ Form::label('payment_method',__('patient_payment_methods.payment_method')) }}
<select class="form-control compulsory" name="payment_method" id="payment_method" required>
<option value="">-select-</option>
<option value="-1">{{ __('patient_payment_methods.all') }}</option>
<option value="0">{{ __('patient_payment_methods.cash') }}</option>
@foreach($payment_methods as $key => $value)
<option value="{{ $key }}">{{ $value }}</option>
@endforeach
</select>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
{{ Form::label('date_period', 'Cash received on') }}
<select class="form-control compulsory" name="date_period" id="date_period" required>
<option value="">-select-</option>
<option value="today">{{ __('patient_payment_methods.TODAY') }}</option>
<option value="yesterday">{{ __('patient_payment_methods.YESTERDAY') }}</option>
<option value="custom_date">{{ __('patient_payment_methods.CUSTOM_DATE') }}</option>
<option value="custom_date_range">{{ __('patient_payment_methods.DATE_RANGE') }}</option>
</select>
</div>
</div>
<div class="col-md-2" id="start_date_div" style="display: none">
<div class="form-group">
{{ Form::label('start_date',__('investigations.date_from')) }}
{{ Form::text('start_date',date('d-m-Y'),['class' => 'form-control', 'readonly','id'=>'start_date']) }}
</div>
</div>
<div class="col-md-2" id="end_date_div" style="display: none">
<div class="form-group">
{{ Form::label('end_date',__('investigations.date_to')) }}
{{ Form::text('end_date',date('d-m-Y'),['class' => 'form-control', 'readonly','id'=>'end_date']) }}
</div>
</div>
<div class="col-md-1">
<br>
{{ Form::button(__('investigations.search'),['type'=>'submit','class'=>'btn btn-rounded btn-success waves-effect waves-light m-r-10 btn-block', 'style'=>'margin-top: 5px;']) }}
</div>
</div>
</div>
{{ Form::close() }}
<div class="white-box">
@if($search_text != "")
<h4><label class="label label-info">{{ $search_text }}</label></h4>
<br>
@endif
<div class="table-responsive">
<table class="table table-striped color-bordered-table success-bordered-table table-bordered">
<thead>
<tr>
<th>{{ __('patient_payment_methods.patient_name') }}</th>
<th>{{ __('patient_payment_methods.amount_paid') }}</th>
<th>{{ __('patient_payment_methods.payment_method') }}</th>
<th>{{ __('patient_payment_methods.receipt_number') }}</th>
<th>{{ __('patient_payment_methods.ref_number') }}</th>
<th>{{ __('patient_payment_methods.ref_number_by') }}</th>
<th>{{ __('patient_payment_methods.billing_point') }}</th>
<th>{{ __('patient_payment_methods.billed_by') }}</th>
<th>{{ __('patient_payment_methods.date') }}</th>
</tr>
</thead>
<tbody>
@php $total = 0; @endphp
@foreach($records as $record)
<tr>
<td>{{ get_full_name($record->patient_id, 'id', 'first_name', 'last_name', 'patients') }} ({{ get_name($record->patient_id, 'id', 'number', 'patients') }})</td>
<td>{{ ugandan_shillings($record->amount) }}</td>
<td>{{ ($record->payment_method_id == 0) ? "Cash" : ($payment_methods[$record->payment_method_id] ?? 'NA') }}</td>
<td>{{ $record->receipt_number }}</td>
<td>{{ !empty($record->ref_number) ? $record->ref_number : '' }}</td>
<td>{{ !empty($record->ref_number) ? ($record->ref_number_added_by == 1) ? 'System Generated' : 'User Entered' : '' }}</td>
<td>{{ $tags[$record->tag_id] ?? 'NA' }}</td>
<td>{{ $users[$record->created_by] ?? 'NA' }}</td>
<td>{{ streamline_date_time($record->created_at) }}</td>
</tr>
@php
$total += $record->amount;
@endphp
@endforeach
<tr>
<td><b>{{ __('patient_payment_methods.total') }}</b></td>
<td>{{ ugandan_shillings($total) }}</td>
<td colspan="7"></td>
<td style="display: none;"></td>
<td style="display: none;"></td>
<td style="display: none;"></td>
<td style="display: none;"></td>
<td style="display: none;"></td>
<td style="display: none;"></td>
</tr>
</tbody>
</table>
</div>
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/bower_components/typeahead.js-master/dist/typeahead.bundle.min.js') }}"></script>
<script src="{{ asset('elite/bower_components/bootstrap-datepicker/bootstrap-datepicker.min.js') }}"></script>
<script src="{{ asset('elite/bower_components/select2/select2.min.js') }}"></script>
<script src="{{ asset('elite/bower_components/datatables/jquery.dataTables.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/dataTables.buttons.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.flash.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/jszip.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/pdfmake.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/vfs_fonts.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.html5.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.print.min.js') }}"></script>
<script type="text/javascript">
$('#staff_member').select2({
placeholder: "-- select --"
});
$('#date_period').change(function (e) {
if($(this).val() === "custom_date"){
$("#end_date_div").hide();
$("#start_date_div").show();
} else if($(this).val() === "custom_date_range"){
$("#end_date_div").show();
$("#start_date_div").show();
} else {
$("#end_date_div").hide();
$("#start_date_div").hide();
}
});
$('#start_date').datepicker({
autoclose: true,
todayHighlight: true,
format: 'dd-mm-yyyy'
});
$('#end_date').datepicker({
autoclose: true,
todayHighlight: true,
format: 'dd-mm-yyyy'
});
$('.table').DataTable({
dom: 'Bfrtip',
pageLength: 100,
buttons: [
'copy', 'csv', 'excel', 'pdf', 'print'
],
});
</script>
@endpush