Skip to content

P
pa2d4ti06
Commit 46ab7b14 by Palti Sinaga
Options

Merge branch 'master' of https://gitlab.del.ac.id/juliper19/pa2d4ti06

# Conflicts: # resources/views/vendor/adminlte/layouts/pages/Homestay.blade.php # resources/views/vendor/adminlte/layouts/partials/mainheader.blade.php
parents 2b947f28 b7a08ba4
Showing with 40 additions and 87 deletions
app/Http/Controllers/CustomerController.php
......@@ -33,7 +33,13 @@ class CustomerController extends Controller
$dataTrsaksi = Transaksi::find($id);
$dataTrsaksi->delete();
$dataTrsaksi->status = 3;
$dataTrsaksi->update();
//$dataTrsaksi->delete();
DB::table('daftar_book')->where('id_transaksi', '=', $id)->delete();
......
app/Http/Controllers/OwnerController.php
......@@ -367,11 +367,14 @@ class OwnerController extends Controller
->select('pemilikhomestay.id')
->where('users.id', '=', Auth::user()->id)
->get();
//dd($request['namaRequestFasilitas']);
$data = new RequestFasilitas();
$data->id_pemilik_homestay = $idPemilik[0]->id;
$data->id_kategoriFasiltas = $request['id_kategori_fasiltas'];
$data->namaRequestFasilitas = $request['namaRequest_fasilitas'];
$data->id_kategori_fasiltas = $request['id_kategoriFasiltas'];
$data->nama_request_fasilitas = $request['namaRequestFasilitas'];
$data->deskripsi = $request['deskripsi'];
$data->jumlah = $request['jumlah'];
......
app/RequestFasilitas.php
......@@ -9,7 +9,7 @@ class RequestFasilitas extends Model
protected $table = "requestfasilitas";
protected $fillable = [
'id','id_pemilik_homestay', 'id_kategoriFasiltas', 'namaRequestFasilitas','deskripsi','jumlahKamar','jumlah','gambar',
'id','id_pemilik_homestay', 'id_kategori_fasiltas', 'nama_request_fasilitas','deskripsi','jumlah','gambar','status',
];
public $timestamps = false;
......
resources/views/vendor/adminlte/layouts/admin/addOwner.blade.php
......@@ -3,7 +3,8 @@
{{ trans('adminlte_lang::message.home') }}
@endsection
@section('main-content')
<div class="box box-success col-md-8">
<div class="col-md-8">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title"> Tambah Pemilik Homestay </h3>
</div>
......@@ -24,11 +25,11 @@
<form action="{{ url('admin') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="form-group has-feedback">
<input type="text" class="form-control" placeholder="{{ trans('adminlte_lang::message.fullname') }}" name="name" value="{{ old('name') }}"/>
<input type="text" class="form-control" placeholder="Nama Lengkap" name="name" value="{{ old('name') }}"/>
<span class="glyphicon glyphicon-user form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<input type="text" class="form-control" placeholder="{{ trans('adminlte_lang::message.username') }}" name="username" value="{{ old('username') }}"/>
<input type="text" class="form-control" placeholder="Username" name="username" value="{{ old('username') }}"/>
<span class="glyphicon glyphicon-user form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
......@@ -50,17 +51,11 @@
<div class="row">
<div class="col-xs-1">
<label>
<div class="checkbox_register icheck">
<label>
<input type="checkbox" name="terms">
</label>
</div>
</label>
</div><!-- /.col -->
<div class="col-xs-6">
<div class="form-group">
<button type="button" class="btn btn-block btn-flat" data-toggle="modal" data-target="#termsModal">{{ trans('adminlte_lang::message.terms') }}</button>
</div>
</div><!-- /.col -->
<div class="col-xs-4 col-xs-push-1">
<button type="submit" class="btn btn-success btn-block btn-flat">{{ trans('adminlte_lang::message.register') }}</button>
......@@ -71,5 +66,6 @@
</div>
</div>
</div>
</div>
@endsection
resources/views/vendor/adminlte/layouts/admin/dataPemesanan.blade.php
......@@ -20,21 +20,7 @@
@endif
</div>
<div class="box-body">
<br>
<div class="col-md-4 col-sm-6 col-xs-12">
<div class="info-box bg-yellow">
<span class="info-box-icon"><i class="glyphicon glyphicon-modal-window"></i></span>
<div class="info-box-content">
<span class="info-box-text">Data Pemesanan</span>
<span class="info-box-number"></span>
</div>
<!-- /.info-box-content -->
</div>
<!-- /.info-box -->
</div>
<br>
<table class="table table-striped">
<table class="table table-striped">
<tr>
<th>Nama Homestay</th>
<th>Nama Pemilik Homstay</th>
......
resources/views/vendor/adminlte/layouts/admin/listOwner.blade.php
......@@ -20,20 +20,6 @@
@endif
</div>
<div class="box-body">
<br>
<div class="col-md-4 col-sm-6 col-xs-12">
<div class="info-box bg-yellow">
<span class="info-box-icon"><i class="ion ion-ios-people-outline"></i></span>
<div class="info-box-content">
<span class="info-box-text">List Owner</span>
<span class="info-box-number">{{$count}}</span>
</div>
<!-- /.info-box-content -->
</div>
<!-- /.info-box -->
</div>
<br>
<table class="table table-striped">
<tr>
......
resources/views/vendor/adminlte/layouts/admin/listPengajuan.blade.php
......@@ -21,21 +21,6 @@
</ul>
</div>
@endif
<br>
<div class="col-md-4 col-sm-6 col-xs-12">
<div class="info-box bg-yellow">
<span class="info-box-icon"><i class="ion ion-ios-people-outline"></i></span>
<div class="info-box-content">
<span class="info-box-text">List Pengajuan</span>
<span class="info-box-number">{{$count}}</span>
</div>
<!-- /.info-box-content -->
</div>
<!-- /.info-box -->
</div>
<br>
<table class="table table-striped">
<tr>
<th>Pengaju</th>
......
resources/views/vendor/adminlte/layouts/admin/listRequestFasilitas.blade.php
......@@ -20,18 +20,7 @@
@endif
</div>
<div class="box-body">
<div class="col-md-4 col-sm-6 col-xs-12">
<div class="info-box bg-yellow">
<span class="info-box-icon "><i class="ion ion-ios-people-outline"></i></span>
<div class="info-box-content">
<span class="info-box-text">List Pengajuan</span>
<span class="info-box-number">{{$count}}</span>
</div>
<!-- /.info-box-content -->
</div>
<!-- /.info-box -->
</div>
<br>
<table class="table table-striped">
<tr>
<th>Pengaju</th>
......
resources/views/vendor/adminlte/layouts/customers/History.blade.php
......@@ -35,16 +35,18 @@
<a href="{{url('buktipembayaran/'.$a->id)}}">Upload Bukti</a>
</td>
<td>
<form action="{{url('batalkanPemesanan/'.$a->id)}}" method="POST">
<form action="{{url('batalkan/'.$a->id)}}" method="post">
<input type="hidden" name="_method" value="PUT">
</i><input type="submit" value="batalkan">
{{csrf_field()}}
<input type="hidden" name="_method" id="hapus" value="DELETE">
<button type="submit" class="btn btn-danger">Hapus</button>
</form>
</td>
@elseif($a->status==1)
<td colspan="3"><h3>Di Terima</h3></td>
@elseif($a->status==2)
<td colspan="3"><h3>Di Tolak</h3></td>
@elseif($a->status=3)
<td colspan="3"><h3>Telah Dibatalkan</h3></td>
@endif
</td>
......
resources/views/vendor/adminlte/layouts/owner/ListPengajuanFasilitas.blade.php
......@@ -25,19 +25,15 @@
<br>
<table class="table table-striped">
<tr>
<th>Pengaju</th>
<th>Judul</th>
<td>Deskripsi</td>
<td>jumlah</td>
<td>Keterangan</td>
<td>Gambar</td>
<td>Status</td>
</tr>
@foreach($data as $a)
<tr>
<td>{{$a->nama}}</td>
<td>{{$a->nama_request_fasilitas}}</td>
<td>{{$a->deskripsi}}</td>
<td>{{$a->jumlah}}</td>
<td>
@if($a->gambar==null)
<img alt="Gambar Tidak Ada" class="img-circle img-responsive">
......
resources/views/vendor/adminlte/layouts/pages/Homestay.blade.php
......@@ -13,7 +13,7 @@
<!-- Booking -->
<div class="details agileits w3layouts" style="margin-top: 10px; padding:0px">
<div class="details agileits w3layouts" style="margin-top: 20px; padding:0px">
<br>
@if(Session::has('message'))
<div class="alert alert-danger">
......@@ -56,7 +56,7 @@
<!-- Booking -->
<div class="details agilets w3layouts" style="margin-bottom:0px; margin-top:0px;">
<h2 > Daftar Booking di {{$data->nama_homestay}}</h2>
<h2 > Daftar Pesanan di {{$data->nama_homestay}}</h2>
<div class="container">
<table class="table table-hover " style="background-color: white; margin-top:20px; width:700px;">
<thead>
......@@ -65,6 +65,9 @@
<th style="color:white;"> Tanggal Mulai </th>
<th style="color:white;"> Tanggal Berakhir </th>
<th style="color:white;"> Jumlah Kamar</th>
<th> Tanggal Mulai </th>
<th> Tanggal Berakhir </th>
<th> Jumlah Kamar</th>
</tr>
</thead>
<tbody>
......
resources/views/vendor/adminlte/layouts/partials/htmlheader.blade.php
<head>
<meta charset="UTF-8">
<title> SI Booking Homestay - @yield('htmlheader_title', 'Your title here') </title>
<title> SI Pemesanan Homestay - @yield('htmlheader_title', 'Your title here') </title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
......@@ -19,7 +19,7 @@
<![endif]-->
<script src="{{ asset('/js/app.js') }}" type="text/javascript"></script>
<script>
window.Laravel = {!! json_encode([
window.Laravel ={!! json_encode([
'csrfToken' => csrf_token(),
]) !!};
</script>
......
resources/views/vendor/adminlte/layouts/partials/mainheader.blade.php
......@@ -4,9 +4,10 @@
<!-- Logo -->
<a href="{{ url('/home') }}" class="logo">
<!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"><b>SI</b>BH</span>
<span class="logo-mini"><b>SI</b>PH</span>
<!-- logo for regular state and mobile devices -->
<span class="logo-lg"><b>SI </b>Pemesanan Homestay </span>
<span class="logo-lg" style="font-size: 17px;"><b>SI </b>Pemesanan Homestay </span>
</a>
<!-- Header Navbar -->
......
resources/views/vendor/adminlte/layouts/partials/sidebar.blade.php
......@@ -20,7 +20,7 @@
</li>
<li class="treeview"><a href="#"><i class='fa fa-users'></i> <span> Pemilik Homestay </span></a>
<ul class="treeview-menu" style="display : none;">
<li><a href="{{url('admin/create')}}"><i class=' fa-user-plus'></i> <span>Tambah Pemilik Homestay</span></a></li>
<li><a href="{{url('admin/create')}}"><i class='fa fa-plus'></i> <span>Tambah Pemilik Homestay</span></a></li>
<li><a href="{{url('listowner')}}"><i class='fa fa-list'></i> <span>Daftar Pemilik Homestay</span></a></li>
</ul>
</li>
......@@ -47,7 +47,7 @@
<li class="treeview"><a href="#"><i class='fa fa-inbox'></i> <span> PESANAN </span></a>
<ul class="treeview-menu" style="display : none;">
<li><a href="{{url('pesanan')}}"><i class='fa fa-list'></i> <span>Daftar Pesanan</span></a></li>
<li><a href="{{url('pesanan')}}"><i class='fa fa-list'></i> <span>Pesanan Baru</span></a></li>
<li><a href="{{url('daftarBooking')}}"><i class='fa fa-list'></i> <span>Daftar Booked</span></a></li>
<li><a href="{{url('AddBook')}}"><i class='fa fa-plus'></i> <span>Tambah Pesanan Manual</span></a></li>
</ul>
......
routes/web.php
......@@ -85,7 +85,7 @@ Route::get('daftar','GuestController@register');
Route::post('daftar','GuestController@registerStore');
Route::group(['middleware' => 'customer'], function () {
Route::delete('batalkanPemesanan/{id}','CustomerController@cancelPemesanan');
Route::put('batalkan/{id}','CustomerController@cancelPemesanan');
Route::put('upload/{id}','CustomerController@upload');
Route::get('customerHistory','CustomerController@history');
Route::post('book','CustomerController@booking');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment