Skip to content

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

Release 28.10.2019

parent 39df34a6
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 62 deletions
resources/views/pages/parcels/order_create.blade.php
View file @ 8a0b71d8
...@@ -82,45 +82,6 @@ ...@@ -82,45 +82,6 @@
position: absolute; position: absolute;
} }
</style> </style>
<!-- multistep form -->
{{-- <form id="msform">--}}
{{-- <!-- progressbar -->--}}
{{-- <ul id="progressbar">--}}
{{-- <li class="active">Account Setup</li>--}}
{{-- <li>Social Profiles</li>--}}
{{-- <li>Personal Details</li>--}}
{{-- </ul>--}}
{{-- <!-- fieldsets -->--}}
{{-- <fieldset>--}}
{{-- <h2 class="fs-title">Create your account</h2>--}}
{{-- <h3 class="fs-subtitle">This is step 1</h3>--}}
{{-- <input type="text" name="email" placeholder="Email"/>--}}
{{-- <input type="password" name="pass" placeholder="Password"/>--}}
{{-- <input type="password" name="cpass" placeholder="Confirm Password"/>--}}
{{-- <input type="button" name="next" class="next action-button" value="Next"/>--}}
{{-- </fieldset>--}}
{{-- <fieldset>--}}
{{-- <h2 class="fs-title">Social Profiles</h2>--}}
{{-- <h3 class="fs-subtitle">Your presence on the social network</h3>--}}
{{-- <input type="text" name="twitter" placeholder="Twitter"/>--}}
{{-- <input type="text" name="facebook" placeholder="Facebook"/>--}}
{{-- <input type="text" name="gplus" placeholder="Google Plus"/>--}}
{{-- <input type="button" name="previous" class="previous action-button" value="Previous"/>--}}
{{-- <input type="button" name="next" class="next action-button" value="Next"/>--}}
{{-- </fieldset>--}}
{{-- <fieldset>--}}
{{-- <h2 class="fs-title">Personal Details</h2>--}}
{{-- <h3 class="fs-subtitle">We will never sell it</h3>--}}
{{-- <input type="text" name="fname" placeholder="First Name"/>--}}
{{-- <input type="text" name="lname" placeholder="Last Name"/>--}}
{{-- <input type="text" name="phone" placeholder="Phone"/>--}}
{{-- <textarea name="address" placeholder="Address"></textarea>--}}
{{-- <input type="button" name="previous" class="previous action-button" value="Previous"/>--}}
{{-- <input type="submit" name="submit" class="submit action-button" value="Submit"/>--}}
{{-- </fieldset>--}}
{{-- </form>--}}
<section class="section section-inset-1"> <section class="section section-inset-1">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
...@@ -152,7 +113,7 @@ ...@@ -152,7 +113,7 @@
</div> </div>
<div class="mb-3"> <div class="mb-3">
<label for="comment">Комментарий к посылке <span style="color: #ff0912">*</span></label> <label for="comment">Комментарий к посылке</label>
<textarea type="text" class="form-control" name="comment" id="comment" <textarea type="text" class="form-control" name="comment" id="comment"
placeholder="Пожалуйста, введите комментарий для пакета"></textarea> placeholder="Пожалуйста, введите комментарий для пакета"></textarea>
...@@ -183,7 +144,7 @@ ...@@ -183,7 +144,7 @@
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<input type="number" name="products[0][1]" <input type="number" name="products[0][1]"
class="form-control form-control-sm count" class="form-control form-control-sm count"
id="" required> required>
<div class="invalid-feedback"> <div class="invalid-feedback">
Укажите количество единиц товара Укажите количество единиц товара
</div> </div>
...@@ -191,9 +152,8 @@ ...@@ -191,9 +152,8 @@
</td> </td>
<td class="col-2"> <td class="col-2">
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<input type="number" name="products[0][2]" class="form-control form-control-sm cost" <input type="number" name="products[0][2]"
id="" class="form-control form-control-sm cost">
placeholder="Username">
<div class="invalid-feedback"> <div class="invalid-feedback">
Укажите стоимость за единицу товара Укажите стоимость за единицу товара
</div> </div>
...@@ -202,15 +162,14 @@ ...@@ -202,15 +162,14 @@
<td class="col-2"> <td class="col-2">
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<input type="text" name="products[0][3]" <input type="text" name="products[0][3]"
class="form-control form-control-sm" class="form-control form-control-sm" required>
id="username">
<div class="invalid-feedback"> <div class="invalid-feedback">
Your username is required. Your username is required.
</div> </div>
</div> </div>
</td> </td>
<td class="text-center col-1"> <td class="text-center col-1">
<span class="cost_per_stuff">$2</span> <span class="cost_per_stuff">$0</span>
</td> </td>
<td class="col-1 text-center"> <td class="col-1 text-center">
<a href="#" class="btn btn-sm btn-outline-danger btn-round button-delete">X</a> <a href="#" class="btn btn-sm btn-outline-danger btn-round button-delete">X</a>
...@@ -221,11 +180,12 @@ ...@@ -221,11 +180,12 @@
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
<a href="#" class="btn btn-sm btn-primary btn-shadow" id="add_new_packet"><strong>+ Добавить товар</strong></a> <a href="#" class="btn btn-sm btn-primary btn-shadow" id="add_new_packet"><strong>+ Добавить
товар</strong></a>
</div> </div>
<div class="col-6 text-right" id="total_price"> <div class="col-6 text-right" id="total_price">
<b>Итоговая сумма в декларации:</b> <strong><span class="text-success" <b>Итоговая сумма в декларации:</b> <strong><span class="text-success"
>$2</span></strong> >$0</span></strong>
</div> </div>
</div> </div>
<br><br> <br><br>
...@@ -357,9 +317,10 @@ ...@@ -357,9 +317,10 @@
<label class="custom-control-label" for="defaultChecked22">Вызов курьера</label> <label class="custom-control-label" for="defaultChecked22">Вызов курьера</label>
</div> </div>
<div class="form-group" style="display: none" id="pickupDate"> <div class="form-group" style="display: none" id="pickupDate">
<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>
<input class="form-control" id="forms-check-name1" type="date" name="delivery_info[]" <input class="form-control" id="forms-check-name1" type="date"
name="delivery_info[]"
data-constraints="@Required" placeholder="Date"> data-constraints="@Required" placeholder="Date">
</div> </div>
<div class="form-group" style="display: none; float: right" id="pickupTime"> <div class="form-group" style="display: none; float: right" id="pickupTime">
...@@ -617,9 +578,9 @@ ...@@ -617,9 +578,9 @@
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)--}} {{-- @foreach(\App\Models\Country::all() as $value)--}}
<option value="5">Узбекистан</option> <option value="5">Узбекистан</option>
{{-- @endforeach--}} {{-- @endforeach--}}
</select> </select>
</div> </div>
</div> </div>
...@@ -877,7 +838,7 @@ ...@@ -877,7 +838,7 @@
" id=\"to_address_id" + value.id + "\">\n" + " id=\"to_address_id" + value.id + "\">\n" +
" <label class=\"custom-control-label\"\n" + " <label class=\"custom-control-label\"\n" +
" for=\"to_address_id" + value.id + "\">" + value.firstname + " " + value.secondname + " <br> " + value.country_name + ", " + value.city_name + ", " + value.street + ", " + value.house + ", " " for=\"to_address_id" + value.id + "\">" + value.firstname + " " + value.secondname + " <br> " + value.country_name + ", " + value.city_name + ", " + value.street + ", " + value.house + ", "
+ value.apartment + "<br><span "+ RLimit +">Лимит на этот адрес: $" + (1000 - value.r_limit) + "</span></label>\n" + + value.apartment + "<br><span " + RLimit + ">Лимит на этот адрес: $" + (1000 - value.r_limit) + "</span></label>\n" +
" </div></div>" " </div></div>"
}); });
$('#recAddresses').empty(); $('#recAddresses').empty();
...@@ -902,16 +863,16 @@ ...@@ -902,16 +863,16 @@
// console.log(key); // console.log(key);
// console.log(value.id); // console.log(value.id);
var RLimit = ((1000 - value.r_limit) <= 0)?'style="color: #ff002b"':''; var RLimit = ((1000 - value.r_limit) <= 0) ? 'style="color: #ff002b"' : '';
var isDisabledRadio = ((1000 - value.r_limit) <= 0)?'disabled':''; var isDisabledRadio = ((1000 - value.r_limit) <= 0) ? 'disabled' : '';
htmlData += "<div class='col-md-5'><div class=\"custom-control custom-radio\"\n" + htmlData += "<div class='col-md-5'><div class=\"custom-control custom-radio\"\n" +
" style=\"width: 300px;height: 120px;border: 1px solid #e9ecef;padding: 10px 10px 10px 40px;margin: 6px;\">\n" + " style=\"width: 300px;height: 120px;border: 1px solid #e9ecef;padding: 10px 10px 10px 40px;margin: 6px;\">\n" +
" <input type=\"radio\" class=\"custom-control-input\"\n" + " <input type=\"radio\" class=\"custom-control-input\"\n" +
" name=\"to_address_id\" value=\"" + value.id + "\"\n" + " name=\"to_address_id\" value=\"" + value.id + "\"\n" +
" id=\"to_address_id" + value.id + "\" "+ isDisabledRadio +">\n" + " id=\"to_address_id" + value.id + "\" " + isDisabledRadio + ">\n" +
" <label class=\"custom-control-label\"\n" + " <label class=\"custom-control-label\"\n" +
" for=\"to_address_id" + value.id + "\">" + value.firstname + " " + value.secondname + " <br> " + value.country_name + ", " + value.city_name + ", " + value.street + ", " + value.house + ", " " for=\"to_address_id" + value.id + "\">" + value.firstname + " " + value.secondname + " <br> " + value.country_name + ", " + value.city_name + ", " + value.street + ", " + value.house + ", "
+ value.apartment + "<br><span "+ RLimit +">Лимит на этот адрес: $" + (1000 - value.r_limit) + "</span></label>\n" + + value.apartment + "<br><span " + RLimit + ">Лимит на этот адрес: $" + (1000 - value.r_limit) + "</span></label>\n" +
" </div></div>" " </div></div>"
}); });
$('#recAddresses').empty(); $('#recAddresses').empty();
...@@ -940,13 +901,16 @@ ...@@ -940,13 +901,16 @@
total_sum += parseInt(cost); total_sum += parseInt(cost);
}); });
if (total_sum > 1000) { if (total_sum > 1000) {
$('#total_price').empty() $('#total_price').empty()
$('#total_price').append('<span style="color: #ff0912; font-size: 14px">* Итоговая сумма не должна привышать $1000 на одну посылку</span>'); $('#total_price').append('<span style="color: #ff0912; font-size: 14px">* Итоговая сумма не должна привышать $1000 на одну посылку</span>');
$('#firstStepNestBtn').attr("disabled", true); $('#firstStepNestBtn').attr("disabled", true);
} else { } else {
var ttt = (total_sum !== 'NaN') ? 0 : total_sum;
$('#total_price').empty() $('#total_price').empty()
$('#total_price').append('<b>Итоговая сумма в декларации:</b> <strong><span class="text-success"\n' + $('#total_price').append('<b>Итоговая сумма в декларации:</b> <strong><span class="text-success"\n' +
' id="total_price">$' + total_sum + '</span></strong>'); ' id="total_price">$' + ttt + '</span></strong>');
// console.log(total_sum == 'NaN');
$('#firstStepNestBtn').removeAttr("disabled"); $('#firstStepNestBtn').removeAttr("disabled");
} }
} }
...@@ -961,7 +925,7 @@ ...@@ -961,7 +925,7 @@
$('#table_package').on('keyup, focusout', '.count, .cost', function () { $('#table_package').on('keyup, focusout', '.count, .cost', function () {
$(this).parent().parent().parent().find('.cost_per_stuff').text('$' + $(this).parent().parent().parent().find('.cost_per_stuff').text('$' +
$(this).parent().parent().parent().find('.count').val() * $(this).parent().parent().parent().find('.cost').val() $(this).parent().parent().parent().find('.cost').val()
); );
count_total_cost(); count_total_cost();
}); });
...@@ -1008,7 +972,7 @@ ...@@ -1008,7 +972,7 @@
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
' <td class="text-center col-1">\n' + ' <td class="text-center col-1">\n' +
' <span class="cost_per_stuff">$2</span>\n' + ' <span class="cost_per_stuff">$0</span>\n' +
' </td>\n' + ' </td>\n' +
' <td class="col-1 text-center">\n' + ' <td class="col-1 text-center">\n' +
' <a href="#" class="btn btn-sm btn-outline-danger btn-round button-delete">X</a>\n' + ' <a href="#" class="btn btn-sm btn-outline-danger btn-round button-delete">X</a>\n' +
......
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