deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimise charge table, implemented charge recording, optimised payment recording

Browse Source
This commit is contained in:
Deon George
2021-10-01 14:59:04 +10:00
parent c0ad46ba65
commit 7c5369203c
17 changed files with 731 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

345
resources/views/theme/backend/adminlte/a/charge/addedit.blade.php Normal file
View File

@@ -0,0 +1,345 @@
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Charge {{ $o->id ? '#'. $o->id : '' }}
@endsection
@section('page_title')
Charge
@endsection
@section('contentheader_title')
Record Charge
@endsection
@section('contentheader_description')
@endsection
@section('main-content')
<div class="row">
<div class="col-6">
<div class="card card-dark">
<div class="card-header">
<h1 class="card-title">Record Charge {{ $o->id ? '#'. $o->id : '' }}</h1>
@if(session()->has('success'))
<span class="ml-3 pt-0 pb-0 pr-1 pl-1 btn btn-outline-success"><small>{{ session()->get('success') }}</small></span>
@endif
</div>
<div class="card-body">
<form class="g-0 needs-validation" method="POST" role="form">
@csrf
<div class="row">
<!-- DATE CHARGE -->
<div class="col-4">
<div class="form-group has-validation">
<label for="charge_date">Date Charge</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-calendar"></i></span>
</div>
<input type="date" class="form-control @error('charge_date') is-invalid @enderror" id="charge_date" name="charge_date" value="{{ old('charge_date',($o->exists ? $o->charge_date : \Carbon\Carbon::now())->format('Y-m-d')) }}" required>
<span class="invalid-feedback" role="alert">
@error('charge_date')
{{ $message }}
@else
Charge Date is required.
@enderror
</span>
</div>
<span class="input-helper">Date Payment Received.</span>
</div>
</div>
<!-- QUANTITY -->
<div class="offset-6 col-2">
<div class="form-group has-validation">
<label class="float-right" for="quantity">Quantity</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-hashtag"></i></span>
</div>
<input type="text" class="text-right form-control @error('quantity') is-invalid @enderror" id="quantity" name="quantity" value="{{ old('quantity',$o->exists ? $o->quantity : 1) }}" required>
<span class="invalid-feedback" role="alert">
@error('quantity')
{{ $message }}
@else
Quantity is required.
@enderror
</span>
</div>
</div>
</div>
</div>
<div class="row">
<!-- ACCOUNTS -->
<div class="col-4">
<div class="form-group has-validation">
<label for="account_id">Account</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-user"></i></span>
</div>
<select class="form-control @error('account_id') is-invalid @enderror" id="account_id" name="account_id" required>
<option value=""></option>
@foreach (\App\Models\Account::active()->with(['user'])->get()->sortBy('name') as $ao)
<option value="{{ $ao->id }}" {{ $ao->id == old('account_id',$o->exists ? $o->account_id : NULL) ? 'selected' : '' }}>{{ $ao->name }}</option>
@endforeach
</select>
<span class="invalid-feedback" role="alert">
@error('account_id')
{{ $message }}
@else
Account is required.
@enderror
</span>
</div>
<span class="input-helper">Account to add charge to.</span>
</div>
</div>
<!-- SWEEP TYPE -->
<div class="offset-1 col-4">
<div class="form-group has-validation">
<label for="sweep_type">Sweep</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-dollar-sign"></i></span>
</div>
<select class="form-control @error('sweep_type') is-invalid @enderror" id="sweep_type" name="sweep_type" required>
@foreach (\App\Models\Charge::sweep as $k=>$v)
<option value="{{ $k }}" {{ $k == old('sweep_type',$o->exists ? $o->sweep_type : NULL) ? 'selected' : '' }}>{{ $v }}</option>
@endforeach
</select>
<span class="invalid-feedback" role="alert">
@error('sweep_type')
{{ $message }}
@else
Sweep Type is required.
@enderror
</span>
</div>
<span class="input-helper">When to add the charge to an invoice.</span>
</div>
</div>
<!-- TAXABLE -->
<div class="col-1">
<div class="form-check has-validation">
<label for="taxable">Taxable</label>
<div class="form-check text-right">
<input type="checkbox" class="form-check-input @error('taxable') is-invalid @enderror" id="taxable" name="taxable" value="1" {{ old('taxable',$o->exists ? $o->taxable : 1) ? 'checked' : '' }}>
</div>
</div>
</div>
<!-- AMOUNT -->
<div class="col-2">
<div class="form-group has-validation">
<label class="float-right" for="amount">Amount</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-dollar-sign"></i></span>
</div>
<input type="text" class="text-right form-control @error('amount') is-invalid @enderror" id="amount" name="amount" value="{{ number_format(old('amount',$o->exists ? $o->amount : 0),2) }}">
<span class="invalid-feedback" role="alert">
@error('amount')
{{ $message }}
@else
Amount is required.
@enderror
</span>
</div>
<span class="input-helper">Amount (ex Tax).</span>
</div>
</div>
</div>
<div class="row">
<!-- SERVICES -->
<div class="col-4">
<div class="form-group has-validation">
<label for="service_id">Services</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-bolt"></i></span>
</div>
<select class="form-control @error('service_id') is-invalid @enderror" id="service_id" name="service_id" required>
</select>
<span class="ml-2 pt-2"><i class="fas fa-spinner d-none"></i></span>
<span class="invalid-feedback" role="alert">
@error('service_id')
{{ $message }}
@else
Service is required.
@enderror
</span>
</div>
<span class="input-helper"><sup>**</sup>Service inactive.</span>
</div>
</div>
<!-- CHARGE TYPE -->
<div class="offset-1 col-4">
<div class="form-group has-validation">
<label for="type">Type</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-dollar-sign"></i></span>
</div>
<select class="form-control @error('type') is-invalid @enderror" id="type" name="type" required>
@foreach (collect(\App\Models\InvoiceItem::type)->sort() as $k=>$v)
<option value="{{ $k }}" {{ $k == old('type',$o->exists ? $o->type : NULL) ? 'selected' : '' }}>{{ $v }}</option>
@endforeach
</select>
<span class="invalid-feedback" role="alert">
@error('type')
{{ $message }}
@else
Type is required.
@enderror
</span>
</div>
<span class="input-helper">Charge type.</span>
</div>
</div>
<!-- TOTAL -->
<div class="offset-1 col-2">
<label class="float-right" for="fees_amt">Total</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-dollar-sign"></i></span>
</div>
<input type="text" class="text-right form-control" id="total" value="{{ number_format($o->exists ? $o->quantity*$o->amount : 0,2) }}" disabled>
</div>
<span class="input-helper">Total (ex Tax).</span>
</div>
</div>
<div class="row">
<!-- DESCRIPTION -->
<div class="col-12">
<div class="form-group has-validation">
<label for="description">Description</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-file-alt"></i></span>
</div>
<input type="text" class="form-control @error('description') is-invalid @enderror" id="description" name="description" value="{{ old('description',$o->exists ? $o->description : '') }}">
<span class="invalid-feedback" role="alert">
@error('description')
{{ $message }}
@enderror
</span>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<a href="{{ url('/home') }}" class="btn btn-danger">Cancel</a>
@can('wholesaler')
<button type="submit" name="submit" class="btn btn-success mr-0 float-right">@if ($site->exists)Save @else Add @endif</button>
@endcan
</div>
</div>
</form>
</div>
</div>
</div>
<div class="col-5">
<div id="pending"></div>
</div>
</div>
@endsection
@section('page-scripts')
@css('//cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css','select-css')
@js('//cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js','select-js')
@js('/select2/fix-autofocus.js','select-fix-js','select-js')
@css('/select2/fix-select-height.css','select-fix-css','select-css')
<script type="text/javascript">
function populate(account,spinner) {
spinner.toggleClass('d-none').toggleClass('fa-spin');
$.ajax({
type: 'GET',
dataType: 'json',
cache: false,
url: '{{ url('api/r/services') }}'+'/'+account,
data: {include: {{ $o->service_id ?: 'null' }} },
timeout: 2000,
error: function(x) {
spinner.toggleClass('d-none').toggleClass('fa-spin');
alert('Failed to submit');
},
success: function(data) {
$("select[name=service_id]").empty();
$.each(data,function(i,j) {
var row = '<option value="' + j.id + '" '+(j.id == {{ $o->service_id ?: 'null' }} ? 'selected' : '')+'>' + j.id + ': ' + j.product_name + ' ' + j.name_short + ((! j.active) ? ' **' : '') +'</option>';
$(row).appendTo("select[name=service_id]");
});
spinner.toggleClass('d-none').toggleClass('fa-spin');
}
});
$.ajax({
type: 'GET',
dataType: 'html',
data: {exclude: {{ $o->id ?: 'null' }}},
cache: false,
url: '{{ url('r/charges') }}'+'/'+account,
timeout: 2000,
error: function(x) {
spinner.toggleClass('d-none').toggleClass('fa-spin');
alert('Failed to submit');
},
success: function(data) {
$("div[id=pending]").empty().append(data);
}
});
}
function total() {
$('#total').val(($('#quantity').val()*$('#amount').val()).toFixed(2));
}
$(document).ready(function() {
var spinner = $('#service_id').parent().find('i.fas.fa-spinner');
if ($('#account_id').val()) {
populate($('#account_id').val(),spinner);
}
$('#account_id').select2({
sorter: data => data.sort((a, b) => a.text.localeCompare(b.text)),
})
.on('change',function(e) {
$("select[id=service_id]").empty();
if (! $(this).val()) {
return;
}
populate($(this).val(),spinner);
});
$('#service_id').select2();
if ($('#quantity').val() && $('#amount').val()) {
total();
}
$('#quantity').on('change',total);
$('#amount').on('change',total);
});
</script>
@append

