Skip to content

Commit

Permalink
Adding reports to menu
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtcnxd
mtcnxd committed Nov 12, 2024
1 parent 3be6683 commit 788715c
Show file tree
Hide file tree
Showing 6 changed files with 180 additions and 20 deletions.
34 changes: 20 additions & 14 deletions app/Http/Controllers/ControllerPayroll.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ public function index(Request $request)

$salaryData = DB::table('salaries')
->select('salaries.*', 'employees.name')
->join('employees', 'salaries.employee','employees.id')
->join('employees', 'salaries.employee_id','employees.id')
->whereBetween('salaries.created_at', [$startDate, $endDate])
->get();

if(isset($request->employee)){
$employee = $request->employee;
$employee = $request->employee_id;
$salaryData = DB::table('salaries')
->select('salaries.*', 'employees.name')
->join('employees', 'salaries.employee','employees.id')
->where('salaries.employee', $employee)
->where('salaries.employee', $employee_id)
->get();
}

Expand Down Expand Up @@ -57,17 +57,18 @@ public function create()
public function store(Request $request)
{
DB::table('salaries')->insert([
'employee' => $request->employee,
'salary' => $request->salary,
'hours' => $request->hours,
'price' => $request->price,
'bonds_comment' => $request->bonds_comment,
'bonds' => $request->bonds,
'employee_id' => $request->employee,
'salary' => $request->salary,
'hours' => $request->hours,
'price' => $request->price,
'bonds_comment' => $request->bonds_comment,
'bonds' => $request->bonds,
'discount_comment' => $request->discount_comment,
'discount' => $request->discount,
'status' => $request->status,
'created_at' => Carbon::now(),
'updated_at' => Carbon::now(),
'discount' => $request->discount,
'status' => $request->status,
'date_paid' => $request->date_paid,
'created_at' => Carbon::now(),
'updated_at' => Carbon::now(),
]);

return to_route('payroll.index');
Expand All @@ -78,7 +79,12 @@ public function store(Request $request)
*/
public function show(string $id)
{
dd($id);
$employee = DB::table('salaries')
->join('employees','salaries.employee_id','employees.id')
->where('salaries.id', $id)
->first();

return view('dashboard.payrolls.show', compact('employee'));
}

/**
Expand Down
3 changes: 2 additions & 1 deletion database/migrations/2024_04_15_120025_create_salaries.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public function up(): void
{
Schema::create('salaries', function (Blueprint $table) {
$table->id();
$table->integer('employee');
$table->integer('employee_id');
$table->integer('salary');
$table->integer('hours')->nullable();
$table->integer('price')->nullable();
Expand All @@ -22,6 +22,7 @@ public function up(): void
$table->text('discount_comment')->nullable();
$table->integer('discount')->nullable();
$table->enum('status',['Pendiente', 'Pagado', 'Cancelado'])->default('Pendiente');
$table->date('date_paid');
$table->timestamps();
});
}
Expand Down
9 changes: 6 additions & 3 deletions resources/views/dashboard/payrolls/create.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<div class="input-group">
<span class="input-group-text">$</span>
<input type="hidden" name="price" id="price" value="">
<input type="text" class="form-control" name="hours_total" id="hours_total" value="0" style="text-align: right">
<input type="text" class="form-control" name="hours_total" id="hours_total" value="0" style="text-align: right">
</div>
</div>
</div>
Expand Down Expand Up @@ -120,11 +120,14 @@
<option>Pagado</option>
</select>
</div>
<div class="col-md-5">
<input type="date" name="date_paid" class="form-control">
</div>
</div>
</div>

<div class="col-md-6 mt-3 text-end">
<a href="{{ route('expenses.index') }}" class="btn btn-secondary">Cancelar</a>
<a href="{{ route('payroll.index') }}" class="btn btn-secondary">Cancelar</a>
<a href="#" onclick="calculate()" class="btn btn-success">
<x-feathericon-refresh-cw class="table-icon" style="margin: -2px 5px 2px"/>
Calcular
Expand Down Expand Up @@ -168,7 +171,7 @@ function calculate(){
employee: employee
},
success: function(response){
const json = JSON.parse(response);
const json = JSON.parse(response);
$("#salary").val(json.salary);
$("#price").val(json.extra);
}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/dashboard/payrolls/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
</td>
<td>
<a href="{{ route('payroll.show', $salary->id) }}">
{{ Carbon\Carbon::parse($salary->created_at)->format('d-m-Y') }}
{{ Carbon\Carbon::parse($salary->date_paid)->format('d-m-Y') }}
</a>
</td>
<td>
Expand Down
134 changes: 134 additions & 0 deletions resources/views/dashboard/payrolls/show.blade.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
@extends('includes.body')

@extends('includes.menu')

@section('content')
<div class="shadow-sm main-content">
<div class="window-title-bar">
<x-feathericon-menu class="window-title-icon"/>
</div>
<div class="window-body bg-white">
<label class="window-body-form">Registrar Nomina</label>
<form action="{{ route('payroll.store') }}" method="POST" class="border pt-5 pb-4">
@csrf
<div class="col-md-6">
<div class="row">
<div class="col-md-3 pt-2 text-end">
Empleado
</div>
<div class="col-md-9">
<input type="text" class="form-control" name="employee" id="employee" value="{{ $employee->name }}" disabled>
</div>
</div>

<div class="row mt-3">
<div class="col-md-3 pt-2 text-end">
Sueldo
</div>
<div class="col-md-4">
</div>
<div class="col-md-5">
<div class="input-group">
<span class="input-group-text">$</span>
<input type="text" class="form-control" name="salary" id="salary" style="text-align: right" value="{{ $employee->salary }}" disabled>
</div>
</div>
</div>

<div class="row mt-3">
<div class="col-md-3 pt-2 text-end">
Horas extra
</div>
<div class="col-md-2">
<input type="number" class="form-control" name="hours" id="hours" value="{{ $employee->hours }}">
</div>
<div class="col-md-2">
</div>
<div class="col-md-5">
<div class="input-group">
<span class="input-group-text">$</span>
<input type="hidden" name="price" id="price" value="{{ $employee->price }}">
<input type="text" class="form-control" name="hours_total" id="hours_total" value="0" style="text-align: right">
</div>
</div>
</div>

<div class="row mt-3">
<div class="col-md-3 pt-2 text-end">
Bonos
</div>
<div class="col-md-9">
<textarea class="form-control" name="bonds_comment" id="bonds_comment" cols="30" rows="2"></textarea>
</div>
</div>

<div class="row mt-3">
<div class="col-md-7">
</div>
<div class="col-md-5">
<div class="input-group">
<span class="input-group-text">$</span>
<input type="text" class="form-control" name="bonds" id="bonds" style="text-align: right" value="{{ $employee->bonds }}">
</div>
</div>
</div>

<div class="row mt-3">
<div class="col-md-3 pt-2 text-end">
Descuentos
</div>
<div class="col-md-9">
<textarea class="form-control" name="discount_comment" id="discount_comment" cols="30" rows="2"></textarea>
</div>
</div>

<div class="row mt-3">
<div class="col-md-7">
</div>
<div class="col-md-5">
<div class="input-group">
<span class="input-group-text">$</span>
<input type="text" class="form-control" name="discount" id="discount" value="0" style="text-align: right">
</div>
</div>
</div>

<div class="row mt-3">
<div class="col-md-3 pt-2 text-end">
Total
</div>
<div class="col-md-9">
<div class="input-group">
<span class="input-group-text">$</span>
<input type="text" class="form-control" name="name" id="total" value="0" style="text-align: right" disabled>
</div>
</div>
</div>

<div class="row mt-3">
<div class="col-md-3 pt-2 text-end">
Estatus
</div>
<div class="col-md-4">
<select class="form-select" name="status" required>
<option>Pendiente</option>
<option>Pagado</option>
</select>
</div>
</div>
</div>

<div class="col-md-6 mt-3 text-end">
<a href="{{ route('expenses.index') }}" class="btn btn-secondary">Cancelar</a>
<button type="submit" class="btn btn-success">
<x-feathericon-save class="table-icon" style="margin: -2px 5px 2px"/>
Guardar
</button>
</div>
</form>
</div>
</div>
@endsection

@section('js')
@endsection
18 changes: 17 additions & 1 deletion resources/views/includes/menu.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,23 @@
<li><a class="a-item" href="{{ route('payroll.index') }}">Buscar</a></li>
</ul>
</li>
<li><a class="a-item" href="#">Reportes</a></li>
</ul>
</li>
<li>
<a href="#settings">
<h5 class="menu-title">
<x-feathericon-settings class="table-icon" style="margin-top:-4px;"/>
Reportes
</h5>
</a>
<ul class="menu-dropdown">
<li>
<a class="a-item" href="#">Reportes</a>
<ul class="submenu">
<li><a class="a-item" href="#">Servicios</a></li>
<li><a class="a-item" href="#">Empleados</a></li>
</ul>
</li>
</ul>
</li>
<li>
Expand Down

0 comments on commit 788715c

Please sign in to comment.