Release 28.10.2019

(
   - Disabled Auto LogIn before Register
)

resources/views/pages/parcels/order_create.blade.php

@@ -449,7 +449,7 @@
                             <div class="col-xs-12 col-sm-6">
                                 <div class="form-group">
                                     <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"
                                            data-constraints="@Required" placeholder="Имя" required>
                                 </div>
@@ -457,7 +457,7 @@
                             <div class="col-xs-12 col-sm-6">
                                 <div class="form-group">
                                     <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"
                                            name="secondname"
                                            data-constraints="@Required" placeholder="Фамилия" required>
@@ -618,9 +618,9 @@
                                             style="color: #ff0912">*</span></label>
                                     <select class="form-control" id="involve-form-country1" id="country" name="country"
                                             data-placeholder="Select Your Country" required>
-                                        @foreach(\App\Models\Country::all() as $value)
-                                            <option value="{{ $value->id }}">{{ $value->title_ru }}</option>
-                                        @endforeach
+{{--                                        @foreach(\App\Models\Country::all() as $value)--}}
+                                            <option value="5">Узбекистан</option>
+{{--                                        @endforeach--}}
                                     </select>
                                 </div>
                             </div>
@@ -633,7 +633,7 @@
                                         style="color: #ff0912">*</span></label>
                                 <select class="form-control" id="involve-form-country1" name="city"
                                         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>
                                     @endforeach
                                 </select>
@@ -877,8 +877,8 @@
                                     "                                               name=\"to_address_id\" value=\"" + value.id + "\"\n" +
                                     "                                               id=\"to_address_id" + value.id + "\">\n" +
                                     "                                        <label class=\"custom-control-label\"\n" +
-                                    "                                               for=\"to_address_id" + value.id + "\">" + value.country_name + ", " + value.city_name + ", " + value.street + ", " + value.house + ", "
-                                    + value.apartment + ", " + value.zip + " | " + value.firstname + "  " + value.secondname + "</label>\n" +
+                                    "                                               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" +
                                     "                                    </div></div>"
                             });
                             $('#recAddresses').empty();
@@ -911,8 +911,8 @@
                         "                                               name=\"to_address_id\" value=\"" + value.id + "\"\n" +
                         "                                               id=\"to_address_id" + value.id + "\" "+ isDisabledRadio +">\n" +
                         "                                        <label class=\"custom-control-label\"\n" +
-                        "                                               for=\"to_address_id" + value.id + "\">" + 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" +
+                        "                                               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" +
                         "                                    </div></div>"
                 });
                 $('#recAddresses').empty();

resources/views/pages/parcels/payment.blade.php

@@ -121,13 +121,13 @@
                         <hr>
                         <p>Получатель: <kbd>{{ $order->recipient }}</kbd> | Паспортные данные:
                             <kbd>{{ $order->recipient_passport }}</kbd></p>
-                        <p>Адрес получателя: <kbd>{{ $order->recipient_address }}</kbd></p>
+{{--                        <p>Адрес получателя: <kbd>{{ $order->recipient_address }}</kbd></p>--}}
 
                     </div>
                     <br/><br/>
                     <input type="button" name="next" style="float: right; width: 35%"
                            class="next action-button btn btn-primary btn-lg btn-block mt-4"
-                           value="Next"/>
+                               value="Следующий"/>
                 </fieldset>
                 <fieldset style="padding: 5% 15% 5% 15% !important;">
 

resources/views/pages/profile/addresses.blade.php

@@ -33,7 +33,7 @@
                                 <td>{{ $unit->getFIO() }}</td>
                                 <td>{{ $unit->getFormatedPassport() }}
                                 </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>
                                     {{ $unit->phone }}
                                 </td>