66
resources/views/theme/backend/adminlte/a/charge/unprocessed.blade.php Normal file
View File

@@ -0,0 +1,66 @@
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Unprocessed Charges
@endsection
@section('page_title')
Unprocessed
@endsection
@section('contentheader_title')
Unprocessed Charges
@endsection
@section('contentheader_description')
@endsection
@section('main-content')
<div class="row">
<div class="col-9">
<div class="card">
<div class="card-body">
<table class="table table-striped table-hover" id="unprocessed_charges">
<thead>
<tr>
<th>ID</th>
<th>Date Created</th>
<th>Date Charge</th>
<th>Account</th>
<th>Service</th>
<th>Description</th>
<th class="text-right">Total</th>
</tr>
</thead>
<tbody>
@foreach(\App\Models\Charge::unprocessed()->with(['account.user','service'])->get() as $o)
<tr>
<td><a href="{{ url('a/charge/addedit',$o->id) }}">{{ $o->id }}</td>
<td>{{ $o->charge_date->format('Y-m-d') }}</td>
<td>{{ $o->date_orig->format('Y-m-d') }}</td>
<td>{{ $o->account->name }}</td>
<td>{{ $o->service->name_short }}</td>
<td>{{ $o->description }}</td>
<td class="text-right">{{ number_format($o->quantity*$o->amount,2) }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
@endsection
@section('page-scripts')
@css('//cdn.datatables.net/1.10.25/css/dataTables.bootstrap4.min.css','jq-dt-css')
@js('//cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js','jq-dt-js')
@js('//cdn.datatables.net/1.10.25/js/dataTables.bootstrap4.min.js','jq-dt-bs5-js','jq-dt-js')
<script type="text/javascript">
$(document).ready(function() {
$('#unprocessed_charges').DataTable( {
order: [1,'desc'],
});
});
</script>
@append

37
resources/views/theme/backend/adminlte/a/charge/widgets/pending.blade.php Normal file
View File

@@ -0,0 +1,37 @@
@if(($x=$list)->count())
<div class="card card-light">
<div class="card-header">
<h1 class="card-title">Pending Charges</h1>
</div>
<div class="card-body">
<table class="table table-hover">
<thead>
<tr>
<th>ID</th>
<th>Date Created</th>
<th>Date Charge</th>
<th>Service</th>
<th>Type</th>
<th>Description</th>
<th class="text-right">Total</th>
</tr>
</thead>
<tbody>
@foreach ($x as $co)
<tr>
<td><a href="{{ url('a/charge/addedit',[$co->id]) }}">{{ $co->id }}</a></td>
<td>{{ $co->date_orig->format('Y-m-d') }}</td>
<td>{{ $co->charge_date->format('Y-m-d') }}</td>
<td>{{ $co->service->sid }}</td>
<td>{{ $co->type }}</td>
<td>{{ $co->description }}</td>
<td class="text-right">{{ number_format($co->quantity*$co->amount,2) }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
@endif

38
resources/views/theme/backend/adminlte/a/payment/addedit.blade.php
View File

@@ -30,6 +30,7 @@
@csrf
<div class="row">
<!-- DATE RECEIVED -->
<div class="col-4">
<div class="form-group has-validation">
<label for="payment_date">Date Received</label>
@@ -50,6 +51,7 @@
</div>
</div>
<!-- AMOUNT -->
<div class="offset-4 col-4">
<div class="form-group has-validation">
<label for="total_amt">Amount</label>
@@ -72,6 +74,7 @@
</div>
<div class="row">
<!-- METHOD -->
<div class="col-4">
<div class="form-group has-validation">
<label for="checkout_id">Payment Method</label>
@@ -97,6 +100,7 @@
</div>
</div>
<!-- PAYMENT FEE -->
<div class="offset-4 col-4">
<div class="form-group has-validation">
<label for="fees_amt">Fee</label>
@@ -119,6 +123,7 @@
</div>
<div class="row">
<!-- ACCOUNT -->
<div class="col-6">
<div class="form-group has-validation">
<label for="account_id">Account</label>
@@ -129,7 +134,7 @@
<!-- @todo Only show active accounts or accounts with outstanding invoices -->
<select class="form-control @error('account_id') is-invalid @enderror" id="account_id" name="account_id" required>
<option value=""></option>
@foreach (\App\Models\Account::active()->with(['user'])->get() as $ao)
@foreach (\App\Models\Account::active()->with(['user'])->get()->sortBy('name') as $ao)
<option value="{{ $ao->id }}" {{ $ao->id == old('account_id',$o->exists ? $o->account_id : NULL) ? 'selected' : '' }}>{{ $ao->name }}</option>
@endforeach
</select>
@@ -147,13 +152,14 @@
</div>
</div>
<!-- BALANCE -->
<div class="offset-2 col-4">
<label for="fees_amt">Balance</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-dollar-sign"></i></span>
</div>
<input type="text" class="text-right form-control @error('fees_amt') is-invalid @enderror" value="{{ number_format($o->exists ? $o->balance : 0,2) }}" disabled>
<input type="text" class="text-right form-control @error('fees_amt') is-invalid @enderror" id="balance" value="{{ number_format($o->exists ? $o->balance : 0,2) }}" disabled>
</div>
</div>
</div>
@@ -185,14 +191,10 @@
@endsection
@section('page-scripts')
@css('//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css','s2-css')
@js('//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js','s2-js','jquery')
<style>
.select2-selection.select2-selection--single {
height: calc(2.25rem + 2px) !important;
}
</style>
@css('//cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css','select-css')
@js('//cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js','select-js')
@js('/select2/fix-autofocus.js','select-fix-js','select-js')
@css('/select2/fix-select-height.css','select-fix-css','select-css')
<script type="text/javascript">
function populate(account,spinner) {
@@ -203,7 +205,7 @@
dataType: 'html',
cache: false,
url: '{{ url('api/r/invoices') }}'+'/'+account,
data: {pid:{{ $o->id }}},
data: {pid:{{ $o->id ?: 'null' }}},
timeout: 2000,
error: function(x) {
spinner.toggleClass('d-none').toggleClass('fa-spin');
@@ -216,6 +218,16 @@
});
}
function balance() {
var alloc = 0;
$('.invoice').each(function() {
alloc += $(this).val();
})
$('#balance').val(($('#total_amt').val()-alloc).toFixed(2))
}
$(document).ready(function() {
if ($('#account_id').val()) {
var spinner = $('#account_id').parent().parent().find('i.fas.fa-spinner');
@@ -236,6 +248,10 @@
populate($(this).val(),spinner);
});
$('#total_amt').on('change',balance);
});
$(document).on('change','.invoice',balance);
</script>
@append

5
resources/views/theme/backend/adminlte/a/payment/unapplied.blade.php
View File

@@ -61,11 +61,6 @@
$(document).ready(function() {
$('#unapplied_payments').DataTable( {
order: [1,'desc'],
orderFixed: [1,'desc']
});
$('#unapplied_payments tbody').on('click','tr', function () {
$(this).toggleClass('selected');
});
});
</script>

2
resources/views/theme/backend/adminlte/a/payment/widgets/invoices.blade.php
View File

@@ -27,7 +27,7 @@
<td>{{ number_format($io->total,2) }}</td>
<td>{{ number_format($io->due,2) }}</td>
<td class="text-right">
<input type="text" class="text-right" name="invoices[{{ $io->id }}]" value="{{ number_format(($x=$io->paymentitems->filter(function($item) use ($pid) { return $item->payment_id == $pid; })) ? $x->sum('alloc_amt') : 0,2) }}">
<input type="text" class="text-right invoice" name="invoices[{{ $io->id }}]" value="{{ number_format(($x=$io->paymentitems->filter(function($item) use ($pid) { return $item->payment_id == $pid; })) ? $x->sum('alloc_amt') : 0,2) }}">
</td>
</tr>
@endforeach