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

p2d4ti06_test.sql

@@ -3,7 +3,7 @@
 -- http://www.phpmyadmin.net
 --
 -- Host: 127.0.0.1
--- Generation Time: 14 Jun 2017 pada 16.37
+-- Generation Time: 15 Jun 2017 pada 02.42
 -- Versi Server: 10.1.16-MariaDB
 -- PHP Version: 7.0.9
 
@@ -47,8 +47,11 @@ CREATE TABLE `daftar_book` (
 --
 
 INSERT INTO `daftar_book` (`id`, `homestay`, `id_transaksi`, `nama_pemesan`, `jumlah_kamar`, `tanggal_mulai`, `tanggal_berakhir`, `permintaan_khusus`, `jumlah_tamu`, `total_harga`, `lama_menginap`, `extrabed`, `status`) VALUES
-(27, 9, 31, 'Sudarsono Sianipar', 1, '2017-06-16', '2017-06-17', 'Penydiaan Kopi di malam Hari', 1, 450000, NULL, NULL, 0),
-(28, 13, 38, 'Lesa Lesuu ', 2, '2017-06-16', '2017-06-19', 'Kopi di pagi hari', 4, 930000, NULL, 1, 0);
+(27, 9, 31, 'Sudarsono Sianipar', 1, '2017-06-16', '2017-06-17', 'Penydiaan Kopi di malam Hari', 1, 450000, 1, 0, 0),
+(28, 13, 38, 'Lesa Lesuu ', 2, '2017-06-16', '2017-06-19', 'Kopi di pagi hari', 4, 930000, 3, 1, 0),
+(29, 9, NULL, 'Andre Sitorus', 2, '2017-06-22', '2017-06-22', NULL, 4, 30000, 1, 1, 1),
+(30, 9, NULL, 'Kevin Siahaan', 2, '2017-06-24', '2017-06-24', NULL, 3, 630000, 2, 1, 1),
+(31, 9, NULL, 'Evrin Lumban Tobing', 3, '2017-07-13', '2017-07-13', NULL, 4, 930000, 2, 1, 1);
 
 -- --------------------------------------------------------
 
@@ -303,15 +306,16 @@ CREATE TABLE `requestfasilitas` (
   `jumlah` int(11) NOT NULL,
   `gambar` varchar(255) DEFAULT NULL,
   `pesan` varchar(255) DEFAULT NULL,
-  `status` int(1) DEFAULT NULL
+  `status` int(1) DEFAULT NULL,
+  `notif` int(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 --
 -- Dumping data untuk tabel `requestfasilitas`
 --
 
-INSERT INTO `requestfasilitas` (`id`, `id_pemilik_homestay`, `id_kategori_fasiltas`, `nama_request_fasilitas`, `deskripsi`, `jumlah`, `gambar`, `pesan`, `status`) VALUES
-(1, 6, 1, 'Keramik Pecah', ' Terjadi Gempa dan mengakibatkan keramik kamar homestay retak yang menyebabkan ketidak nyaman pelanggan', 100, 'images2.jpg', NULL, 0);
+INSERT INTO `requestfasilitas` (`id`, `id_pemilik_homestay`, `id_kategori_fasiltas`, `nama_request_fasilitas`, `deskripsi`, `jumlah`, `gambar`, `pesan`, `status`, `notif`) VALUES
+(1, 6, 1, 'Keramik Pecah', ' Terjadi Gempa dan mengakibatkan keramik kamar homestay retak yang menyebabkan ketidak nyaman pelanggan', 100, 'images2.jpg', NULL, 1, 0);
 
 -- --------------------------------------------------------
 
@@ -342,7 +346,7 @@ CREATE TABLE `transaksi` (
 
 INSERT INTO `transaksi` (`id`, `id_pelanggan`, `id_homestay`, `tanggal_mulai`, `tanggal_berakhir`, `jumlah_kamar`, `lama_menginap`, `bukti_pembayaran`, `total_pembayaran`, `jumlah_tamu`, `permintaan_khusus`, `extrabed`, `tanggal_konfirmasi`, `status`) VALUES
 (31, 6, 9, '2017-06-16', '2017-06-17', 1, 3, NULL, 450000, 1, 'Penydiaan Kopi di malam Hari', NULL, NULL, 0),
-(38, 2, 13, '2017-06-16', '2017-06-19', 2, 3, NULL, 930000, 4, 'Kopi di pagi hari', 1, NULL, 0);
+(38, 2, 13, '2017-06-16', '2017-06-19', 2, 3, '17125558_400556056985554_5641874030777597952_n.jpg', 930000, 4, 'Kopi di pagi hari', 1, NULL, 1);
 
 -- --------------------------------------------------------
 
@@ -368,12 +372,11 @@ CREATE TABLE `users` (
 --
 
 INSERT INTO `users` (`id`, `name`, `username`, `email`, `password`, `foto`, `role`, `remember_token`, `created_at`, `updated_at`) VALUES
-(2, 'Juliper', 'admin', 'admin@del.ac.id', '$2y$10$nnnUgQAnb9FnDb3DNTlwaehkE5GiJ6piv8Yg/LXyXypdgaxigpHVe', 'gravatar.png', 'DinasPariwisata', 'BfmiEoGfbZvYpleBG21C01jBs7nQCOhVec3arre0lY20dCrCo744IcviA8Lh', '2017-04-22 02:30:14', '2017-06-14 07:14:47'),
-(5, 'Palti Sinaga', 'palti', 'palti1@gmail.com', '$2y$10$YZNp2gw4amlEQWi4hvDA9OfGixdYx1AIsl0.El8TzQoo9IPed8E..', 'bulbul-01_gdsl53-1.jpg', 'Owner', 'MLVXiYgrv1tVMTPu4seCPlSsNV2uVkfWTnUkEuXJZzeiAUNAvP6hIn0obUXK', '2017-04-29 08:07:38', '2017-06-14 06:18:01'),
-(14, 'Lesa Lesuu ', 'lesa', 'lesa@gmail.com', '$2y$10$zudTTxc6.lENGpFKwp093u9SuvEjidfYExLHk3vsOvZISDma1HChW', 'anonymous1.jpg', 'Customer', 'XUwSDlqllhbMgMIIYODbZTIFYCk4vNaOwxSRF4c9mA5P85h6lUowDenuWBwl', '2017-05-09 02:41:21', '2017-06-14 06:59:18'),
-(22, 'Op.Balata', 'opbalata', 'balata@gmail.com', '$2y$10$HuXdLU2i0RdiweXKE07seugcrYbDrAWiZx3o3ExrR1pYKjFuEthvi', 'gravatar.png', 'Owner', 'ChwqElcpjW1D2bNnx4CmCareT3ICTWO9H7wudCT451qm0z1OMo5T4kHSCB8E', '2017-05-25 21:10:39', '2017-06-12 10:57:38'),
+(2, 'Juliper', 'admin', 'admin@del.ac.id', '$2y$10$nnnUgQAnb9FnDb3DNTlwaehkE5GiJ6piv8Yg/LXyXypdgaxigpHVe', 'gravatar.png', 'DinasPariwisata', 'riVF15YwtQI2nyJwPsYRro9RkJVzuVQoGgCDIruvCdXmiMVK4w57WUINJYTb', '2017-04-22 02:30:14', '2017-06-14 17:40:35'),
+(5, 'Palti Sinaga', 'palti', 'palti1@gmail.com', '$2y$10$YZNp2gw4amlEQWi4hvDA9OfGixdYx1AIsl0.El8TzQoo9IPed8E..', 'bulbul-01_gdsl53-1.jpg', 'Owner', 'SziE40cEwZ8yAs3ufLpcJQMNS7pMDLNiDilQau6I7nSvipZOrRLc6LjTHc8x', '2017-04-29 08:07:38', '2017-06-14 17:31:13'),
+(14, 'Lesa Lesuu ', 'lesa', 'lesa@gmail.com', '$2y$10$zudTTxc6.lENGpFKwp093u9SuvEjidfYExLHk3vsOvZISDma1HChW', 'anonymous1.jpg', 'Customer', 'iycimVNGxHRua5hGm5u09x0WSWmNx9QoTx5INPxJwaOorz9vHzonHqPvFwcQ', '2017-05-09 02:41:21', '2017-06-14 08:49:54'),
 (28, 'Sudarsono Sianipar', 'sudaraja', 'sudar@gmail.com', '$2y$10$pT.It3G0VrMqlYG5X4C6o.U/34qBTo8KTV3WwMB/IRxlByxGwwR7i', 'anonymous1.jpg', 'Customer', 'jxdJpM9QLJXIFPX102qxhcv1UM4TpaAce9CKdToNcyy9fmA1QZNKxbJ7DtBu', '2017-06-10 00:04:53', '2017-06-14 03:49:21'),
-(30, 'Dion Marpaung', 'dionmarpa', 'dion@gmail.com', '$2y$10$sZxys5lQucdsSd3ahMbi7esS8qDhBdt3AF4.QRnWXm0Ho.qrtCRr.', 'gravatar.png', 'Owner', 'cg5ojdq1PzeKCockL5mj0IOCv8jkRx9DMUGUHz8bilhPNCAhSEg4egDrPAJe', '2017-06-12 06:34:07', '2017-06-12 10:52:15');
+(30, 'Dion Marpaung', 'dionmarpa', 'dion@gmail.com', '$2y$10$sZxys5lQucdsSd3ahMbi7esS8qDhBdt3AF4.QRnWXm0Ho.qrtCRr.', 'gravatar.png', 'Owner', 'HyE17gw2aRzlEh65C6PKZyR6tw15qM4pBn6KQZ5qdXqzCShGFitbXe7ft3op', '2017-06-12 06:34:07', '2017-06-14 10:12:04');
 
 --
 -- Indexes for dumped tables
@@ -493,7 +496,7 @@ ALTER TABLE `users`
 -- AUTO_INCREMENT for table `daftar_book`
 --
 ALTER TABLE `daftar_book`
-  MODIFY `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=29;
+  MODIFY `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=32;
 --
 -- AUTO_INCREMENT for table `dinaspariwisata`
 --

resources/views/vendor/adminlte/layouts/admin/dataPemesanan.blade.php

@@ -25,7 +25,11 @@
         <label>Bulan</label>
         <input type="number" min="1" max="12" name="bulan">
         <label>Nama Homestay</label>
-        <input type="text" name="nama_homestay">
+        <!-- <input type="text" name="nama_homestay"> -->
+        <select class="" name="nama_homestay">
+          <option value="Mawar Homestay"> Mawar Homestay</option>
+          <option value="Dion Homestay"> Dion Homestay </option>
+        </select>
           <input type="submit" class="btn btn-warning"  value="Cari" >
       </div>
 

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

@@ -49,7 +49,7 @@
 						<label>Kamar : </label>
 						<input type="number" min="1" class="text wow agileits w3layouts " required name="jumlah_kamar" placeholder="" style="background-color: white; color: black">
 					</div>
-					<div class="book">
+					<div class="book"><br>
 						<input type="submit" class="more_btn wow agileits w3layouts " value="Cari">
 					</div>