Release 28.10.2019

(
   - Disabled Auto LogIn before Register
)

app/Http/Controllers/DeliverySytemsController.php

@@ -74,8 +74,8 @@ class DeliverySytemsController extends Controller
         if ($order == null) {
             return response()->json(['warning' => 'Order not found'], 200);
         } elseif ($order['label_url'] == null) {
-            $street = $sender[0]->street; //'97 Quentin Rd, 1st Floor';
-            $city = $sender[0]->city_name; // 'Brooklyn';
+            $street = $sender[0]->house; //'97 Quentin Rd, 1st Floor';
+            $city = $sender[0]->street; // 'Brooklyn';
             $stateOrProvinceCode = $sender[0]->city_name; // 'NY';
             $postalCode = $sender[0]->zip; // '11223';
             $countryCode = 'US'; //'US';
@@ -90,7 +90,7 @@ class DeliverySytemsController extends Controller
             $webAuthenticationDetail->setUserCredential($userCredential);
             $clientDetail = new ClientDetail();
             $clientDetail
-                ->setAccountNumber('896775413')
+                ->setAccountNumber('647927254')
                 ->setMeterNumber('250557652');
             $version = new VersionId();
             $version
@@ -100,13 +100,13 @@ class DeliverySytemsController extends Controller
                 ->setServiceId('ship');
             $shipperAddress = new Address();
             $shipperAddress
-                ->setStreetLines(['56 Christopher Columbus Dr'])
+                ->setStreetLines([$street])
 //                ->setStreetLines([$street])
-                ->setCity('Jersey City')
+                ->setCity($city)
 //                ->setCity($city)
                 ->setStateOrProvinceCode('NJ')
 //                ->setStateOrProvinceCode($stateOrProvinceCode)
-                ->setPostalCode('07302')
+                ->setPostalCode($postalCode)
                 ->setCountryCode('US');
             $shipperContact = new Contact();
             $shipperContact
@@ -116,7 +116,7 @@ class DeliverySytemsController extends Controller
                 ->setPhoneNumber(($sender[0]->phone));
             $shipper = new Party();
             $shipper
-                ->setAccountNumber('250557652')
+                ->setAccountNumber('647927254')
                 ->setAddress($shipperAddress)
                 ->setContact($shipperContact);
             $recipientAddress = new Address();
@@ -204,7 +204,7 @@ class DeliverySytemsController extends Controller
             if ($result->HighestSeverity == 'SUCCESS') {
 //                $file = file_get_contents($result->CompletedShipmentDetail->CompletedPackageDetails[0]->Label->Parts[0]->Image);
                 $path = 'uploads';
-                $path .= '/labels/';
+                $path .= '/labels';
                 $filename = md5(time()) . date('Ymdhis') . '.pdf';
                 file_put_contents(public_path($path . '/' . $filename), $result->CompletedShipmentDetail->CompletedPackageDetails[0]->Label->Parts[0]->Image);
                 $order->label_url = $path . '/' . $filename;

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

@@ -339,6 +339,7 @@
                     </div>
                     <br>
                     <input type="hidden" id="is_site" name="is_site" value="0">
+                    <input type="hidden" id="delivery_info_null" name="delivery_info" value="null">
                     <div id="pickUp">
                         <hr>
                         <h1>Выберите тип доставки</h1>
@@ -360,8 +361,8 @@
                                     <div class="form-group" style="display: none" id="pickupDate">
                                         <label class="form-label" for="forms-check-name1"  >Дата <span
                                                 style="color: #ff0912">*</span></label>
-                                        <input class="form-control" id="forms-check-name1" type="date" name="delivery_info0"
-                                               data-constraints="@Required" placeholder="Date" required>
+                                        <input class="form-control" id="forms-check-name1" type="date" name="delivery_info00"
+                                               data-constraints="@Required" placeholder="Date">
                                     </div>
                                     <div class="form-group" style="display: none; float: right" id="pickupTime">
                                         <label class="form-label" for="involve-form-country1">Пожалуйста, укажите время