Skip to content

F
fazo
Commit e25b94c8 authored by Khumoyunmirzo Sodiqov's avatar Khumoyunmirzo Sodiqov
Browse files
Options

Release 28.10.2019

parent 76b27fe8
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 75 deletions
app/Http/Controllers/OrderController.php
View file @ e25b94c8
...@@ -76,6 +76,7 @@ class OrderController extends Controller ...@@ -76,6 +76,7 @@ class OrderController extends Controller
'status_id', 'status_id',
'label_url', 'label_url',
'comment', 'comment',
DB::raw('(SELECT name FROM payment_statuses WHERE id=(select payment_statuses_id from payment where order_id=orders.id)) as payment_status'),
DB::raw('(SELECT title FROM flights WHERE id=orders.flight_id) as flights'), DB::raw('(SELECT title FROM flights WHERE id=orders.flight_id) as flights'),
DB::raw('(SELECT name FROM users WHERE id=orders.operator_id) as operator'), DB::raw('(SELECT name FROM users WHERE id=orders.operator_id) as operator'),
DB::raw('(SELECT concat(name, \' \', surname) FROM clients WHERE id=orders.client_id) as client'), DB::raw('(SELECT concat(name, \' \', surname) FROM clients WHERE id=orders.client_id) as client'),
...@@ -118,7 +119,7 @@ class OrderController extends Controller ...@@ -118,7 +119,7 @@ class OrderController extends Controller
'status_id', 'status_id',
'label_url', 'label_url',
'comment', 'comment',
DB::raw('(SELECT name FROM payment_statuses WHERE id=(select payment_statuses_id from payment where order_id=orders.id)) as payment_statuses'), DB::raw('(SELECT name FROM payment_statuses WHERE id=(select payment_statuses_id from payment where order_id=orders.id)) as payment_status'),
DB::raw('(SELECT title FROM flights WHERE id=orders.flight_id) as flights'), DB::raw('(SELECT title FROM flights WHERE id=orders.flight_id) as flights'),
DB::raw('(SELECT name FROM users WHERE id=orders.operator_id) as operator'), DB::raw('(SELECT name FROM users WHERE id=orders.operator_id) as operator'),
DB::raw('(SELECT concat(name, \' \', surname) FROM clients WHERE id=orders.client_id) as client'), DB::raw('(SELECT concat(name, \' \', surname) FROM clients WHERE id=orders.client_id) as client'),
...@@ -130,6 +131,8 @@ class OrderController extends Controller ...@@ -130,6 +131,8 @@ class OrderController extends Controller
['client_id', '=', $id], ['client_id', '=', $id],
['status_id', '=', $status_id] ['status_id', '=', $status_id]
])->get(); ])->get();
} }
$statuses = DB::select('SELECT s.id, s.sort, s.title, s.color_class, (SELECT count(*) FROM orders where status_id=s.id and client_id=' . $id . ') as count FROM status s'); $statuses = DB::select('SELECT s.id, s.sort, s.title, s.color_class, (SELECT count(*) FROM orders where status_id=s.id and client_id=' . $id . ') as count FROM status s');
...@@ -363,7 +366,7 @@ class OrderController extends Controller ...@@ -363,7 +366,7 @@ class OrderController extends Controller
'id', 'id',
'user_id', 'user_id',
'country', 'country',
'firstname', 'secondname', 'firstname', 'secondname','phone',
'city', 'street', 'house', 'apartment', 'zip', 'passport', 'type', 'city', 'street', 'house', 'apartment', 'zip', 'passport', 'type',
DB::raw('(SELECT title_ru FROM country WHERE id=address_info.country) as country_name'), DB::raw('(SELECT title_ru FROM country WHERE id=address_info.country) as country_name'),
DB::raw('(SELECT title_ru FROM city WHERE id=address_info.city) as city_name'), DB::raw('(SELECT title_ru FROM city WHERE id=address_info.city) as city_name'),
......
app/Models/Client.php
View file @ e25b94c8
...@@ -21,7 +21,7 @@ class Client extends Authenticatable ...@@ -21,7 +21,7 @@ class Client extends Authenticatable
'name', 'surname', 'birthday', 'sex', 'passport', 'passport_issue', 'passport_by', 'country_id', 'name', 'surname', 'birthday', 'sex', 'passport', 'passport_issue', 'passport_by', 'country_id',
'city_id', 'street', 'house', 'apartment', 'phone', 'mobile', 'email', 'add_operator_id', 'edit_operator_id', 'city_id', 'street', 'house', 'apartment', 'phone', 'mobile', 'email', 'add_operator_id', 'edit_operator_id',
'added', 'edited', 'orders', 'last_order', 'allowed', 'status', 'uni_code', 'lang_id', 'password', 'remember_token', 'added', 'edited', 'orders', 'last_order', 'allowed', 'status', 'uni_code', 'lang_id', 'password', 'remember_token',
'scan_id', 'client_type' 'scan_id', 'client_type', 'is_email_ver'
]; ];
// protected $hidden = [ // protected $hidden = [
......
resources/views/layouts/user_new.blade.php
View file @ e25b94c8
...@@ -12,10 +12,11 @@ ...@@ -12,10 +12,11 @@
<!-- jQuery --> <!-- jQuery -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>
<!-- jQuery easing plugin --> <!-- jQuery easing plugin -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js" type="text/javascript"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"
{{-- <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"--}} type="text/javascript"></script>
{{-- integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"--}} {{-- <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"--}}
{{-- crossorigin="anonymous"></script>--}} {{-- integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"--}}
{{-- crossorigin="anonymous"></script>--}}
<style> <style>
body { body {
background-color: #fbfbfb !important; background-color: #fbfbfb !important;
...@@ -68,6 +69,12 @@ ...@@ -68,6 +69,12 @@
vertical-align: middle; vertical-align: middle;
float: right; float: right;
} }
input[type=number]::-webkit-inner-spin-button,
input[type=number]::-webkit-outer-spin-button {
-webkit-appearance: none;
margin: 0;
}
</style> </style>
</head> </head>
<body> <body>
......
resources/views/pages/parcels/allpackages.blade.php
View file @ e25b94c8
...@@ -64,9 +64,9 @@ ...@@ -64,9 +64,9 @@
<th>Статус</th> <th>Статус</th>
<th>Трек №</th> <th>Трек №</th>
<th>Количество товаров</th> <th>Количество товаров</th>
<th>Стоимость товаров</th> <th>Сумма товаров</th>
<th>Вес</th> <th>Вес</th>
<th>Стоимость доставки</th> <th>Сумма доставки</th>
<th>FedEx</th> <th>FedEx</th>
<th>Способ оплаты</th> <th>Способ оплаты</th>
<th>Статус платежа</th> <th>Статус платежа</th>
...@@ -93,7 +93,9 @@ ...@@ -93,7 +93,9 @@
<td class="text-center"><a <td class="text-center"><a
href="{{ ($package->payment_info == 3)?'/packages/payment/'.$package->id:'#' }}">{{ ($package->payment_info == 3)?'Оплатить онлайн':'Pay offline' }}</a> href="{{ ($package->payment_info == 3)?'/packages/payment/'.$package->id:'#' }}">{{ ($package->payment_info == 3)?'Оплатить онлайн':'Pay offline' }}</a>
</td> </td>
<td class="text-center">{{ $package->payment_statuses }}</td> <td class="text-center">{{ $package->payment_status }}</td>
<td class="text-center"><a
href="#"><i class="fa fa-pencil" style="color: #e0a800"></i></a></td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
......
resources/views/pages/parcels/order_create.blade.php
View file @ e25b94c8
...@@ -225,9 +225,9 @@ ...@@ -225,9 +225,9 @@
<a href="#" class="btn btn-sm btn-primary btn-shadow" id="add_new_packet"><strong>+ Добавить <a href="#" class="btn btn-sm btn-primary btn-shadow" id="add_new_packet"><strong>+ Добавить
посылку</strong></a> посылку</strong></a>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right" id="total_price">
<b>Итоговая сумма в декларации:</b> <strong><span class="text-success" <b>Итоговая сумма в декларации:</b> <strong><span class="text-success"
id="total_price">$2</span></strong> >$2</span></strong>
</div> </div>
</div> </div>
<br><br> <br><br>
...@@ -343,18 +343,41 @@ ...@@ -343,18 +343,41 @@
<hr> <hr>
<h1>Выберите тип доставки</h1> <h1>Выберите тип доставки</h1>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-12">
<div class="custom-control custom-radio"> <div class="custom-control custom-radio">
<input type="radio" class="custom-control-input" id="defaultUnchecked11" <input type="radio" class="custom-control-input" id="defaultUnchecked11"
name="delivery_info" value="Само достовка" checked> name="delivery_info" value="Само-доставка" checked>
<label class="custom-control-label" for="defaultUnchecked11">Само достовка</label> <label class="custom-control-label" for="defaultUnchecked11">Само-доставка</label>
</div> </div>
<!-- Default checked --> <!-- Default checked -->
<div class="custom-control custom-radio"> <div>
<input type="radio" class="custom-control-input" id="defaultChecked22" <div class="custom-control custom-radio" style="float: left">
name="delivery_info" value="Вызов курьера"> <input type="radio" class="custom-control-input" id="defaultChecked22"
<label class="custom-control-label" for="defaultChecked22">Вызов курьера</label> name="delivery_info" value="Вызов курьера">
<label class="custom-control-label" for="defaultChecked22">Вызов курьера</label>
</div>
<div class="form-group" style="display: none; float: right" id="pickupTime">
<label class="form-label" for="involve-form-country1">Пожалуйста, укажите время
для
пикап Вашей почты <span
style="color: #ff0912">*</span></label>
<select class="form-control" id="delivery_info1" name="delivery_info1"
data-placeholder="Select Your Country" required>
<option value="08:00 - 09:00">08:00 - 09:00</option>
<option value="09:00 - 10:00">09:00 - 10:00</option>
<option value="10:00 - 11:00">10:00 - 11:00</option>
<option value="11:00 - 12:00">11:00 - 12:00</option>
<option value="12:00 - 13:00">12:00 - 13:00</option>
<option value="13:00 - 14:00">13:00 - 14:00</option>
<option value="14:00 - 15:00">14:00 - 15:00</option>
<option value="15:00 - 16:00">15:00 - 16:00</option>
<option value="16:00 - 17:00">16:00 - 17:00</option>
<option value="17:00 - 18:00">17:00 - 18:00</option>
<option value="18:00 - 19:00">18:00 - 19:00</option>
</select>
</div>
</div> </div>
</div> </div>
...@@ -379,7 +402,8 @@ ...@@ -379,7 +402,8 @@
<div class="custom-control custom-radio"> <div class="custom-control custom-radio">
<input type="radio" class="custom-control-input" id="defaultChecked32" <input type="radio" class="custom-control-input" id="defaultChecked32"
name="payment_type_id" value="3"> name="payment_type_id" value="3">
<label class="custom-control-label" for="defaultChecked32">Оплачу электронной формой оплаты (VISA, PayPal, <label class="custom-control-label" for="defaultChecked32">Оплачу электронной формой
оплаты (VISA, PayPal,
MasterCard, AmericanExpress)</label> MasterCard, AmericanExpress)</label>
</div> </div>
</div> </div>
...@@ -415,7 +439,7 @@ ...@@ -415,7 +439,7 @@
<div class="modal-body"> <div class="modal-body">
@csrf @csrf
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="form-label" for="forms-check-name1">Имя <span <label class="form-label" for="forms-check-name1">Имя <span
style="color: #ff0912">*</span></label> style="color: #ff0912">*</span></label>
...@@ -423,7 +447,7 @@ ...@@ -423,7 +447,7 @@
data-constraints="@Required" placeholder="Имя" required> data-constraints="@Required" placeholder="Имя" required>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="form-label" for="forms-check-last-name1">Фамилия <span <label class="form-label" for="forms-check-last-name1">Фамилия <span
style="color: #ff0912">*</span></label> style="color: #ff0912">*</span></label>
...@@ -432,15 +456,6 @@ ...@@ -432,15 +456,6 @@
data-constraints="@Required" placeholder="Фамилия" required> data-constraints="@Required" placeholder="Фамилия" required>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-4">
<div class="form-group">
<label class="form-label" for="forms-check-last-name1">Отчество <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-last-name1" type="text"
name="fathername"
data-constraints="@Required" placeholder="Отчество" required>
</div>
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
...@@ -450,9 +465,7 @@ ...@@ -450,9 +465,7 @@
style="color: #ff0912">*</span></label> style="color: #ff0912">*</span></label>
<select class="form-control" id="involve-form-country1" id="country" name="country" <select class="form-control" id="involve-form-country1" id="country" name="country"
data-placeholder="Select Your Country" required> data-placeholder="Select Your Country" required>
@foreach(\App\Models\Country::all() as $value) <option value="1" selected>USA</option>
<option value="{{ $value->id }}">{{ $value->title_ru }}</option>
@endforeach
</select> </select>
</div> </div>
</div> </div>
...@@ -461,11 +474,11 @@ ...@@ -461,11 +474,11 @@
<div class="col-xs-12 select"> <div class="col-xs-12 select">
<!-- RD SelectMenu--> <!-- RD SelectMenu-->
<div class="form-group form-wrap-validation"> <div class="form-group form-wrap-validation">
<label class="form-label" for="involve-form-country1">Область <span <label class="form-label" for="involve-form-country1">Штат <span
style="color: #ff0912">*</span></label> style="color: #ff0912">*</span></label>
<select class="form-control" id="involve-form-country1" name="city" <select class="form-control" id="involve-form-country1" name="city"
data-placeholder="Select Your Area" required> data-placeholder="Select Your Area" required>
@foreach(\App\Models\City::all() as $value) @foreach(\App\Models\City::where('country_id', '=', 1)->get() as $value)
<option value="{{ $value->id }}">{{ $value->title_ru }}</option> <option value="{{ $value->id }}">{{ $value->title_ru }}</option>
@endforeach @endforeach
</select> </select>
...@@ -475,32 +488,23 @@ ...@@ -475,32 +488,23 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="form-label" for="forms-check-street">Улица <span <label class="form-label" for="forms-check-street">Город <span
style="color: #ff0912">*</span></label> style="color: #ff0912">*</span></label>
<input type="text" class="form-control" id="forms-check-street" name="street" <input type="text" class="form-control" id="forms-check-street" name="street"
placeholder="Улица" required> placeholder="Город" required>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="form-label" for="forms-check-house">Дом <span <label class="form-label" for="forms-check-house">Адрес <span
style="color: #ff0912">*</span></label> style="color: #ff0912">*</span></label>
<input type="text" class="form-control" id="forms-check-house" name="house" <input type="text" class="form-control" id="forms-check-house" name="house"
placeholder="Дом" required> placeholder="Адрес" required>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="form-label" for="forms-check-appartment">Квартира <span
style="color: #ff0912">*</span></label>
<input type="text" class="form-control" id="forms-check-appartment" name="apartment"
placeholder="Квартира" required>
</div>
</div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="form-label" for="forms-check-postcode1">ZIP код <span <label class="form-label" for="forms-check-postcode1">ZIP код <span
...@@ -509,9 +513,6 @@ ...@@ -509,9 +513,6 @@
data-constraints="@Required" placeholder="ZIP код" required> data-constraints="@Required" placeholder="ZIP код" required>
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-check-phone">Номер телефона <span <label class="form-label" for="forms-check-phone">Номер телефона <span
...@@ -520,11 +521,10 @@ ...@@ -520,11 +521,10 @@
data-constraints="@Required" placeholder="Номер телефона" required> data-constraints="@Required" placeholder="Номер телефона" required>
</div> </div>
</div> </div>
<div class="col-md-6 select">
<input type="hidden" name="type" value="sender">
</div>
</div> </div>
<input type="hidden" name="type" value="sender">
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Закрыть</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">Закрыть</button>
...@@ -568,11 +568,10 @@ ...@@ -568,11 +568,10 @@
</div> </div>
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<div class="form-group"> <div class="form-group">
<label class="form-label" for="forms-check-last-name1">Отчество <span <label class="form-label" for="forms-check-last-name1">Отчество</label>
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-last-name1" type="text" <input class="form-control" id="forms-check-last-name1" type="text"
name="fathername" name="fathername"
data-constraints="@Required" placeholder="Отчество" required> data-constraints="@Required" placeholder="Отчество">
</div> </div>
</div> </div>
</div> </div>
...@@ -588,19 +587,17 @@ ...@@ -588,19 +587,17 @@
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<div class="form-group"> <div class="form-group">
<label class="form-label" for="forms-check-company1">Когда выдан <span <label class="form-label" for="forms-check-company1">Когда выдан</label>
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-company1" type="date" <input class="form-control" id="forms-check-company1" type="date"
name="passport_issue" name="passport_issue"
data-constraints="@Required" placeholder="Когда выдан" required> data-constraints="@Required" placeholder="Когда выдан">
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<div class="form-group"> <div class="form-group">
<label class="form-label" for="forms-check-company1">Кем выдан <span <label class="form-label" for="forms-check-company1">Кем выдан</label>
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-company1" type="text" name="passport_by" <input class="form-control" id="forms-check-company1" type="text" name="passport_by"
data-constraints="@Required" placeholder="Кем выдан" required> data-constraints="@Required" placeholder="Кем выдан">
</div> </div>
</div> </div>
</div> </div>
...@@ -666,10 +663,9 @@ ...@@ -666,10 +663,9 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="form-label" for="forms-check-postcode1">ZIP код <span <label class="form-label" for="forms-check-postcode1">ZIP код</label>
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-postcode1" type="text" name="zip" <input class="form-control" id="forms-check-postcode1" type="text" name="zip"
data-constraints="@Required" placeholder="ZIP код" required> data-constraints="@Required" placeholder="ZIP код">
</div> </div>
</div> </div>
</div> </div>
...@@ -720,6 +716,13 @@ ...@@ -720,6 +716,13 @@
// window.alert('Пожалуйста, введите комментарий для пакета'); // window.alert('Пожалуйста, введите комментарий для пакета');
return false; return false;
} }
var weight = $('#weight').val();
if (weight > 30) {
// Пожалуйста, введите имя для пакета
$('#weight').parent().append('<br><span style="color: #ff0912; font-size: 14px">* Максимальный вес 30 кг</span>');
// window.alert('Пожалуйста, введите комментарий для пакета');
return false;
}
// console.log($(this).data('type')); // console.log($(this).data('type'));
if ($(this).data('type') === 'outnewyork') { if ($(this).data('type') === 'outnewyork') {
...@@ -799,8 +802,7 @@ ...@@ -799,8 +802,7 @@
" name=\"from_address\" value=\"" + value.id + "\"\n" + " name=\"from_address\" value=\"" + value.id + "\"\n" +
" id=\"from_address" + value.id + "\">\n" + " id=\"from_address" + value.id + "\">\n" +
" <label class=\"custom-control-label\"\n" + " <label class=\"custom-control-label\"\n" +
" for=\"from_address" + value.id + "\">" + value.country_name + ", " + value.city_name + ", " + value.street + ", " + value.house + ", " " for=\"from_address" + value.id + "\">" + value.firstname + " " + value.secondname + "<br>" + value.house + ", " + value.street + ", " + value.city_name + ", " + value.country_name + ", " + value.zip + "<br>" + value.phone + "</label>\n" +
+ value.apartment + ", " + value.zip + " | " + value.firstname + " " + value.secondname + "</label>\n" +
" </div></div>" " </div></div>"
}); });
$('#senderAddresses').empty(); $('#senderAddresses').empty();
...@@ -831,8 +833,7 @@ ...@@ -831,8 +833,7 @@
" name=\"from_address\" value=\"" + value.id + "\"\n" + " name=\"from_address\" value=\"" + value.id + "\"\n" +
" id=\"from_address" + value.id + "\">\n" + " id=\"from_address" + value.id + "\">\n" +
" <label class=\"custom-control-label\"\n" + " <label class=\"custom-control-label\"\n" +
" for=\"from_address" + value.id + "\">" + value.country_name + ", " + value.city_name + ", " + value.street + ", " + value.house + ", " " for=\"from_address" + value.id + "\">" + value.firstname + " " + value.secondname + "<br>" + value.house + ", " + value.street + ", " + value.city_name + ", " + value.country_name + ", " + value.zip + "<br>" + value.phone + "</label>\n" +
+ value.apartment + ", " + value.zip + " | " + value.firstname + " " + value.secondname + "</label>\n" +
" </div></div>" " </div></div>"
}); });
$('#senderAddresses').empty(); $('#senderAddresses').empty();
...@@ -909,6 +910,14 @@ ...@@ -909,6 +910,14 @@
} }
}); });
$("#defaultChecked22").click(function () {
$('#pickupTime').show();
});
$("#defaultUnchecked11").click(function () {
$('#pickupTime').hide();
});
</script> </script>
<script> <script>
var counter = 1; var counter = 1;
...@@ -919,7 +928,14 @@ ...@@ -919,7 +928,14 @@
var cost = $(this).find('.cost_per_stuff').text().slice(1); var cost = $(this).find('.cost_per_stuff').text().slice(1);
total_sum += parseInt(cost); total_sum += parseInt(cost);
}); });
$('#total_price').text('$' + total_sum); if (total_sum > 1000) {
$('#total_price').empty()
$('#total_price').append('<span style="color: #ff0912; font-size: 14px">* Итоговая сумма не должна привышать $1000 на одну посылку</span>');
} else {
$('#total_price').empty()
$('#total_price').append('<b>Итоговая сумма в декларации:</b> <strong><span class="text-success"\n' +
' id="total_price">$' + total_sum + '</span></strong>');
}
} }
function recount_order() { function recount_order() {
...@@ -937,6 +953,7 @@ ...@@ -937,6 +953,7 @@
count_total_cost(); count_total_cost();
}); });
$('#table_package').on('click', '.button-delete', function (e) { $('#table_package').on('click', '.button-delete', function (e) {
e.preventDefault(); e.preventDefault();
$(this).parent().parent().remove(); $(this).parent().parent().remove();
......
routes/web.php
View file @ e25b94c8
...@@ -18,8 +18,9 @@ Route::get('/', function () { ...@@ -18,8 +18,9 @@ Route::get('/', function () {
Route::get('/watch', function () { Route::get('/watch', function () {
return view('welcome'); return view('welcome');
}); });
//
//Auth::routes(); Auth::routes();
Auth::routes(['verify' => true]);
//Route::get('/home', 'HomeController@index')->name('home'); //Route::get('/home', 'HomeController@index')->name('home');
...@@ -98,7 +99,6 @@ Route::post('/profile/password/', 'ProfileController@edit_password')->middleware ...@@ -98,7 +99,6 @@ Route::post('/profile/password/', 'ProfileController@edit_password')->middleware
Route::get('/tariffs', 'HomeController@tariffs')->name('tariffs'); Route::get('/tariffs', 'HomeController@tariffs')->name('tariffs');
Route::get('/terms', 'HomeController@terms')->name('terms'); Route::get('/terms', 'HomeController@terms')->name('terms');
Auth::routes();
Route::get('/home', 'HomeController@index')->name('home'); Route::get('/home', 'HomeController@index')->name('home');
// //
///** ///**
......
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