diff --git a/app/Http/Livewire/ShowTop.php b/app/Http/Livewire/ShowTop.php index 09abb50..37483d8 100755 --- a/app/Http/Livewire/ShowTop.php +++ b/app/Http/Livewire/ShowTop.php @@ -41,6 +41,7 @@ class ShowTop extends Component ->get(); + // $consultaPremioEntregado = PremioEntregado::where('fecha', $monthYear) ->first(); @@ -53,21 +54,22 @@ class ShowTop extends Component public function entregarPremio() { - $currentYear = date('Y'); + $previousMonthDate = strtotime('first day of last month'); + $month = date('m', $previousMonthDate); + $year = date('Y', $previousMonthDate); + - $monthYear = date('m-Y', strtotime('last month')); - $month = date('m', strtotime('last month')); $rangos = ['primero', 'segundo', 'tercero', 'cuarto', 'quinto', 'sexto', 'séptimo', 'octavo', 'noveno', 'décimo']; - $top_vendedores = User::with(['historiales_venta' => function ($query) use ($month, $currentYear) { + $top_vendedores = User::with(['historiales_venta' => function ($query) use ($month, $year) { $query->whereMonth('fecha_inicio', $month) - ->whereYear('fecha_inicio', $currentYear) + ->whereYear('fecha_inicio', $year) ->where('estado', 'activo'); }]) - ->withCount(['historiales_venta' => function ($query) use ($month, $currentYear) { + ->withCount(['historiales_venta' => function ($query) use ($month, $year) { $query->whereMonth('fecha_inicio', $month) - ->whereYear('fecha_inicio', $currentYear) + ->whereYear('fecha_inicio', $year) ->where('estado', 'activo'); }]) ->orderBy('historiales_venta_count', 'desc') @@ -96,7 +98,7 @@ class ShowTop extends Component PremioEntregado::create([ 'user_id' => Auth::user()->id, - 'fecha' => $monthYear, + 'fecha' => $year, 'entregado' => 1 ]); diff --git a/app/Http/Livewire/ShowUsuarios.php b/app/Http/Livewire/ShowUsuarios.php index b51ad98..3168c70 100755 --- a/app/Http/Livewire/ShowUsuarios.php +++ b/app/Http/Livewire/ShowUsuarios.php @@ -87,6 +87,8 @@ class ShowUsuarios extends Component public $estadoTarifa = false; public $estadoPromo = false; + public $entradas = false; + protected $rules = [ 'nombre' => 'required', 'email' => 'required', @@ -99,7 +101,7 @@ class ShowUsuarios extends Component $consulta_tarifas = TarifaPromo::take(1); - $consulta_usuarios = User::where('name', 'LIKE', '%' . $this->buscar . '%')->orWhere('email', 'LIKE', '%' . $this->buscar . '%')->with('rol', 'saldo')->orderBy('id', 'DESC')->withCount('historiales_venta')->paginate(15); + $consulta_usuarios = User::where('name', 'LIKE', '%' . $this->buscar . '%')->orWhere('email', 'LIKE', '%' . $this->buscar . '%')->with('rol', 'saldo')->orderBy('id', 'DESC')->withCount('historiales_venta')->paginate($this->entradas); if (!empty($this->buscar_servicio)) { $this->consulta_tarifas = Tarifas::where('rol_id', $this->rol_usuario)->with([