Release 28.10.2019

(
   - Disabled Auto LogIn before Register
)

app/Http/Controllers/OrderController.php

@@ -14,6 +14,7 @@ use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Session;
 use PayPalCheckoutSdk\Orders\OrdersGetRequest;
 use Sample\GetOrder;
 use Sample\PayPalClient;
@@ -313,7 +314,6 @@ class OrderController extends Controller
             'summa' => ($request->get('weight') * 8.5) + $serSum,
             'weight' => $request->get('weight'),
             'total' => $price,
-//            'track_number' => '98' . $this->generateUniqNumber(4),
             'is_site' => $request->get('is_site'),
             'is_payment_uzb' => 0,
             'from_address' => $request->get('from_address'),
@@ -369,6 +369,8 @@ class OrderController extends Controller
             'added_date' => Carbon::now()
         ]);
 
+        Session::flash('success', 'Новый заказ успешно добавлен');
+
         return redirect(route('package'));
     }
 
@@ -401,6 +403,7 @@ class OrderController extends Controller
             '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 city WHERE id=address_info.city) as city_name'),
+            DB::raw('(SELECT sum(total) FROM orders WHERE to_address_id=address_info.id) as r_limit'),
         ])->where([
             ['user_id', '=', Auth::id()],
             ['type', '=', 'recipient'],

app/Http/Controllers/ProfileController.php

@@ -263,6 +263,7 @@ class ProfileController extends Controller
             'id', 'user_id', 'scan_id', 'firstname', 'secondname', 'fathername', 'phone', 'country',
             'city', 'street', 'house', 'apartment', 'zip', 'is_default', 'created', 'zip', 'passport', 'passport_by', 'passport_issue', 'type',
             DB::raw('(select title_ru from country where id=address_info.country) as country_name'),
+            DB::raw('(SELECT sum(total) FROM orders WHERE to_address_id=address_info.id) as r_limit'),
             DB::raw('(select title_ru from city where id=address_info.city) as city_name')
         ])->where('user_id', '=', Auth::user()->id)->get();
         return view('pages.profile.addresses', compact('units'));

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

@@ -82,13 +82,13 @@
                                     <td class="text-center">{{ $package->track_number }}</td>
                                     <td class="d-flex justify-content-between align-items-center">
                                         <span class="badge badge-primary badge-pill">{{ $package->amount }}</span>
-                                        <a href="/declaration/{{ $package->id }}" target="_blank">Декларация</a>
+                                        <a href="/declaration/{{ $package->id }}">Декларация</a>
                                     </td>
                                     <td class="text-center">${{ $package->total }}</td>
                                     <td class="text-center">{{ $package->weight }} кг</td>
                                     <td class="text-center">$ {{ $package->summa }}</td>
                                     <td class="text-center"><a
-                                            href="{{ ($package->is_site == 1)?'/get-fedex-label/'.$package->id:'#' }}" {{ ($package->is_site == 1)?'target="_blank"':'' }}>{{ ($package->is_site == 1)?'Распечатать':'No label' }}</a>
+                                            href="{{ ($package->is_site == 1)?'/get-fedex-label/'.$package->id:'#' }}">{{ ($package->is_site == 1)?'Распечатать':'No label' }}</a>
                                     </td>
                                     <td class="text-center"><a
                                             href="{{ ($package->payment_info == 3)?'/packages/payment/'.$package->id:'#' }}">{{ ($package->payment_info == 3)?'Оплатить онлайн':'Pay offline' }}</a>

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

@@ -249,9 +249,9 @@
                     </div>
 
                     <br/><br/>
-                    <input type="button" name="next"
+                    <input type="button" name="next" id="firstStepNestBtn"
                            class="next action-button btn btn-primary btn-lg btn-block mt-4"
-                           value="Next"/>
+                           value="Следующий"/>
                     <br>
                     <hr>
                     <div class="mb-3">
@@ -904,14 +904,16 @@
 
                     // console.log(key);
                     // console.log(value.id);
+                    var RLimit = ((1000 - value.r_limit) <= 0)?'style="color: #ff002b"':'';
+                    var isDisabledRadio = ((1000 - value.r_limit) <= 0)?'disabled':'';
                     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" +
                         "                                        <input type=\"radio\" class=\"custom-control-input\"\n" +
                         "                                               name=\"to_address_id\" value=\"" + value.id + "\"\n" +
-                        "                                               id=\"to_address_id" + 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 + "</label>\n" +
+                        + value.apartment + ", " + value.zip + " | " + value.firstname + "  " + value.secondname + " | <span "+ RLimit +">Лимит на этот адрес: $" + (1000 - value.r_limit) + "</span></label>\n" +
                         "                                    </div></div>"
                 });
                 $('#recAddresses').empty();
@@ -942,10 +944,12 @@
             if (total_sum > 1000) {
                 $('#total_price').empty()
                 $('#total_price').append('<span style="color: #ff0912; font-size: 14px">* Итоговая сумма не должна привышать $1000 на одну посылку</span>');
+                $('#firstStepNestBtn').attr("disabled", true);
             } else {
                 $('#total_price').empty()
                 $('#total_price').append('<b>Итоговая сумма в декларации:</b> <strong><span class="text-success"\n' +
                     '                                                                              id="total_price">$' + total_sum + '</span></strong>');
+                $('#firstStepNestBtn').removeAttr("disabled");
             }
         }
 

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 }}</td>
+                                <td>{{ $unit->street . ', ' . $unit->house . ', ' . $unit->apartment . ', ' . $unit->city_name . ', ' . $unit->country_name }} {{ ($unit->type == 'recipient')?'r_limit':'Отправитель' }}</td>
                                 <td>
                                     {{ $unit->phone }}
                                 </td>
@@ -41,8 +41,6 @@
                                     {{ ($unit->type == 'recipient')?'Получатель':'Отправитель' }}
                                 </td>
                                 <td>
-                                    <a href="/profile/address/edit/{{$unit->id}}" class="btn btn-warning btn-sm mb-1">
-                                        Редактировать</a>
                                     <form action="{{ route('address.destroy', $unit->id) }}" method="POST">
                                         @csrf
                                         @method('DELETE')