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

app/Http/Controllers/CustomerController.php

@@ -18,6 +18,12 @@ use Psy\Command\ListCommand\ConstantEnumerator;
 
 class CustomerController extends Controller
 {
+
+    public function hitory($id){
+        
+        return view('adminlte::layouts.customers.History');
+    }
+
     public function profile(){
         //dd("masuk agan");
        //dd(Auth::user()->id);
@@ -79,7 +85,13 @@ class CustomerController extends Controller
                 ->where('homestay.id','=',$id)
                 ->get();
         //dd($data);
-        return view('adminlte::layouts.pages.Homestay')->with('data',$data[0]);
+
+        $daftarBook = DB::table('daftar_book')
+                    ->select('daftar_book.*')
+                    ->where('daftar_book.homestay','=',$id)
+                    ->get();
+
+        return view('adminlte::layouts.pages.Homestay')->with('data',$data[0])->with('daftarBook',$daftarBook);
     }
 
     public function updateProfile(Request $request,$id){
@@ -140,27 +152,19 @@ class CustomerController extends Controller
         $trans->lama_menginap = $request['jumlah_hari'];
         $trans->total_pembayaran = $request['jumlah_kamar'] * $data[0]->harga;
 
+        $lb->homestay = $request['id'];
+        $lb->nama_pemesan = $data2[0]->nama;
+        $lb->tanggal_mulai = $request['tanggal'] ;
+        $lb->tanggal_berakhir = $baru;
 
         $trans->save();
 
+        $lb->save();
 
+        return redirect()->action(
+            'CustomerController@detailhomestay', ['id' => $request['id']]
+        );
 
-//        $dataTrans = DB::table('transaksi')
-//                    ->select('transaksi.*')
-//                    ->where('transaksi.id_pelanggan','=',$data2[0]->id)
-//                    ->get();
-//
-//        $room = Room::all()->where('idHomestay',$data[0]->idHomestay);
-//
-//        for ($i=0;$i<=$request['jumlah_kamar'];$i++){
-//            if($room[$i]->id_transaksi==null){
-//                $upRoom = Room::find($room[$i]->id);
-//                $upRoom->id_transaksi = $dataTrans[0]->id;
-//                $upRoom->update();
-//            }
-//        }
-
-        dd("masuk gan",$request['tanggal'],$time,$baru,$request['id'],$data2,$data);
     }
 
 }

app/ListBook.php

@@ -9,7 +9,7 @@ class ListBook extends Model
     protected $table = "daftar_book";
 
     protected $fillable = [
-        'nama_pemesan','tanggal_mulai','tanggal_berakhir'
+        'nama_pemesan','tanggal_mulai','tanggal_berakhir','homestay'
     ];
 
     public $timestamps = false;

resources/views/vendor/adminlte/layouts/pages/Homestay.blade.php

 @extends('adminlte::layouts.master')
+
 @section('main-content')
 <!-- Banner -->
 <div class="banner agileits w3layouts">
@@ -18,27 +19,18 @@
 				<input type="hidden" name="id" value="{{$data->id}}">
 
 				<div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
-					<input class="date agileits w3layouts" id="datepicker1" type="text" value="	Tanggal Check in" onfocus="this.value = '';" onblur="if (this.value == '') {this.value = '';}" required="">
-
-				</div>
-				<div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
-					<input class="date agileits w3layouts" id="datepicker2" type="text" value="	Tanggal out" onfocus="this.value = '';" onblur="if (this.value == '') {this.value = '';}" required="">
+					<input class="date agileits w3layouts" id="datepicker1" name="tanggal" type="text" value="	Tanggal Check in" onfocus="this.value = '';" onblur="if (this.value == '') {this.value = '';}" required="">
 				</div>
+                <div class="col-md-2 col-sm-2 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
+                    <input type="text" class="text wow agileits w3layouts slideInLeft" name="jumlah_hari" placeholder="Lama Menginap" required="" style="background-color: white; color: black">
+                </div>
+                <div class="col-md-2 col-sm-2 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
+                    <input type="text" class="text wow agileits w3layouts slideInLeft" name="jumlah_kamar" placeholder="Jumlah Kamar" required="" style="background-color: white; color: black">
+                </div>
 
-				<div class="col-md-2 col-sm-2 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
-					<input type="text" class="text wow agileits w3layouts slideInLeft" name="jumlah_hari" placeholder="Lama Menginap" required="" style="background-color: white; color: black">
-				</div>
-				<div class="col-md-2 col-sm-2 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
-					<input type="text" class="text wow agileits w3layouts slideInLeft" name="jumlah_kamar" placeholder="Jumlah Kamar" required="" style="background-color: white; color: black">
-				</div>
+                <input type="submit" class="more_btn wow agileits w3layouts slideInLeft" value="Book Now">
 
