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

app/Http/Controllers/CustomerController.php

@@ -208,7 +208,7 @@ class CustomerController extends Controller
 
         $dataHomestay = DB::table('homestay')
             ->join('kamar','homestay.id','=','kamar.id_homestay')
-            ->select('kamar.*','homestay.harga','homestay.jumlahKamar')
+            ->select('kamar.*','homestay.harga','homestay.jumlah_kamar')
             ->where('homestay.id','=',$request['id'])
             ->get();
 

resources/views/vendor/adminlte/layouts/owner/profil.blade.php

@@ -55,61 +55,6 @@
                       </a>
                   </div>
                 </div>
-
-<div class="container-fluid spark-screen">
-  <div class="row">
-    <div class="col-md-10 col-md-offset-1">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h3 class="panel-heading">Your Profil</h3>
-        </div>
-        <div class="panel-body">
-          <div class="row">
-            <div class="col-md-3 col-lg-3" align="center">
-              <img alt="User Pic" src="img/{{$data->foto}}" class="img-circle img-responsive">
-            </div>
-            <div class="col-md-9 col-lg-8">
-              <table class="table table-user-information">
-                <tr>
-                  <th>Nama </th>
-                  <td>: </td>
-                  <td>{{$data->nama}}</td>
-                </tr>
-                <tr>
-                  <th>Alamat  </th>
-                  <td>: </td>
-                  <td>{{$data->alamat}}</td>
-                </tr>
-                <tr>
-                  <th>Perkerjaan</th>
-                  <td>: </td>
-                  <td>{{$data->pekerjaan}}</td>
-                </tr>
-                <tr>
-                  <th>No Telepon</th>
-                  <td>: </td>
-                  <td>{{$data->noTelepon}}</td>
-                </tr>
-                <tr>
-                  <th>No Rekening </th>
-                  <td>: </td>
-                  <td>{{$data->noRekening}}</td>
-                </tr>
-              </table>
-
-            </div>
-          </div>
-        </div>
-        <div class="panel-footer">
-          <a href="{{url('profiledit/'.$data->id)}}" data-original-title="Edit this user" data-toggle="tooltio" type="button" class="btn btn-sm btn-warning">
-            <i class="glyphicon glyphicon-edit"></i>
-          </a>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
 @endsection
             </div>
             </div>