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,255 @@
@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/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" />
<link href="{{ asset('elite/bower_components/select2/select2.min.css') }}" rel="stylesheet" />
@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">{{ __('payments.create_inventory_bill') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}"><i class="fa fa-home"></i> {{ __('payments.home') }}</a></li>
<li><a href="{{ route('finance') }}"><i class="fa fa-money"></i> {{ __('payments.finance_home') }}</a></li>
<li><a href="{{ route('invoices') }}"><i class="fa fa-file"></i> {{ __('payments.invoices_home') }}</a></li>
<li class="active">{{ __('payments.generate_invoice') }}</li>
</ol>
</div>
</div>
@include('expenses::payments.menu')
@include('flash::message')
<div class="white-box">
{{ Form::open(['method'=>'post','route' => 'payments.bills.inventory.save']) }}
<div class="row">
<div class="col-md-3">
<div class="form-group">
<label>{{ __('payments.vendor') }}:</label>
<div class="input-group">
{{ Form::text('vendor_name', get_name($quotation->supplier_id, 'id', 'name', 'suppliers'), ['class'=>'form-control required compulsory', 'readonly']) }}
{{ Form::hidden('vendor', $quotation->supplier_id) }}
</div>
</div>
</div>
<div class="col-md-2">
<div id="sDate">
<div class="form-group">
{{ Form::label('start_date', __('payments.bill_date')) }}
<div class="input-group">
{{ Form::text('bill_date', '', ['class'=>'form-control required compulsory', 'readonly','required', 'id'=>'bill_date']) }}
<span class="input-group-addon"><i class="icon-calender"></i></span>
</div>
</div>
</div>
</div>
<div class="col-md-2">
<div id="eDate">
<div class="form-group">
{{ Form::label('end_date', __('payments.bill_due_date')) }}
<div class="input-group">
{{ Form::text('bill_due_date', '', ['class'=>'form-control required compulsory', 'readonly','required', 'id'=>'bill_due_date']) }}
<span class="input-group-addon"><i class="icon-calender"></i></span>
</div>
</div>
</div>
</div>
<div class="col-md-2">
<div id="eDate">
<div class="form-group">
{{ Form::label('bill_number', __('payments.bill_number')) }}
{{ Form::text('bill_number', '', ['class'=>'form-control required compulsory','required', 'id'=>'bill_number']) }}
</div>
</div>
</div>
</div>
<div class="table-responsive">
<table class="table color-bordered-table success-bordered-table table-striped table-hover">
<thead>
<tr>
<th>{{ __('payments.item_name') }}</th>
<th>{{ __('payments.approved_quantity') }}</th>
<th>{{ __('payments.approved_bill_per_item') }}</th>
<th>{{ __('payments.approved_cost') }}</th>
<th>{{ __('payments.received_quantity') }}</th>
<th>{{ __('payments.received_bill_per_item') }}</th>
<th>{{ __('payments.received_cost') }}</th>
{{-- <th>Chart Of Account</th>--}}
</tr>
</thead>
<tbody>
@php
$total_amount = 0;
$approved_amount =0;
@endphp
@foreach($quotations as $result)
<input type='hidden' name="quotation_number" value="{{ $result->quotation_number }}">
<input type='hidden' name="quotation_type_id" value="{{ $result->quotation_type_id }}">
<tr>
<td>
@if($result->quotation_type_id == 1)
<input type='hidden' name="item_id[]" value="{{ $result->drug_id }}">
{{ get_name($result->drug_id, 'id', 'name', 'drugs') }}
@elseif($result->quotation_type_id == 2)
<input type='hidden' name="item_id[]" value="{{ $result->drug_id }}">
{{ get_name($result->drug_id, 'id', 'name', 'sundries') }}
@elseif($result->quotation_type_id == 3)
<input type='hidden' name="item_id[]" value="{{ $result->drug_id }}">
{{ get_name($result->drug_id, 'id', 'name', 'dentals') }}
@elseif($result->quotation_type_id == 4)
<input type='hidden' name="item_id[]" value="{{ $result->drug_id }}">
{{ get_name($result->drug_id, 'id', 'name', 'radiologies') }}
@elseif($result->quotation_type_id == 5)
<input type='hidden' name="item_id[]" value="{{ $result->drug_id }}">
{{ get_name($result->drug_id, 'id', 'name', 'labs') }}
@elseif($result->quotation_type_id == 6)
<input type='hidden' name="item_id[]" value="{{ $result->drug_id }}">
{{ get_name($result->drug_id, 'id', 'name', 'general_items') }}
@elseif($result->quotation_type_id == 7)
<input type='hidden' name="item_id[]" value="{{ $result->drug_id }}">
{{ get_name($result->drug_id, 'id', 'name', 'eye_glasses') }}
@endif
</td>
<td>
<input class="form-control" readonly name="approved_quantity[]" value="{{ $result->quantity }}">
</td>
<td>
<input class="form-control" readonly name="approved_unit_cost[]" value="{{ ($result->bill) }}">
</td>
<td>
<input class="form-control" readonly name="approved_amount[]" value="{{ ($result->bill * $result->quantity ) }}">
</td>
<td>
<input class="form-control" readonly name="quantity[]" value="{{ $result->receive_quantity }}">
</td>
<td>
<input class="form-control" readonly name="unit_cost[]" value="{{ ($result->receive_bill) }}">
</td>
<td>
@php
$total = $result->total_price;
$total_amount += $total;
$approved_amount += ($result->bill * $result->quantity);
@endphp
<input class="form-control" readonly name="amount[]" value="{{ ($total) }}">
@if($result->quotation_type_id != 6)
<input type="hidden" name="expense_acc_id[]" value="{{ 14 }}">
@else
<input type="hidden" name="expense_acc_id[]" value="{{ get_name($result->drug_id, 'id', 'expenses_account_id', 'general_items') }}">
@endif
</td>
{{-- <td>--}}
{{-- <select class="form-control compulsory" required name="expense_acc_id[]">--}}
{{-- <option value="{{ 14 }}">{{ get_name(14, 'id', 'name', 'chart_of_accounts') }}</option>--}}
{{-- </select>--}}
{{-- </td>--}}
</tr>
@endforeach
</tbody>
</table>
</div>
<div class="row">
<div class="col-md-8">
<div class="form-group">
<label>{{ __('payments.bill_memo') }}</label>
<textarea rows="7" class="form-control compulsory" name="bill_memo"></textarea>
</div>
</div>
<div class="col-md-4">
<div class="form-group-group">
<label>{{ __('payments.approved_total_amount') }}</label>
<div class="controls">
<input type="text" name="total_amount" value="{{ $approved_amount }}" id="total_amount" class="form-control compulsory" readonly='true'/>
</div>
</div><br/>
<div class="form-group-group">
<label>{{ __('payments.total_amount') }}</label>
<div class="controls">
<input type="text" name="total_amount" value="{{ $total_amount }}" id="total_amount" class="form-control compulsory" readonly='true'/>
</div>
</div>
<br/>
<div class="row">
<div class="col-md-6">
<p><b>{{ __('payments.quotation_approved_by') }}: </b> {{ get_full_name($quotations[0]->approval_user, 'id', 'first_name', 'last_name', 'users') }}</p>
<p><b>{{ __('payments.quotation_received_by') }}: </b> {{ get_full_name($quotations[0]->receive_user, 'id', 'first_name', 'last_name', 'users') }}</p>
<p><b>{{ __('payments.items_received_on') }}: </b> {{ streamline_date($quotations[0]->receive_date) }}</p>
</div>
<div class="col-md-6 pull-right">
<button class="btn btn-rounded btn-primary pull-right">{{ __('payments.save_bill') }}</button>
</div>
</div>
</div>
</div>
<br>
{{ Form::close() }}
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/bower_components/bootstrap-datepicker/bootstrap-datepicker.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">
jQuery('#end_date').datepicker({
autoclose: true,
todayHighlight: true,
format: 'dd-mm-yyyy'
});
</script>
<script type="text/javascript">
jQuery('#bill_date').datepicker({
autoclose: true,
todayHighlight: true,
format: 'dd-mm-yyyy'
});
$('#bill_due_date').datepicker({
autoclose: true,
todayHighlight: true,
startDate: new Date(),
format: 'dd-mm-yyyy'
});
</script>
<script src="{{ asset('elite/bower_components/select2/select2.min.js') }}"></script>
<script>
$('#staff_member, #vendor').select2({
placeholder: "-select-"
});
</script>
@endpush
@@ -0,0 +1,311 @@
@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/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" />
<link href="{{ asset('elite/bower_components/select2/select2.min.css') }}" rel="stylesheet" />
@endpush
@section('content')
<div class="row bg-title">
<div class="col-md-7">
<h4>{{ __('payments.create_bill_received_inventory') }}</h4>
</div>
<div class="col-md-5">
<ol class="breadcrumb">
<li><a href="{{ route('finance') }}"><i class="fa fa-money"></i> {{ __('payments.finance_home') }}</a></li>
{{-- <li><a href="{{ route('invoices') }}"><i class="fa fa-file"></i> {{ __('payments.invoices_home') }}</a></li> --}}
<li class="active"><i class="fa fa-credit-card"></i> {{ __('payments.view_payments') }}</li>
</ol>
</div>
</div>
@include('expenses::payments.menu')
@include('flash::message')
<div class="row">
<div class="col-md-12">
<div class="panel">
<div class="panel-body">
{{ Form::open(['method'=>'post','route' => 'payments.bills.inventory']) }}
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label>{{ __('payments.generated_by') }}:</label>
<select class="form-control compulsory required" name="staff_member" id="staff_member" required>
<option value="">-select-</option>
<option value="ALL STAFF">ALL STAFF</option>
@foreach($staff_members as $item)
<option value="{{ $item->id }}">{{ $item->username }}</option>
@endforeach
</select>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label>{{ __('payments.vendor') }}:</label>
<select class="form-control compulsory required" name="vendor" id="vendor" required>
<option value="">-select-</option>
<option value="ALL VENDORS">{{ __('payments.all_vendors') }}</option>
@foreach($suppliers as $item)
<option value="{{ $item->id }}">{{ $item->name }}</option>
@endforeach
</select>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label>{{ __('payments.select_date') }}:</label>
<select class="form-control compulsory required" name="dates" id="dates" required>
<option value="">-select-</option>
<option value="today">TODAY</option>
<option value="yesterday">YESTERDAY</option>
<option value="custom_date">CUSTOM DATE</option>
<option value="custom_date_range">DATE RANGE</option>
</select>
</div>
</div>
<div class="col-md-2">
<div id="sDate" style="display: none;">
<div class="form-group">
{{ Form::label('start_date', __('payments.date_on')) }}
<div class="input-group">
{{ Form::text('start_date', '', ['class'=>'form-control required compulsory', 'readonly', 'id'=>'start_date']) }}
<span class="input-group-addon"><i class="icon-calender"></i></span>
</div>
</div>
</div>
</div>
<div class="col-md-2">
<div id="eDate" style="display: none;">
<div class="form-group">
{{ Form::label('end_date', __('payments.end_date')) }}
<div class="input-group">
{{ Form::text('end_date', '', ['class'=>'form-control required compulsory', 'readonly', 'id'=>'end_date']) }}
<span class="input-group-addon"><i class="icon-calender"></i></span>
</div>
</div>
</div>
</div>
<div class="col-md-1">
<div class="form-group" style="margin-top: 25px;">
{{ Form::submit(__('payments.submit'), ['class'=>'btn btn-success btn-rounded btn-block pull-right']) }}
</div>
</div>
</div>
{{ Form::close() }}
<hr/>
<div class="row">
<div class="col-md-12">
@if(isset($display))
<h3 class="label label-info label-rounded"> {!! isset($display) ? $display : '' !!}</h3>
@endif
<br/>
<div class="table-responsive">
<br/>
<table class="table color-bordered-table success-bordered-table table-striped table-hover">
<thead>
<tr>
<th>{{ __('payments.item_type') }}</th>
<th>{{ __('payments.quantity') }}</th>
<th>{{ __('payments.cost') }}</th>
<th>{{ __('payments.supplier') }}</th>
<th>{{ __('payments.approved_by') }}</th>
<th>{{ __('payments.received_on') }}</th>
<th></th>
</tr>
</thead>
<tbody>
@if(count($quotations) > 0)
@foreach($quotations as $result)
<tr>
<td>
{{ get_name($result->quotation_type_id, 'id', 'name', 'quotation_types') }}
</td>
<td>
@php
$results_to_count = [];
$quotation_number = $result->quotation_number;
if ($quotation_number) {
$results_to_count = DB::select("select drug_id from quotations where quotation_number = {$quotation_number} AND deleted_at IS NULL");
}
@endphp
{{ count($results_to_count) }} {{ __('payments.items') }}
</td>
<td>
@php
$quote_total = 0;
$quotation_number = $result->quotation_number;
if ($quotation_number) {
$total_amount = DB::select("select SUM(total_price) as total from quotations where quotation_number = {$quotation_number} AND deleted_at IS NULL");
$quote_total = $total_amount[0]->total;
}
@endphp
{{ ugandan_shillings($quote_total) }}
</td>
<td>
{{ get_name(get_name($result->quotation_number, "quotation_number", "supplier_id", 'quotations'), "id", "name", "suppliers") }}
</td>
<td>
@php
$user_id = get_name($result->quotation_number, "quotation_number", "approval_user", 'quotations');
@endphp
{{ get_full_name($user_id, "id", "first_name", "last_name", "users") }}
</td>
<td>
{{ streamline_date(get_name($result->quotation_number, "quotation_number", "receive_date", 'quotations')) }}
</td>
<td>
{{ Form::open(['method'=>'post','route'=>'payments.bills.inventory.create' ]) }}
{{ Form::hidden('quotation_number', $result->quotation_number) }}
<button class="btn btn-primary btn-rounded btn-sm">
<i class="fa fa-info-circle"></i>
<span style="margin-left: 10px;">{{ __('payments.details') }}</span>
</button>
{{ Form::close() }}
</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
@push('scripts')
<!-- Date Picker Plugin JavaScript -->
<script src="{{ asset('elite/bower_components/bootstrap-datepicker/bootstrap-datepicker.min.js') }}"></script>
<script>
$('#dates').change(function (e) {
if($(this).val() === "custom_date"){
$("#eDate").hide();
$("#sDate").show();
}else if($(this).val() === "custom_date_range"){
$("#sDate").show();
$("#eDate").show();
}else{
$("#eDate").hide();
$("#sDate").hide();
}
});
function bank_deposit(cashier_income_id, amount) {
$('#deposit_amount').val(amount);
$('#cashier_income_id').val(cashier_income_id);
$('#banking_modal').modal('show');
}
$('#confirm_deposit').click(function () {
var cashier_income_id = $('#cashier_income_id').val();
var deposit_amount = $('#deposit_amount').val();
var deposit_account = $('#deposit_account').val();
var deposit_date = $('#deposit_date').val();
$.ajax({
method: 'POST',
url: '/banking/quick_bank_deposit',
data: {
'cashier_income_id' : cashier_income_id,
'deposit_amount' : deposit_amount,
'deposit_account' : deposit_account,
'deposit_date' : deposit_date,
},
success: function(response){
console.log(response);
$('#banking_modal').modal('hide');
$('#bank_' + cashier_income_id).hide();
$('#div_' + cashier_income_id).append("<label class='label label-success'>BANKED</label>");
},
error: function (error) {
console.log(error);
}
});
});
function get_acc_bal(bank_id) {
$.ajax({
method: 'POST',
url: '/banking/get_current_account_balance',
data: {'bank_id' : bank_id},
success: function(response){
var acc_bal = response[0].balance;
var amount = $('#deposit_amount').val();
$('#current_account_balance').val(acc_bal);
$('#new_account_balance').val(acc_bal + parseInt(amount));
},
error: function (error) {
console.log(error);
}
});
}
</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">
jQuery('#end_date').datepicker({
autoclose: true,
todayHighlight: true,
format: 'dd-mm-yyyy'
});
</script>
<script type="text/javascript">
jQuery('#start_date ,#deposit_date').datepicker({
autoclose: true,
todayHighlight: true,
format: 'dd-mm-yyyy'
});
</script>
<script>
$('.table').DataTable({
dom: 'Bfrtip',
buttons: [
'copy', 'csv', 'excel', 'pdf', 'print'
],
"aoColumnDefs": [{
"aTargets": [2,3],
"defaultContent": "",
}]
});
</script>
<script src="{{ asset('elite/bower_components/select2/select2.min.js') }}"></script>
<script>
$('#staff_member, #vendor').select2({
placeholder: "-select-"
});
</script>
@endpush