-				<div class="col-md-2 col-sm-2 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
-					<a href="" id="book" >
-						<input type="button" class="more_btn wow agileits w3layouts slideInLeft" value="Book Now">
-					</a>
-				</div>
 			</form>
-
 		</div>
 	</div>
 </div>
@@ -47,42 +39,35 @@
 
 
 <br><br>
-<div class="details agilets w3layouts"  >
+<div class="details agilets w3layouts">
 	<h2 style="margin-bottom: 10px;"> Daftar Booking </h2>
-
 	<div class="container">
 		<div class="cuisines agileits w3layouts">
 			<div class="container">
 				<table class="table  table-striped">
 					<thead>
-						<tr>
-							<th> No. </th>
-							<th> No. Rekening </th>
-							<th> Atas Nama </th>
-							<th> Total Pembayaran </th>
-						</tr>
+					<tr>
+						<th> Nama Pemesan </th>
+						<th> Tanggal Mulai </th>
+						<th> Tanggal Berakhir </th>
+					</tr>
 					</thead>
 					<tbody>
+					@foreach($daftarBook as $a)
 						<tr>
-							<td>1</td>
-							<td>456141923</td>
-							<td>Palti Sinaga</td>
-							<td>2.400.000</td>
-						</tr>
-						<tr class="success">
-							<td>2</td>
-							<td>09179287213</td>
-							<td>Lestari Siregar</td>
-							<td>2.123.091</td>
+							<td>{{$a->nama_pemesan}}</td>
+							<td>{{$a->tanggal_mulai}}</td>
+							<td>{{$a->tanggal_berakhir}}</td>
 						</tr>
+					@endforeach
 					</tbody>
 				</table>
-
 			</div>
 		</div>
 	</div>
 </div>
 
+
 <!-- Informations -->
 <div class="cuisines agileits w3layouts">
 	<div class="container">
@@ -148,12 +133,16 @@
 		<div class="col-md-6 col-sm-6 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
 			<h2 style="margin-bottom: 10px;"> Kritik dan Saran</h2>
 			<form action="#" method="post" style="margin-bottom: 25px;"></form>
-			<input type="text" class="text wow agileits w3layouts slideInLeft" name="Name" placeholder="Name" required="">
-			<input type="text" class="text wow agileits w3layouts slideInLeft" name="Email" placeholder="Email" required="">
-			<textarea name="Message" class="wow agileits w3layouts slideInLeft" placeholder="Message" required=""></textarea>
-			<input type="submit" class="more_btn wow agileits w3layouts slideInLeft" value="Send Message">
-		</button>
-	</form>
+
+
+				<input type="text" class="text wow agileits w3layouts slideInLeft" name="Name" placeholder="Name" required="">
+				<input type="text" class="text wow agileits w3layouts slideInLeft" name="Email" placeholder="Email" required="">
+				<textarea name="Message" class="wow agileits w3layouts slideInLeft" placeholder="Message" required=""></textarea>
+				<input type="submit" class="more_btn wow agileits w3layouts slideInLeft" value="Send Message">
+			</button>
+		</form>
+	</div>
+</div>
 </div>
 </div>
 </div>
@@ -209,4 +198,6 @@
 
 	</div>
 </div>
+</div>
+
 @endsection

resources/views/vendor/adminlte/layouts/partialweb/scripts.blade.php

@@ -81,11 +81,11 @@
 			<script src="{{asset('js/jquery-ui.js')}}"></script>
 			<script>
 				$('#datepicker2').datepicker({
-					dateFormat: "dd-M-yy" 
+					dateFormat: "yy-mm-dd"
 				});
 
 				$("#datepicker1").datepicker({
-					dateFormat: "dd-M-yy", 
+					dateFormat: "yy-mm-dd",
 					minDate:  0,
 					onSelect: function(date){            
 						var date1 = $('#datepicker1').datepicker('getDate');           

routes/web.php

@@ -46,6 +46,7 @@ Route::group(['middleware' => 'auth'], function () {
     #adminlte_routes
 });
 Route::get('detailhomestay/{id}','CustomerController@detailhomestay');
+Route::get('history/{id}','CustomerController@hitory');
 Route::get('daftar','CustomerController@register');
 Route::post('daftar','CustomerController@registerStore');
 Route::post('book','CustomerController@booking');