Commit d5c70c8f authored by Khumoyunmirzo Sodiqov's avatar Khumoyunmirzo Sodiqov

fix bugs

parent 569e3650
...@@ -9,9 +9,14 @@ ...@@ -9,9 +9,14 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"> integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="{{ asset('css/font-awesome.min.css') }}"> <link rel="stylesheet" href="{{ asset('css/font-awesome.min.css') }}">
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" {{-- <script--}}
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" {{-- src="https://code.jquery.com/jquery-3.4.1.min.js"--}}
crossorigin="anonymous"></script> {{-- integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="--}}
{{-- crossorigin="anonymous"></script>--}}
{{-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.compatibility.js"></script>--}}
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
crossorigin="anonymous"></script>
<style> <style>
body { body {
background-color: #fbfbfb !important; background-color: #fbfbfb !important;
......
...@@ -121,19 +121,17 @@ ...@@ -121,19 +121,17 @@
</h4> </h4>
</div> </div>
</div> </div>
<ul id="progressbar" class="needs-validation border border-1 bg-white">
<li class="active">СБОР ПОСЫЛКИ</li>
<li>АДРЕСА</li>
<li>ПОДТВЕРЖДЕНИЕ</li>
</ul>
<hr>
<form id="msform" action="#" method="POST" <form id="msform" action="#" method="POST"
class="needs-validation border border-1 bg-white p-5" novalidate> class="needs-validation border border-1 bg-white p-5" novalidate>
<ul id="progressbar" class="needs-validation border border-1 bg-white">
<li class="active">СБОР ПОСЫЛКИ</li>
<li>АДРЕСА</li>
<li>ПОДТВЕРЖДЕНИЕ</li>
</ul>
<hr>
{{ csrf_field() }} {{ csrf_field() }}
<fieldset> <fieldset>
<div class="mb-3"> <div class="mb-3">
<label for="package_name">Название посылки <span style="color: #a01a1f">*</span></label> <label for="package_name">Название посылки <span style="color: #a01a1f">*</span></label>
<input type="text" class="form-control" name="name" id="package_name"> <input type="text" class="form-control" name="name" id="package_name">
...@@ -231,11 +229,6 @@ ...@@ -231,11 +229,6 @@
</div> </div>
<hr> <hr>
<div class="mb-3"> <div class="mb-3">
{{-- <div class="mb-3">--}}
{{-- <label for="comment">Комментарий к посылке <span style="color: #a01a1f">*</span></label>--}}
{{-- <input type="text" class="form-control" name="comment" id="comment">--}}
{{-- </div>--}}
{{-- <label>Куда <span style="color: #EB0000">*</span></label>--}}
<select name="to_address_id" class="form-control"> <select name="to_address_id" class="form-control">
@foreach($senderAddresses as $item) @foreach($senderAddresses as $item)
<option <option
...@@ -252,11 +245,6 @@ ...@@ -252,11 +245,6 @@
</div> </div>
<hr> <hr>
<div class="mb-3"> <div class="mb-3">
{{-- <div class="mb-3">--}}
{{-- <label for="comment">Комментарий к посылке <span style="color: #a01a1f">*</span></label>--}}
{{-- <input type="text" class="form-control" name="comment" id="comment">--}}
{{-- </div>--}}
{{-- <label>Куда <span style="color: #EB0000">*</span></label>--}}
<select name="to_address_id" class="form-control"> <select name="to_address_id" class="form-control">
@foreach($recAddresses as $item) @foreach($recAddresses as $item)
<option <option
...@@ -297,7 +285,7 @@ ...@@ -297,7 +285,7 @@
</div> </div>
</section> </section>
<script> <script>
// "use strict";
//jQuery time //jQuery time
var current_fs, next_fs, previous_fs; //fieldsets var current_fs, next_fs, previous_fs; //fieldsets
var left, opacity, scale; //fieldset properties which we will animate var left, opacity, scale; //fieldset properties which we will animate
...@@ -315,9 +303,8 @@ ...@@ -315,9 +303,8 @@
//show the next fieldset //show the next fieldset
next_fs.show(); next_fs.show();
current_fs.hide();
animating = false;
//hide the current fieldset with style //hide the current fieldset with style
current_fs.hide();
// current_fs.animate({opacity: 0}, { // current_fs.animate({opacity: 0}, {
// step: function (now, mx) { // step: function (now, mx) {
// //as the opacity of current_fs reduces to 0 - stored in "now" // //as the opacity of current_fs reduces to 0 - stored in "now"
...@@ -357,7 +344,6 @@ ...@@ -357,7 +344,6 @@
previous_fs.show(); previous_fs.show();
//hide the current fieldset with style //hide the current fieldset with style
current_fs.hide(); current_fs.hide();
animating = false;
// current_fs.animate({opacity: 0}, { // current_fs.animate({opacity: 0}, {
// step: function (now, mx) { // step: function (now, mx) {
// //as the opacity of current_fs reduces to 0 - stored in "now" // //as the opacity of current_fs reduces to 0 - stored in "now"
......
...@@ -100,24 +100,24 @@ Route::get('/terms', 'HomeController@terms')->name('terms'); ...@@ -100,24 +100,24 @@ Route::get('/terms', 'HomeController@terms')->name('terms');
Auth::routes(); Auth::routes();
Route::get('/home', 'HomeController@index')->name('home'); Route::get('/home', 'HomeController@index')->name('home');
//
/** ///**
* Роуты для управления складом Админ панель // * Роуты для управления складом Админ панель
*/ // */
Route::namespace('Postman')->group(function () { //Route::namespace('Postman')->group(function () {
Route::get('/postman/packages', 'PackagesController@packages_list'); // Route::get('/postman/packages', 'PackagesController@packages_list');
Route::get('/postman/address', 'AddressController@index'); // Route::get('/postman/address', 'AddressController@index');
Route::get('/postman/users', 'UsersController@index'); // Route::get('/postman/users', 'UsersController@index');
Route::get('/postman/declarations', 'DeclarationController@index'); // Route::get('/postman/declarations', 'DeclarationController@index');
Route::get('/postman/activities', 'ActivitylogController@index')->name('activityLog'); // Route::get('/postman/activities', 'ActivitylogController@index')->name('activityLog');
Route::get('/postman/feedback', 'FeedbackController@index')->name('feedback'); // Route::get('/postman/feedback', 'FeedbackController@index')->name('feedback');
//
Route::get('/postman/user/{user_id}/edit', 'UsersController@edit')->where(['user_id' => '[0-9]+'])->name('userEdit'); // Route::get('/postman/user/{user_id}/edit', 'UsersController@edit')->where(['user_id' => '[0-9]+'])->name('userEdit');
Route::get('/postman/address/{address_id}/edit', 'AddressController@edit')->where(['address_id' => '[0-9]+'])->name('addressEdit'); // Route::get('/postman/address/{address_id}/edit', 'AddressController@edit')->where(['address_id' => '[0-9]+'])->name('addressEdit');
Route::get('/postman/package/{package_id}/edit', 'PackagesController@edit')->where(['package_id' => '[0-9]+'])->name('packageEdit'); // Route::get('/postman/package/{package_id}/edit', 'PackagesController@edit')->where(['package_id' => '[0-9]+'])->name('packageEdit');
Route::get('/postman/declaration/{package_id}/generate', 'DeclarationController@generatePDF')->where(['package_id' => '[0-9]+'])->name('declarationPdf'); // Route::get('/postman/declaration/{package_id}/generate', 'DeclarationController@generatePDF')->where(['package_id' => '[0-9]+'])->name('declarationPdf');
Route::post('/postman/package/{package_id}/update', 'PackagesController@update')->where(['package_id' => '[0-9]+'])->name('packageUpdate'); // Route::post('/postman/package/{package_id}/update', 'PackagesController@update')->where(['package_id' => '[0-9]+'])->name('packageUpdate');
Route::post('/postman/user/{user_id}/update', 'UsersController@update')->where(['user_id' => '[0-9]+'])->name('userUpdate'); // Route::post('/postman/user/{user_id}/update', 'UsersController@update')->where(['user_id' => '[0-9]+'])->name('userUpdate');
Route::post('/postman/address/{address_id}/update', 'AddressController@update')->where(['address_id' => '[0-9]+'])->name('addressUpdate'); // Route::post('/postman/address/{address_id}/update', 'AddressController@update')->where(['address_id' => '[0-9]+'])->name('addressUpdate');
Route::get('/postman/feedback/{feedback_id}/view', 'FeedbackController@view')->where(['feedback_id' => '[0-9]+'])->name('feedbackView'); // Route::get('/postman/feedback/{feedback_id}/view', 'FeedbackController@view')->where(['feedback_id' => '[0-9]+'])->name('feedbackView');
}); //});
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