From a20c10cf07dbc3b90037056fbeee7750a457ab40 Mon Sep 17 00:00:00 2001 From: Cristhian Recalde Date: Tue, 18 Jun 2024 16:04:31 -0500 Subject: [PATCH 1/4] chore: update dashboard template --- public/hot | 1 + resources/views/dashboard/index.blade.php | 1 + 2 files changed, 2 insertions(+) create mode 100644 public/hot diff --git a/public/hot b/public/hot new file mode 100644 index 0000000..f762bcf --- /dev/null +++ b/public/hot @@ -0,0 +1 @@ +http://[::1]:5173 \ No newline at end of file diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php index 378046b..1032aac 100644 --- a/resources/views/dashboard/index.blade.php +++ b/resources/views/dashboard/index.blade.php @@ -1,5 +1,6 @@ @extends('template.master') @section('title', 'Dashboard') + @section('content')
From 9e0df488b96faa9131a07855e4eb2f1005eafe17 Mon Sep 17 00:00:00 2001 From: Cristhian Recalde Date: Wed, 19 Jun 2024 15:59:34 -0500 Subject: [PATCH 2/4] refactor: update currency format in Helper class --- app/Helpers/Helper.php | 2 +- database/factories/RoomFactory.php | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 7391d18..31ff20d 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -9,7 +9,7 @@ class Helper { public static function convertToRupiah($price) { - return 'Rp. '.number_format($price, 2, ',', '.'); + return '$. '.number_format($price, 2, ',', '.'); } public static function thisMonth() diff --git a/database/factories/RoomFactory.php b/database/factories/RoomFactory.php index 23a60ca..3d34deb 100644 --- a/database/factories/RoomFactory.php +++ b/database/factories/RoomFactory.php @@ -29,16 +29,16 @@ public function definition() 'D', ]; $price = [ - 450000, - 500000, - 650000, - 700000, - 850000, - 950000, - 1200000, - 1500000, - 1750000, - 2000000, + 450, + 500, + 650, + 700, + 850, + 950, + 1200, + 1500, + 1750, + 2000, ]; static $order = 10; From ae87a164a7afda9e734496b3cbda155568d78281 Mon Sep 17 00:00:00 2001 From: Cristhian Recalde Date: Tue, 25 Jun 2024 23:57:06 -0500 Subject: [PATCH 3/4] refactor: update currency format in Helper class --- app/Helpers/Helper.php | 2 +- app/Http/Controllers/PaymentController.php | 1 + resources/views/auth/login.blade.php | 14 +- resources/views/auth/register.blade.php | 18 +- resources/views/dashboard/index.blade.php | 26 +- .../views/template/include/_navbar.blade.php | 25 +- .../reservation/confirmation.blade.php | 273 +++++++++--------- 7 files changed, 191 insertions(+), 168 deletions(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 31ff20d..7391d18 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -9,7 +9,7 @@ class Helper { public static function convertToRupiah($price) { - return '$. '.number_format($price, 2, ',', '.'); + return 'Rp. '.number_format($price, 2, ',', '.'); } public static function thisMonth() diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 03cce9a..fb7b49d 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -6,6 +6,7 @@ use App\Models\Transaction; use App\Repositories\Interface\PaymentRepositoryInterface; use Illuminate\Http\Request; +use App\Helpers\Helper as Helpers; class PaymentController extends Controller { diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 9261488..85dadc0 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -38,7 +38,11 @@ class="rounded-circle mx-auto" alt="logo" style="background-color: white;">
-
Hotel Information System
+
+ Sistema Administrativo Hotelero +
+ Inicio de Sesion +

-

Forgot Password? go here

+ diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 91316a0..e56c68c 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -24,7 +24,11 @@
-
Sistem Informasi Perusahaan
+
+ Sistema Administrativo Hotelero +
+ Registro de Usuario +
@@ -33,24 +37,28 @@
- +
- +
- + +
+ type="submit"> + Registrarse +

diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php index 1032aac..8b909da 100644 --- a/resources/views/dashboard/index.blade.php +++ b/resources/views/dashboard/index.blade.php @@ -9,7 +9,7 @@
-
{{ count($transactions) }} Guests this day
+
{{ count($transactions) }} Hospedados Hoy
@@ -29,7 +29,7 @@
-

Today Guests

+

Hospedados del dia

@@ -46,12 +46,12 @@ - Name - Room - Stay - Day Left - Debt - Status + Nombre + Cuarto + Estadia + Dias Restantes + Debe + Estado @@ -85,11 +85,11 @@ class="rounded-circle img-thumbnail" width="40" height="40" - {{ $transaction->getTotalPrice() - $transaction->getTotalPayment() == 0 ? 'Success' : 'Progress' }} + {{ $transaction->getTotalPrice() - $transaction->getTotalPayment() == 0 ? 'Pagado' : 'En proceso' }} @if (Helper::getDateDifference(now(), $transaction->check_out) < 1) - must finish payment + Sin pagar @endif @@ -97,7 +97,7 @@ class="justify-content-center badge {{ $transaction->getTotalPrice() - $transact @empty - There's no data in this table + Sin datos Disponibles @endforelse @@ -127,7 +127,7 @@ class="justify-content-center badge {{ $transaction->getTotalPrice() - $transact
-

Monthly Guests Chart

+

Usuarios por mes

@@ -153,7 +153,7 @@ class="justify-content-center badge {{ $transaction->getTotalPrice() - $transact {{ Helper::thisMonth() }} - Last month + Ultimo Mes
diff --git a/resources/views/template/include/_navbar.blade.php b/resources/views/template/include/_navbar.blade.php index d62fc39..ef0e145 100644 --- a/resources/views/template/include/_navbar.blade.php +++ b/resources/views/template/include/_navbar.blade.php @@ -17,7 +17,9 @@ {{ auth()->user()->unreadNotifications->count() }} - unread messages + + mensajes sin responder + @endif @@ -27,7 +29,7 @@ class="position-absolute mt-1 top-0 start-100 translate-middle badge rounded-pil
  • - +
  • @@ -50,7 +52,7 @@ class="timeline-date">{{ $notification->created_at->diffForHumans() }} @empty

    - There's no new notification + No hay notificaciones

    @endforelse @@ -63,9 +65,12 @@ class="timeline-date">{{ $notification->created_at->diffForHumans() }}
    Mark all as read - See - All + class="float-start mb-2 ms-2"> + Marcar Leidas + + + Ver Todas +
    @@ -81,16 +86,16 @@ class="float-start mb-2 ms-2">Mark all as read
    diff --git a/resources/views/transaction/reservation/confirmation.blade.php b/resources/views/transaction/reservation/confirmation.blade.php index 8d00077..765ae74 100644 --- a/resources/views/transaction/reservation/confirmation.blade.php +++ b/resources/views/transaction/reservation/confirmation.blade.php @@ -1,168 +1,149 @@ @extends('template.master') @section('title', 'Choose Day Reservation') @section('head') - + + @endsection @section('content') - @include('transaction.reservation.progressbar') -
    -
    -
    -
    -
    -
    -
    +@include('transaction.reservation.progressbar') +
    +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + @csrf
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    -
    -
    -
    - - @csrf -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    +
    + +
    +
    -
    - -
    - - @error('downPayment') -
    - {{ $message }} -
    - @enderror +
    +
    + +
    + + @error('downPayment') +
    + {{ $message }}
    + @enderror
    -
    -
    -
    -
    - - -
    +
    +
    +
    +
    +
    + +
    -
    -
    - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - {{ $customer->name }} -
    - - - - {{ $customer->job }}
    - - - - - {{ $customer->birthdate }} -
    - - - - - {{ $customer->address }} -
    -
    +
    +
    +
    + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + {{ $customer->name }} +
    + + + + {{ $customer->job }}
    + + + + + {{ $customer->birthdate }} +
    + + + + + {{ $customer->address }} +
    +
    @endsection @section('footer') -@endsection +@endsection \ No newline at end of file From 50c44bfc97c64b97218f19813814309473c63b29 Mon Sep 17 00:00:00 2001 From: Cristhian Recalde Date: Wed, 26 Jun 2024 00:18:17 -0500 Subject: [PATCH 4/4] refactor: update currency format in Helper class --- app/Helpers/Helper.php | 2 +- resources/views/customer/create.blade.php | 4 +- resources/views/transaction/index.blade.php | 329 +++++++++--------- .../reservation/chooseRoom.blade.php | 29 +- .../reservation/confirmation.blade.php | 26 +- .../reservation/createIdentity.blade.php | 22 +- .../reservation/pickFromCustomer.blade.php | 13 +- .../reservation/progressbar.blade.php | 8 +- .../reservation/viewCountPerson.blade.php | 185 +++++----- 9 files changed, 300 insertions(+), 318 deletions(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 7391d18..31ff20d 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -9,7 +9,7 @@ class Helper { public static function convertToRupiah($price) { - return 'Rp. '.number_format($price, 2, ',', '.'); + return '$. '.number_format($price, 2, ',', '.'); } public static function thisMonth() diff --git a/resources/views/customer/create.blade.php b/resources/views/customer/create.blade.php index cb8ad64..d75dde1 100644 --- a/resources/views/customer/create.blade.php +++ b/resources/views/customer/create.blade.php @@ -5,14 +5,14 @@
    -

    Add Customer

    +

    Crear Cliente

    @csrf
    - + @error('name') diff --git a/resources/views/transaction/index.blade.php b/resources/views/transaction/index.blade.php index a6843c4..2cc1057 100644 --- a/resources/views/transaction/index.blade.php +++ b/resources/views/transaction/index.blade.php @@ -1,192 +1,185 @@ @extends('template.master') @section('title', 'Reservation') @section('content') -
    -
    -
    - - - - - - - - -
    -
    -
    - - - - +
    +
    +
    + + + + + + + +
    -
    -
    -
    Active Guests:
    -
    +
    +
    + + +
    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - @forelse ($transactions as $transaction) - - - - - - - - - - - - - - @empty - - - - @endforelse - -
    #IDCustomerRoomCheck InCheck OutDaysTotal PricePaid OffDebtAction
    {{ ($transactions->currentpage() - 1) * $transactions->perpage() + $loop->index + 1 }} - {{ $transaction->id }}{{ $transaction->customer->name }}{{ $transaction->room->number }}{{ Helper::dateFormat($transaction->check_in) }}{{ Helper::dateFormat($transaction->check_out) }}{{ $transaction->getDateDifferenceWithPlural($transaction->check_in, $transaction->check_out) }} - {{ Helper::convertToRupiah($transaction->getTotalPrice()) }} - - {{ Helper::convertToRupiah($transaction->getTotalPayment()) }} - {{ $transaction->getTotalPrice() - $transaction->getTotalPayment() <= 0 ? '-' : Helper::convertToRupiah($transaction->getTotalPrice() - $transaction->getTotalPayment()) }} - - - - -
    - There's no data in this table -
    - {{ $transactions->onEachSide(2)->links('template.paginationlinks') }} -
    +
    +
    +
    +
    Hospendantes Activos:
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + @forelse ($transactions as $transaction) + + + + + + + + + + + + + + @empty + + + + @endforelse + +
    #IDClienteCueartoIngresoSalidaDiasPrecio TotalPagadoRestanteAcción
    {{ ($transactions->currentpage() - 1) * $transactions->perpage() + $loop->index + 1 }} + {{ $transaction->id }}{{ $transaction->customer->name }}{{ $transaction->room->number }}{{ Helper::dateFormat($transaction->check_in) }}{{ Helper::dateFormat($transaction->check_out) }}{{ $transaction->getDateDifferenceWithPlural($transaction->check_in, $transaction->check_out) }} + {{ Helper::convertToRupiah($transaction->getTotalPrice()) }} + + {{ Helper::convertToRupiah($transaction->getTotalPayment()) }} + {{ $transaction->getTotalPrice() - $transaction->getTotalPayment() <= 0 ? '-' : Helper::convertToRupiah($transaction->getTotalPrice() - $transaction->getTotalPayment()) }} + + + + +
    + No hay transacciones registradas. +
    + {{ $transactions->onEachSide(2)->links('template.paginationlinks') }}
    -
    -
    -
    Expired:
    -
    +
    +
    +
    +
    Finalizadas:
    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - @forelse ($transactionsExpired as $transaction) - - - - - - - - - - - - - + +
    +
    +
    +
    +
    +
    #IDCustomerRoomCheck InCheck OutDaysTotal PricePaid OffDebtAction
    {{ ($transactions->currentpage() - 1) * $transactions->perpage() + $loop->index + 1 }} - {{ $transaction->id }}{{ $transaction->customer->name }}{{ $transaction->room->number }}{{ Helper::dateFormat($transaction->check_in) }}{{ Helper::dateFormat($transaction->check_out) }}{{ $transaction->getDateDifferenceWithPlural($transaction->check_in, $transaction->check_out) }} - {{ Helper::convertToRupiah($transaction->getTotalPrice()) }} - - {{ Helper::convertToRupiah($transaction->getTotalPayment()) }} - {{ $transaction->getTotalPrice() - $transaction->getTotalPayment() <= 0 ? '-' : Helper::convertToRupiah($transaction->getTotalPrice($transaction->room->price, $transaction->check_in, $transaction->check_out) - $transaction->getTotalPayment()) }} - - - - -
    + + + + + + + + + + + + + + + + + @forelse ($transactionsExpired as $transaction) + + + + + + + + + + + + + @empty - - - + + + @endforelse - -
    #IDClienteCuartoIngresoSalidaDíasPrecio TotalPagadoRestanteAcción
    {{ ($transactions->currentpage() - 1) * $transactions->perpage() + $loop->index + 1 }} + {{ $transaction->id }}{{ $transaction->customer->name }}{{ $transaction->room->number }}{{ Helper::dateFormat($transaction->check_in) }}{{ Helper::dateFormat($transaction->check_out) }}{{ $transaction->getDateDifferenceWithPlural($transaction->check_in, $transaction->check_out) }} + {{ Helper::convertToRupiah($transaction->getTotalPrice()) }} + + {{ Helper::convertToRupiah($transaction->getTotalPayment()) }} + {{ $transaction->getTotalPrice() - $transaction->getTotalPayment() <= 0 ? '-' : Helper::convertToRupiah($transaction->getTotalPrice($transaction->room->price, $transaction->check_in, $transaction->check_out) - $transaction->getTotalPayment()) }} + + + + +
    - There's no data in this table -
    + No hay transacciones registradas. +
    - {{ $transactions->onEachSide(2)->links('template.paginationlinks') }} -
    + + + {{ $transactions->onEachSide(2)->links('template.paginationlinks') }}
    +
    - -