mirror of
https://gitlab.com/signalytic/client-external/streamline/streamline-emr.git
synced 2026-09-11 18:51:31 +00:00
resolved conflicts
This commit is contained in:
+55
@@ -0,0 +1,55 @@
|
||||
<div class="modal" id="finish_reconciliation_modal" tabindex="-1" role="dialog" aria-labelledby="finish_reconciliation_modal_label" aria-hidden="true">
|
||||
<div class="modal-dialog modal-lg" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header text-center">
|
||||
<h5 class="modal-title" id="finish_reconciliation_modal_label"><b>Reconciliation</b></h5>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="row">
|
||||
<div class="col-md-8 b-r">
|
||||
<p>
|
||||
Leave reconciliation process and perform other finance tasks.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<a class="btn-block btn btn-danger" href="{{ route('finance') }}">Leave Reconciliation</a>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row">
|
||||
<div class="col-md-8 b-r">
|
||||
<p>
|
||||
Return to reconciliation page and double check with the transactions and confirm checked transactions.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<button class="btn-block btn btn-warning" data-dismiss="modal">Return To Reconciliation</button>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row">
|
||||
<div class="col-md-8 b-r">
|
||||
<p>
|
||||
{{-- Perform adjustment by transferring the pending balance to an expense account and then finish the reconciliation process. --}}
|
||||
If the 'Amount To Be Adjusted' is Negative, select an Expense account!<br>If the 'Amount To Be Adjusted' is Positive, select an Income account
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<button class="btn-block btn btn-primary" id="perform_adjustment">Adjustment</button>
|
||||
</div>
|
||||
</div>
|
||||
{{-- <hr/>
|
||||
<div class="row">
|
||||
<div class="col-md-8 b-r">
|
||||
<p>
|
||||
Finish reconciliation process with the difference and explain reason for the discrepancy.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<button class="btn-block btn btn-success" id="finish_with_balance_btn">Finish With Discrepancy</button>
|
||||
</div>
|
||||
</div> --}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
<div class="modal" id="finish_with_discrepancy_modal" tabindex="-1" role="dialog" aria-labelledby="finish_with_discrepancy_modal_label" aria-hidden="true">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header text-center">
|
||||
<h5 class="modal-title" id="finish_with_discrepancy_modal_label"><b>Finish With Discrepancy</b></h5>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="form-group">
|
||||
<label>Discrepancy</label>
|
||||
<input id="__adjustment_difference_balance" type="number" class="form-control">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Bank Account</label>
|
||||
{{ Form::text('bank_name', get_name($bank, 'id', 'name', 'chart_of_accounts'), ['class'=>'form-control compulsory', 'id'=>'expense_account_name', 'readonly']) }}
|
||||
{{ Form::hidden('bank_id', $bank, ['id'=>'__bank_id']) }}
|
||||
{{ Form::hidden('reconciliation_period', $reconciliation_end_date, ['id'=>'__reconciliation_period']) }}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Memo :</label>
|
||||
{{ Form::textarea('memo', '', ['class'=>'form-control', 'compulsory', 'rows'=>'5', 'id'=>'__memo']) }}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Enter Closing Balance :</label>
|
||||
<input name="ending_balance" id="__ending_balance" type="number" class="form-control compulsory">
|
||||
</div>
|
||||
|
||||
<button class="btn btn-rounded btn-block btn-success" onclick="finish_with_discrepancy()">Proceed</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
<div class="modal" id="perform_adjustment_modal" tabindex="-1" role="dialog" aria-labelledby="perform_adjustment_modal_label" aria-hidden="true">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header text-center">
|
||||
<h5 class="modal-title" id="perform_adjustment_modal_label"><b>Perform Adjustment</b></h5>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="form-group">
|
||||
<label>Amount To Be Adjusted</label>
|
||||
<input id="adjustment_difference_balance" type="number" class="form-control" readonly>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Bank Account</label>
|
||||
{{ Form::text('bank_name', get_name($bank, 'id', 'name', 'chart_of_accounts'), ['class'=>'form-control compulsory', 'id'=>'expense_account_name', 'readonly']) }}
|
||||
{{ Form::hidden('bank_id', $bank, ['id'=>'bank_id']) }}
|
||||
{{ Form::hidden('_reconciliation_period', $reconciliation_end_date, ['id'=>'_reconciliation_period']) }}
|
||||
{{ Form::hidden('_ending_balance', $request->ending_balance, ['id'=>'_ending_balance']) }}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Adjustment Expense/Income Account</label>
|
||||
<select name='account' id='account' class='form-control compulsory required' required>
|
||||
@php echo $option_accounts; @endphp
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<button class="btn btn-rounded btn-block btn-success" onclick="finish_adjustment()" id="performAdjustmentBtn">Perform Adjustment</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user