new calendar

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

@@ -24,20 +24,19 @@
 				<div class="col-md-3 col-sm-3 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>
-<<<<<<< HEAD
+
 				<div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft" style="margin-top: 10px;">
 					<button class="btn btn-success " >BOOK NOW</button>
 
-=======
+
 				<div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
-<<<<<<< HEAD
+
 					<a href="{{url('history')}}" id="book" >
 						<input type="button" class="more_btn wow agileits w3layouts slideInLeft" value="Book Now">
 					</a>
-=======
+
 					<input type="submit" class="more_btn wow agileits w3layouts slideInLeft" value="Book Now">
->>>>>>> f3f2287d7c86a7c8efc0162c242d120bfcaf820a
->>>>>>> 36fc9a9037d0772bcfa4c52323fe8a6c39550bd5
+
 				</div>
 			</form>
 		</div>
@@ -113,13 +112,13 @@
 <div class="details agileits w3layouts">
 	<div class="container">
 		<div class="col-md-6 col-sm-6 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
-<<<<<<< HEAD
+
 			<h2 style="margin-bottom: 10px;"> Kritik dan Saran</h2>
 			<form action="#" method="post" style="margin-bottom: 25px;">
-=======
+
 			<h2 style="margin-bottom: 10px;"> Kritik dan Saran </h2>
 			<form action ="#" method="post" style="margin-bottom: 25px;">
->>>>>>> f3f2287d7c86a7c8efc0162c242d120bfcaf820a
+
 				<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>
@@ -140,10 +139,10 @@
 	document.getElementById('book').onclick = function(){
 		swal("Good job!", "You clicked the button!", "success");};
 	</script>
-<<<<<<< HEAD
+
 	@endsection
 </div>
-=======
+
 
 	
 
@@ -177,9 +176,3 @@
 			};
 
 		</script>
-<<<<<<< HEAD
-	@endsection
-=======
->>>>>>> f3f2287d7c86a7c8efc0162c242d120bfcaf820a
-
->>>>>>> 36fc9a9037d0772bcfa4c52323fe8a6c39550bd5

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

@@ -77,30 +77,24 @@
 		<!-- //Booking-Popup-Box-JavaScript -->
 
 		<!-- Date-Picker-JavaScript -->
-				<script src="{{asset('js/jquery-ui.js')}}"></script>
-				<script>
-					$(function() {
-						$( "#datepicker,#datepicker1,#datepicker2" ).datepicker({minDate:0});
-					});
-				</script>
-			<!-- //Date-Picker-JavaScript -->
+		<script>
+				$('#datepicker2').datepicker({
+					dateFormat: "dd-M-yy" 
+				});
 
-			<!-- new date picker -->
-			<!-- <script>
-					$(function() {
-						$( "#datepicker,#datepicker1" ).datepicker({minDate:0});
-						$("#datepicker,#datepicker2").datepicker({
-							onSelect:function(date){
-							var date1 = $('#datepicker1').datepicker('getDate');
-							var date = new Date(Date.parse(date1));
-							date.setDate(date.getDate()+1);
-							var newDate = date.toDateString();
-							newDate = newDate(Date.parse(newDate));
-							$('#datepicker2').datepicker({minDate:0});
-							}
-						};)
-					});
-				</script> -->
+				$("#datepicker1").datepicker({
+					dateFormat: "dd-M-yy", 
+					minDate:  0,
+					onSelect: function(date){            
+						var date1 = $('#datepicker1').datepicker('getDate');           
+						var date = new Date( Date.parse( date1 ) ); 
+						date.setDate( date.getDate() + 1 );        
+						var newDate = date.toDateString(); 
+						newDate = new Date( Date.parse( newDate ) );                      
+						$('#datepicker2').datepicker("option","minDate",newDate);            
+					}
+				});
+			</script>
 			<!-- //new date picker -->
 
 	<!-- //Custom-JavaScript-File-Links -->
\ No newline at end of file