Skip to content

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

Release 28.10.2019 

(
   - Disabled Auto LogIn before Register
)
parent 94cf5fc7
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
resources/views/pages/parcels/order_create.blade.php
View file @ 616d5beb
...@@ -449,7 +449,7 @@ ...@@ -449,7 +449,7 @@
<div class="col-xs-12 col-sm-6"> <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>
<input class="form-control" id="forms-check-name1" type="text" name="firstname" <input class="form-control" id="forms-check-name1" type="text" name="firstname"
data-constraints="@Required" placeholder="Имя" required> data-constraints="@Required" placeholder="Имя" required>
</div> </div>
...@@ -457,7 +457,7 @@ ...@@ -457,7 +457,7 @@
<div class="col-xs-12 col-sm-6"> <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>
<input class="form-control" id="forms-check-last-name1" type="text" <input class="form-control" id="forms-check-last-name1" type="text"
name="secondname" name="secondname"
data-constraints="@Required" placeholder="Фамилия" required> data-constraints="@Required" placeholder="Фамилия" required>
...@@ -618,9 +618,9 @@ ...@@ -618,9 +618,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="{{ $value->id }}">{{ $value->title_ru }}</option> <option value="5">Узбекистан</option>
@endforeach {{-- @endforeach--}}
</select> </select>
</div> </div>
</div> </div>
...@@ -633,7 +633,7 @@ ...@@ -633,7 +633,7 @@
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', '=', 5)->get() as $value)
<option value="{{ $value->id }}">{{ $value->title_ru }}</option> <option value="{{ $value->id }}">{{ $value->title_ru }}</option>
@endforeach @endforeach
</select> </select>
...@@ -877,8 +877,8 @@ ...@@ -877,8 +877,8 @@
" name=\"to_address_id\" value=\"" + value.id + "\"\n" + " name=\"to_address_id\" value=\"" + value.id + "\"\n" +
" 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.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 + ", " + value.zip + " | " + value.firstname + " " + value.secondname + "</label>\n" + + value.apartment + "<br><span "+ RLimit +">Лимит на этот адрес: $" + (1000 - value.r_limit) + "</span></label>\n" +
" </div></div>" " </div></div>"
}); });
$('#recAddresses').empty(); $('#recAddresses').empty();
...@@ -911,8 +911,8 @@ ...@@ -911,8 +911,8 @@
" 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.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 + ", " + value.zip + " | " + value.firstname + " " + value.secondname + " | <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();
......
resources/views/pages/parcels/payment.blade.php
View file @ 616d5beb
...@@ -121,13 +121,13 @@ ...@@ -121,13 +121,13 @@
<hr> <hr>
<p>Получатель: <kbd>{{ $order->recipient }}</kbd> | Паспортные данные: <p>Получатель: <kbd>{{ $order->recipient }}</kbd> | Паспортные данные:
<kbd>{{ $order->recipient_passport }}</kbd></p> <kbd>{{ $order->recipient_passport }}</kbd></p>
<p>Адрес получателя: <kbd>{{ $order->recipient_address }}</kbd></p> {{-- <p>Адрес получателя: <kbd>{{ $order->recipient_address }}</kbd></p>--}}
</div> </div>
<br/><br/> <br/><br/>
<input type="button" name="next" style="float: right; width: 35%" <input type="button" name="next" style="float: right; width: 35%"
class="next action-button btn btn-primary btn-lg btn-block mt-4" class="next action-button btn btn-primary btn-lg btn-block mt-4"
value="Next"/> value="Следующий"/>
</fieldset> </fieldset>
<fieldset style="padding: 5% 15% 5% 15% !important;"> <fieldset style="padding: 5% 15% 5% 15% !important;">
......
resources/views/pages/profile/addresses.blade.php
View file @ 616d5beb
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<td>{{ $unit->getFIO() }}</td> <td>{{ $unit->getFIO() }}</td>
<td>{{ $unit->getFormatedPassport() }} <td>{{ $unit->getFormatedPassport() }}
</td> </td>
<td>{{ $unit->street . ', ' . $unit->house . ', ' . $unit->apartment . ', ' . $unit->city_name . ', ' . $unit->country_name }} {{ ($unit->type == 'recipient')?'r_limit':'Отправитель' }}</td> <td>{{ $unit->street . ', ' . $unit->house . ', ' . $unit->apartment . ', ' . $unit->city_name . ', ' . $unit->country_name }} {{ ($unit->type == 'recipient')?' | Лимит на этот адрес: $'.$unit->r_limit:'' }}</td>
<td> <td>
{{ $unit->phone }} {{ $unit->phone }}
</td> </td>
......
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