Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml
#	resources/views/main.blade.php

.gitignore

@@ -4,6 +4,7 @@
 /public/storage
 /storage/*.key
 /vendor
+.idea
 .env
 .phpunit.result.cache
 Homestead.json

.idea/fazoshop.iml

@@ -27,7 +27,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/jakub-onderka/php-console-color" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/jakub-onderka/php-console-highlighter" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/jeremy-dunn/php-fedex-api-wrapper" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/kylekatarnls/update-helper" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/laravel/framework" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/laravel/socialite" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/laravel/tinker" />

app/Http/Controllers/Controller.php

@@ -16,4 +16,5 @@ class Controller extends BaseController
     {
         return (int)substr(number_format(time() * rand(), 0, '', ''), 0, $digit);
     }
+
 }

app/Http/Controllers/DeliverySytemsController.php

+<?php
+
+
+namespace App\Http\Controllers;
+
+use App\Models\Orders;
+use FedEx\ShipService\ComplexType\Address;
+use FedEx\ShipService\ComplexType\ClientDetail;
+use FedEx\ShipService\ComplexType\Contact;
+use FedEx\ShipService\ComplexType\Dimensions;
+use FedEx\ShipService\ComplexType\LabelSpecification;
+use FedEx\ShipService\ComplexType\Party;
+use FedEx\ShipService\ComplexType\Payment;
+use FedEx\ShipService\ComplexType\Payor;
+use FedEx\ShipService\ComplexType\ProcessShipmentRequest;
+use FedEx\ShipService\ComplexType\RequestedPackageLineItem;
+use FedEx\ShipService\ComplexType\RequestedShipment;
+use FedEx\ShipService\ComplexType\VersionId;
+use FedEx\ShipService\ComplexType\WebAuthenticationCredential;
+use FedEx\ShipService\ComplexType\WebAuthenticationDetail;
+use FedEx\ShipService\ComplexType\Weight;
+use FedEx\ShipService\Request;
+use FedEx\ShipService\SimpleType\DropoffType;
+use FedEx\ShipService\SimpleType\LabelFormatType;
+use FedEx\ShipService\SimpleType\LabelStockType;
+use FedEx\ShipService\SimpleType\LinearUnits;
+use FedEx\ShipService\SimpleType\PackagingType;
+use FedEx\ShipService\SimpleType\PaymentType;
+use FedEx\ShipService\SimpleType\RateRequestType;
+use FedEx\ShipService\SimpleType\ServiceType;
+use FedEx\ShipService\SimpleType\ShippingDocumentImageType;
+use FedEx\ShipService\SimpleType\WeightUnits;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Response;
+
+class DeliverySytemsController extends Controller
+{
+    public $successStatus = 200;
+
+
+    public function getFedexData($id)
+    {
+
+
+//        $orderId = $data['order_id'];97 Quentin Rd, 1st floor, Brooklyn, NY 11223
+
+        $order = Orders::find($id);
+        $sender = \App\Models\Address::select([
+            'id',
+            'user_id',
+            'scan_id',
+            'firstname',
+            'secondname',
+            'fathername',
+            'phone',
+            'street',
+            'house',
+            'passport',
+            'passport_by',
+            'passport_issue',
+            'apartment',
+            'zip',
+            'is_default',
+            'type',
+            'created',
+            DB::raw('(select title_uz from country where id = address_info.country) as country'),
+            DB::raw('(SELECT (sum(orders.amount)-1000)*(-1) FROM orders where orders.to_address_id=address_info.id) as r_limit'),
+            DB::raw('(select title_uz from city where id = address_info.city) as city')
+        ])->where([
+            ['id', '=', $order->from_address]
+        ])->get();
+
+
+        if ($order == null) {
+            return response()->json(['warning' => 'Order not found'], 200);
+        } elseif ($order['label_url'] == null) {
+            $street = $sender[0]->street; //'test str';
+            $city = $sender[0]->city_name; // 'Unit C1 Brooklyn';
+            $stateOrProvinceCode = $sender[0]->city_name; // 'NY';
+            $postalCode = $sender[0]->zip; // '11229';
+            $countryCode = 'US'; //'US';
+            $weight = ($order['weight'] > 0) ? $order['weight'] : 1; // 10;
+
+
+            $userCredential = new WebAuthenticationCredential();
+            $userCredential
+                ->setKey('dXw7hhDl5lS6mwqs')
+                ->setPassword('DDOWpwxnnmPsUxWNSM8gXLIdD');
+            $webAuthenticationDetail = new WebAuthenticationDetail();
+            $webAuthenticationDetail->setUserCredential($userCredential);
+            $clientDetail = new ClientDetail();
+            $clientDetail
+                ->setAccountNumber('510087100')
+                ->setMeterNumber('119157536');
+            $version = new VersionId();
+            $version
+                ->setMajor(23)
+                ->setIntermediate(0)
+                ->setMinor(0)
+                ->setServiceId('ship');
+            $shipperAddress = new Address();
+            $shipperAddress
+                ->setStreetLines([$street])
+                ->setCity($city)
+                ->setStateOrProvinceCode($stateOrProvinceCode)
+                ->setPostalCode($postalCode)
+                ->setCountryCode($countryCode);
+            $shipperContact = new Contact();
+            $shipperContact
+//            ->setCompanyName('TuronExpresss')
+//                ->setEMailAddress('test@example.com')
+                ->setPersonName($sender[0]->firstname.' '.$sender[0]->secondname.' '.$sender[0]->fathername)
+                ->setPhoneNumber(($sender[0]->phone));
+            $shipper = new Party();
+            $shipper
+                ->setAccountNumber('510087100')
+                ->setAddress($shipperAddress)
+                ->setContact($shipperContact);
+            $recipientAddress = new Address();
+            $recipientAddress
+                ->setStreetLines(['97 Quentin Rd, 1st floor'])
+                ->setCity('Brooklyn')
+                ->setStateOrProvinceCode('NY')
+                ->setPostalCode('11229')
+                ->setCountryCode('US');
+            $recipientContact = new Contact();
+            $recipientContact
+                ->setCompanyName('Fazo Cargo')
+                ->setPersonName('Test FullName')
+                ->setPhoneNumber('+1 347 547 9797');
+            $recipient = new Party();
+            $recipient
+                ->setAddress($recipientAddress)
+                ->setContact($recipientContact);
+            $labelSpecification = new LabelSpecification();
+            $labelSpecification
+                ->setLabelStockType(new LabelStockType(LabelStockType::_PAPER_7X4POINT75))
+                ->setImageType(new ShippingDocumentImageType(ShippingDocumentImageType::_PDF))
+                ->setLabelFormatType(new LabelFormatType(LabelFormatType::_COMMON2D));
+            $packageLineItem1 = new RequestedPackageLineItem();
+            $packageLineItem1
+                ->setSequenceNumber(1)
+                ->setItemDescription('Product description')
+                ->setDimensions(new Dimensions(array(
+                    'Width' => 10,
+                    'Height' => 1,
+                    'Length' => 1,
+                    'Units' => LinearUnits::_CM
+                )))
+                ->setWeight(new Weight(array(
+                    'Value' => $weight,
+                    'Units' => WeightUnits::_KG
+                )));
+            $shippingChargesPayor = new Payor();
+            $shippingChargesPayor->setResponsibleParty($shipper);
+            $shippingChargesPayment = new Payment();
+            $shippingChargesPayment
+                ->setPaymentType(PaymentType::_SENDER)
+                ->setPayor($shippingChargesPayor);
+            $requestedShipment = new RequestedShipment();
+            $requestedShipment->setShipTimestamp(date('c'));
+            $requestedShipment->setDropoffType(new DropoffType(DropoffType::_REGULAR_PICKUP));
+            $requestedShipment->setServiceType(new ServiceType(ServiceType::_FEDEX_GROUND));
+            $requestedShipment->setPackagingType(new PackagingType(PackagingType::_YOUR_PACKAGING));
+            $requestedShipment->setShipper($shipper);
+            $requestedShipment->setRecipient($recipient);
+            $requestedShipment->setLabelSpecification($labelSpecification);
+            $requestedShipment->setRateRequestTypes(array(new RateRequestType(RateRequestType::_PREFERRED)));
+            $requestedShipment->setPackageCount(1);
+            $requestedShipment->setRequestedPackageLineItems([
+                $packageLineItem1
+            ]);
+            $requestedShipment->setShippingChargesPayment($shippingChargesPayment);
+            $processShipmentRequest = new ProcessShipmentRequest();
+            $processShipmentRequest->setWebAuthenticationDetail($webAuthenticationDetail);
+            $processShipmentRequest->setClientDetail($clientDetail);
+            $processShipmentRequest->setVersion($version);
+            $processShipmentRequest->setRequestedShipment($requestedShipment);
+            $shipService = new Request();
+            $result = $shipService->getProcessShipmentReply($processShipmentRequest);
+
+            if ($result->HighestSeverity == 'ERROR') {
+//                dd($result->Notifications[0]->Message);
+                return response()->json([
+                    'error' => $result->Notifications[0]->Message,
+                    'code' => $result->Notifications[0]->Code
+                ], 200);
+            }
+            if ($result->HighestSeverity == 'WARNING') {
+//                dd($result->Notifications[0]->Message);
+                return response()->json([
+                    'warning' => $result->Notifications[0]->Message,
+                    'code' => $result->Notifications[0]->Code
+                ], 200);
+            }
+            if ($result->HighestSeverity == 'SUCCESS') {
+//                $file = file_get_contents($result->CompletedShipmentDetail->CompletedPackageDetails[0]->Label->Parts[0]->Image);
+                $path = 'uploads';
+                $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;
+                $order->save();
+//                dd($order);
+                return Response::download($order['label_url']);
+
+            }
+        } else {
+            return Response::download($order['label_url']);
+        }
+
+    }
+
+}

app/Http/Controllers/OrderController.php

@@ -222,8 +222,8 @@ class OrderController extends Controller
             'summa' => ($request->get('weight') * 8) + $serSum,
             'weight' => $request->get('weight'),
             'total' => $price,
-            'track_number' => $this->generateUniqNumber(12),
-            'is_site' => 0,
+            'track_number' => '98'.$this->generateUniqNumber(4),
+            'is_site' => $request->get('is_site'),
             'is_payment_uzb' => 0,
             'from_address' => $request->get('from_address'),
             'to_address_id' => $request->get('to_address_id'),
@@ -260,4 +260,41 @@ class OrderController extends Controller
         return redirect(route('package'));
     }
 
+    public function getAddressAjaxS()
+    {
+        $senderAddresses = Address::select([
+            'id',
+            'user_id',
+            'country',
+            'firstname', 'secondname',
+            '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'),
+        ])->where([
+            ['user_id', '=', Auth::id()],
+            ['type', '=', 'sender'],
+        ])->get();
+//        $senderAddresses->where('user_id', '=', $id)->get();
+
+        return json_decode($senderAddresses);
+    }
+
+    public function getAddressAjaxR()
+    {
+        $recAddresses = Address::select([
+            'id',
+            'user_id',
+            'country',
+            'firstname', 'secondname',
+            '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'),
+        ])->where([
+            ['user_id', '=', Auth::id()],
+            ['type', '=', 'recipient'],
+        ])->get();
+
+        return json_decode($recAddresses);
+    }
+
 }

app/Http/Controllers/Postman/DeclarationController.php

@@ -8,12 +8,16 @@
 
 namespace App\Http\Controllers\Postman;
 
+
 use App\Http\Controllers\Controller;
 use App\Models\Activity;
+use App\Models\Address;
+use App\Models\Client;
 use App\Models\Orders;
 use App\Models\Package;
 use App\Models\PackageItems;
 use App\Models\Product;
+use Illuminate\Support\Facades\DB;
 use PDF;
 
 class DeclarationController extends Controller
@@ -37,29 +41,101 @@ class DeclarationController extends Controller
      */
     public function generatePDF($package_id)
     {
-        $package = Orders::find($package_id);
-        $package_items = Product::where('order_id', $package->id)->get();
-        $declaration = [];
+        $orderId = $package_id;
 
-        foreach ($package_items as $item) {
-            $itemClass = new \stdClass();
-            $itemClass->package_id = $package->id;
-            $itemClass->name = $item->title;
-            $itemClass->amount = $item->amount;
-            $itemClass->price = $item->price;
-            $itemClass->weight = $item->weight;
 
-            $declaration[] = $itemClass;
-        }
+        $orderData = Orders::select([
+            'id',
+            'name',
+            'client_id',
+            'added',
+            'track_number',
+            'from_address',
+            'to_address_id',
+            'edited',
+            DB::raw('(SELECT concat(firstname,\' \', secondname) FROM address_info where address_info.id=orders.to_address_id) as r_name'),
+            DB::raw('(SELECT name_uz FROM payment_statuses where payment_statuses.id=(select payment_statuses_id from payment where payment.order_id=orders.id)) as payment_status'),
+            'amount',
+            'weight',
+            'summa',
+        ])->where('id', '=', $orderId)->get();
+
+        $clientData = Client::find($orderData[0]->client_id);
+        $recipient = Address::select([
+            'id',
+            'user_id',
+            'scan_id',
+            'firstname',
+            'secondname',
+            'fathername',
+            'phone',
+            'street',
+            'house',
+            'passport',
+            'passport_by',
+            'passport_issue',
+            'apartment',
+            'zip',
+            'is_default',
+            'type',
+            'created',
+            DB::raw('(select title_uz from country where id = address_info.country) as country'),
+            DB::raw('(SELECT (sum(orders.amount)-1000)*(-1) FROM orders where orders.to_address_id=address_info.id) as r_limit'),
+            DB::raw('(select title_uz from city where id = address_info.city) as city')
+        ])->where([
+            ['id', '=', $orderData[0]->to_address_id]
+        ])->get();
+        $sender = Address::select([
+            'id',
+            'user_id',
+            'scan_id',
+            'firstname',
+            'secondname',
+            'fathername',
+            'phone',
+            'street',
+            'house',
+            'passport',
+            'passport_by',
+            'passport_issue',
+            'apartment',
+            'zip',
+            'is_default',
+            'type',
+            'created',
+            DB::raw('(select title_uz from country where id = address_info.country) as country'),
+            DB::raw('(SELECT (sum(orders.amount)-1000)*(-1) FROM orders where orders.to_address_id=address_info.id) as r_limit'),
+            DB::raw('(select title_uz from city where id = address_info.city) as city')
+        ])->where([
+            ['id', '=', $orderData[0]->from_address]
+        ])->get();
 
-        $pdf = PDF::loadView('templates.declaration', [
+        $products = Product::select([
+            'id',
+            'operator_id',
+            'title',
+            'amount',
+            'weight',
+            'price',
+            'order_id',
+        ])->where('order_id', '=', $orderData[0]->id)->get();
+
+        $pdf = \Barryvdh\DomPDF\Facade::loadView('templates.declaration', [
             'title' => 'Declaration #',
-            'package' => $package,
-            'declaration' => $declaration,
-        ]);
+            'client' => $clientData,
+            'order' => $orderData[0],
+            'recipient' => $recipient[0],
+            'sender' => $sender[0],
+            'product' => $products
+        ])->setPaper('a4');
+
+        $path = 'uploads/declarations/';
         $filename = md5(time()) . date('Ymdhis') . '.pdf';
-        Activity::appendLog("Сгенерирована декларация в PDF формате.", Activity::NOTICE);
-        return $pdf->download($filename);
+        $pdf->save($path . $filename);
+//        Activity::appendLog("Сгенерирована декларация в PDF формате.", Activity::NOTICE);
+        return redirect(url($path . $filename));
+//        return response()->json(['url' => url($path.$filename).''], 200);
+//        return $pdf->download('declaration.pdf');
     }
 
     /**

composer.lock

 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
     "content-hash": "31b801600acd96ae69916e04307a1296",
@@ -164,28 +164,30 @@
         },
         {
             "name": "doctrine/lexer",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
+                "reference": "e17f069ede36f7534b95adec71910ed1b49c74ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
-                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/e17f069ede36f7534b95adec71910ed1b49c74ea",
+                "reference": "e17f069ede36f7534b95adec71910ed1b49c74ea",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2"
+                "php": "^7.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.5"
+                "doctrine/coding-standard": "^6.0",
+                "phpstan/phpstan": "^0.11.8",
+                "phpunit/phpunit": "^8.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -198,14 +200,14 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
                 {
                     "name": "Guilherme Blanco",
                     "email": "guilhermeblanco@gmail.com"
                 },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
                 {
                     "name": "Johannes Schmitt",
                     "email": "schmittjoh@gmail.com"
@@ -220,7 +222,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2019-06-08T11:03:04+00:00"
+            "time": "2019-07-30T19:33:28+00:00"
         },
         {
             "name": "dompdf/dompdf",
@@ -897,51 +899,6 @@
             ],
             "time": "2018-12-27T15:44:58+00:00"
         },
-        {
-            "name": "kylekatarnls/update-helper",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/kylekatarnls/update-helper.git",
-                "reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/5786fa188e0361b9adf9e8199d7280d1b2db165e",
-                "reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.1.0 || ^2.0.0",
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "codeclimate/php-test-reporter": "dev-master",
-                "composer/composer": "2.0.x-dev || ^2.0.0-dev",
-                "phpunit/phpunit": ">=4.8.35 <6.0"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "class": "UpdateHelper\\ComposerPlugin"
-            },
-            "autoload": {
-                "psr-0": {
-                    "UpdateHelper\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Kyle",
-                    "email": "kylekatarnls@gmail.com"
-                }
-            ],
-            "description": "Update helper",
-            "time": "2019-07-29T11:03:54+00:00"
-        },
         {
             "name": "laravel/framework",
             "version": "v5.8.35",
@@ -1511,34 +1468,36 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "1.39.1",
+            "version": "2.25.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "4be0c005164249208ce1b5ca633cd57bdd42ff33"
+                "reference": "d07636581795383e2fea2d711212d30f941f2039"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4be0c005164249208ce1b5ca633cd57bdd42ff33",
-                "reference": "4be0c005164249208ce1b5ca633cd57bdd42ff33",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d07636581795383e2fea2d711212d30f941f2039",
+                "reference": "d07636581795383e2fea2d711212d30f941f2039",
                 "shasum": ""
             },
             "require": {
-                "kylekatarnls/update-helper": "^1.1",
-                "php": ">=5.3.9",
-                "symfony/translation": "~2.6 || ~3.0 || ~4.0"
+                "ext-json": "*",
+                "php": "^7.1.8 || ^8.0",
+                "symfony/translation": "^3.4 || ^4.0"
             },
             "require-dev": {
-                "composer/composer": "^1.2",
-                "friendsofphp/php-cs-fixer": "~2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7"
+                "friendsofphp/php-cs-fixer": "^2.14 || ^3.0",
+                "kylekatarnls/multi-tester": "^1.1",
+                "phpmd/phpmd": "dev-php-7.1-compatibility",
+                "phpstan/phpstan": "^0.11",
+                "phpunit/phpunit": "^7.5 || ^8.0",
+                "squizlabs/php_codesniffer": "^3.4"
             },
             "bin": [
-                "bin/upgrade-carbon"
+                "bin/carbon"
             ],
             "type": "library",
             "extra": {
-                "update-helper": "Carbon\\Upgrade",
                 "laravel": {
                     "providers": [
                         "Carbon\\Laravel\\ServiceProvider"
@@ -1547,7 +1506,7 @@
             },
             "autoload": {
                 "psr-4": {
-                    "": "src/"
+                    "Carbon\\": "src/Carbon/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1559,16 +1518,20 @@
                     "name": "Brian Nesbitt",
                     "email": "brian@nesbot.com",
                     "homepage": "http://nesbot.com"
+                },
+                {
+                    "name": "kylekatarnls",
+                    "homepage": "http://github.com/kylekatarnls"
                 }
             ],
-            "description": "A simple API extension for DateTime.",
+            "description": "An API extension for DateTime that supports 281 different languages.",
             "homepage": "http://carbon.nesbot.com",
             "keywords": [
                 "date",
                 "datetime",
                 "time"
             ],
-            "time": "2019-10-14T05:51:36+00:00"
+            "time": "2019-10-20T11:05:44+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -1623,16 +1586,16 @@
         },
         {
             "name": "opis/closure",
-            "version": "3.4.0",
+            "version": "3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opis/closure.git",
-                "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7"
+                "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opis/closure/zipball/60a97fff133b1669a5b1776aa8ab06db3f3962b7",
-                "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7",
+                "url": "https://api.github.com/repos/opis/closure/zipball/e79f851749c3caa836d7ccc01ede5828feb762c7",
+                "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7",
                 "shasum": ""
             },
             "require": {
@@ -1680,7 +1643,7 @@
                 "serialization",
                 "serialize"
             ],
-            "time": "2019-09-02T21:07:33+00:00"
+            "time": "2019-10-19T18:38:51+00:00"
         },
         {
             "name": "paragonie/random_compat",

public/assets/slider/js/app.js

@@ -54,7 +54,7 @@
         pager: false,
         minSlides: 1,
         maxSlides: 5,
-        moveSlides: 2,
+        moveSlides: 5,
         slideWidth: 210,
         slideMargin: 25,
         prevSelector: $('#client-prev'),
@@ -69,7 +69,7 @@
     // Bind to scroll
     $(window).scroll(function () {
 
-        //Display or hide scroll to top button 
+        //Display or hide scroll to top button
         if ($(this).scrollTop() > 100) {
             $('.scrollup').fadeIn();
         } else {
@@ -295,8 +295,8 @@ $("#send-mail").click(function () {
     /************************
     Animate elements
     *************************/
-    
-    //Animate thumbnails 
+
+    //Animate thumbnails
     jQuery('.thumbnail').one('inview', function (event, visible) {
         if (visible == true) {
             jQuery(this).addClass("animated fadeInDown");
@@ -313,7 +313,7 @@ $("#send-mail").click(function () {
             jQuery(this).removeClass("animated fadeInDown");
         }
     });
-    
+
     //animate first team member
     jQuery('#first-person').bind('inview', function (event, visible) {
         if (visible == true) {
@@ -322,7 +322,7 @@ $("#send-mail").click(function () {
             jQuery('#first-person').removeClass("animated pulse");
         }
     });
-    
+
     //animate sectond team member
     jQuery('#second-person').bind('inview', function (event, visible) {
         if (visible == true) {
@@ -340,7 +340,7 @@ $("#send-mail").click(function () {
             jQuery('#third-person').removeClass("animated pulse");
         }
     });
-    
+
     //Animate price columns
     jQuery('.price-column, .testimonial').bind('inview', function (event, visible) {
         if (visible == true) {
@@ -349,7 +349,7 @@ $("#send-mail").click(function () {
             jQuery(this).removeClass("animated fadeInDown");
         }
     });
-    
+
     //Animate contact form
     jQuery('.contact-form').bind('inview', function (event, visible) {
         if (visible == true) {

resources/views/auth/login.blade.php

@@ -71,6 +71,12 @@
     </div>
 </section>
 
+<script>
+    $('div span img').css('margin-top: 20px;\n' +
+        '    border-radius: 5px;\n' +
+        '    box-shadow: 0px 0px 2px 1px;');
+</script>
+
 
 
 @endsection

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

@@ -67,6 +67,7 @@
                                 <th>Стоимость товаров</th>
                                 <th>Вес</th>
                                 <th>Стоимость доставки</th>
+                                <th>FedEx</th>
                             </tr>
                             </thead>
                             <tbody>
@@ -84,6 +85,7 @@
                                     <td class="text-center">${{ $package->price }}</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:'#' }}" target="_blank">{{ ($package->is_site == 1)?'Распечатать':'No label' }}</a></td>
                                 </tr>
                             @endforeach
                             </tbody>

resources/views/templates/declaration.blade.php

@@ -36,6 +36,7 @@
 
     <div class="">
         <img width="100" height="100" src="{{ asset('android-chrome-192x192.png') }}">
+        <h1>FAZO CARGO INC.     Tel.:(347) 547-9797</h1>
     </div>
     <hr />
     <table border="0"  style="width: 100%">
@@ -43,7 +44,7 @@
             <td><span>ПОЧТОВАЯ АДМИНИСТРАЦИЯ</span></td>
             <td style="width: 70px"><span ><input type="checkbox" style="margin-right: 17px;margin-left: 10px;"> USA</span></td>
             <td style="width: 50px;"><input type="checkbox" style="margin-left: 10px;"> </td>
-            <td><span>ТАМОЖЕННАЯ ДЕКЛАРАЦИЯ CN 23</span></td>
+            <td><span>ТАМОЖЕННАЯ ДЕКЛАРАЦИЯ <b>CN 23<</b></span></td>
         </tr>
         <tr >
             <td><span>ADMINISTRATION</span></td>
@@ -57,13 +58,13 @@
     <br />
     <table class="caption" style="width: 100%;">
         <tr>
-            <td rowspan="4" class="border-right border-bottom gray-colored" style="width: 20px">FROM TO</td>
+            <td rowspan="4" class="border-right border-bottom gray-colored" style="width: 20px">FROM</td>
             <td class="border-right gray-colored" style="width: 180px;">
                 Name and address of Sender <br />
                 Фамилия и адрес Отправителя
             </td>
             <td class="border-right">
-                Tel. 3023518293
+                Tel. {{ $sender->phone }}
             </td>
             <td class="border-right" style="width: 70px;">AGENT CODE:</td>
             <td class="border-right" style="width: 123px"> - </td>

resources/views/video.blade.php

+<!DOCTYPE html>
+<html>
+<head>
+    <title>Fazoshop | Доставка любого вида груза из США во все регионы Узбекистана.</title>
+    <meta name="format-detection" content="telephone=no">
+    <meta name="viewport"
+          content="width=device-width, height=device-height, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <meta charset="utf-8">
+</head>
+<body>
+
+<video width="400" controls>
+    <source src="{{ asset('video') }}/fazo.mp4" type="video/mp4">
+{{--    <source src="mov_bbb.ogg" type="video/ogg">--}}
+    Your browser does not support HTML5 video.
+</video>
+
+</body>
+</html>

resources/views/welcome.blade.php

 <!doctype html>
 <html lang="{{ app()->getLocale() }}">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <title>Laravel</title>
+    <title>Laravel</title>
 
-        <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
+    <!-- Fonts -->
+    <link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
 
-        <!-- Styles -->
-        <style>
-            html, body {
-                background-color: #fff;
-                color: #636b6f;
-                font-family: 'Raleway', sans-serif;
-                font-weight: 100;
-                height: 100vh;
-                margin: 0;
-            }
+    <!-- Styles -->
+    <style>
+        html, body {
+            background-color: #fff;
+            color: #636b6f;
+            font-family: 'Raleway', sans-serif;
+            font-weight: 100;
+            height: 100vh;
+            margin: 0;
+        }
 
-            .full-height {
-                height: 100vh;
-            }
+        .full-height {
+            height: 100vh;
+        }
 
-            .flex-center {
-                align-items: center;
-                display: flex;
-                justify-content: center;
-            }
+        .flex-center {
+            align-items: center;
+            display: flex;
+            justify-content: center;
+        }
 
-            .position-ref {
-                position: relative;
-            }
+        .position-ref {
+            position: relative;
+        }
 
-            .top-right {
-                position: absolute;
-                right: 10px;
-                top: 18px;
-            }
+        .top-right {
+            position: absolute;
+            right: 10px;
+            top: 18px;
+        }
 
-            .content {
-                text-align: center;
-            }
+        .content {
+            text-align: center;
+        }
 
-            .title {
-                font-size: 84px;
-            }
+        .title {
+            font-size: 84px;
+        }
 
-            .links > a {
-                color: #636b6f;
-                padding: 0 25px;
-                font-size: 12px;
-                font-weight: 600;
-                letter-spacing: .1rem;
-                text-decoration: none;
-                text-transform: uppercase;
-            }
+        .links > a {
+            color: #636b6f;
+            padding: 0 25px;
+            font-size: 12px;
+            font-weight: 600;
+            letter-spacing: .1rem;
+            text-decoration: none;
+            text-transform: uppercase;
+        }
 
-            .m-b-md {
-                margin-bottom: 30px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="flex-center position-ref full-height">
-            @if (Route::has('login'))
-                <div class="top-right links">
-                    @auth
-                        <a href="{{ url('/home') }}">Home</a>
-                    @else
-                        <a href="{{ route('login') }}">Login</a>
-                        <a href="{{ route('register') }}">Register</a>
-                    @endauth
-                </div>
-            @endif
+        .m-b-md {
+            margin-bottom: 30px;
+        }
+    </style>
+</head>
+<body>
 
-            <div class="content">
-                <div class="title m-b-md">
-                    Laravel
-                </div>
-
-                <div class="links">
-                    <a href="https://laravel.com/docs">Documentation</a>
-                    <a href="https://laracasts.com">Laracasts</a>
-                    <a href="https://laravel-news.com">News</a>
-                    <a href="https://forge.laravel.com">Forge</a>
-                    <a href="https://github.com/laravel/laravel">GitHub</a>
-                </div>
-            </div>
-        </div>
-    </body>
+<video width="100%" height="100%" controls autoplay>
+    <source src="{{ asset('video') }}/fazo.mp4" type="video/mp4">
+    {{--    <source src="mov_bbb.ogg" type="video/ogg">--}}
+    Your browser does not support HTML5 video.
+</video>
+</body>
 </html>

routes/web.php

@@ -14,6 +14,10 @@
 Route::get('/', function () {
     return view('main');
 });
+
+Route::get('/watch', function () {
+    return view('welcome');
+});
 //
 //Auth::routes();
 
@@ -67,6 +71,8 @@ Route::post('/feedback/add', 'FeedbackController@addGuest');
 Route::get('/packages', 'OrderController@index')->name('package')->middleware('auth');
 Route::get('/packages/create/{id}', 'OrderController@create')->name('package.create')->middleware('auth');
 Route::post('/packages/order-store', 'OrderController@orderStore')->name('package.store')->middleware('auth');
+Route::get('/packages/get-address-ajax-s', 'OrderController@getAddressAjaxS')->name('package.getAddressAjaxS')->middleware('auth');
+Route::get('/packages/get-address-ajax-r', 'OrderController@getAddressAjaxR')->name('package.getAddressAjaxR')->middleware('auth');
 Route::get('/declaration/{package_id}', 'Postman\DeclarationController@generatePDF')->where(['package_id' => '[0-9]+'])->middleware('auth');
 Route::get('/profile/address', 'ProfileController@address')->name('address')->middleware('auth');
 Route::get('/profile/addaddress', 'ProfileController@addaddress')->name('address.add')->middleware('auth');
@@ -74,6 +80,7 @@ Route::post('/profile/storeaddress', 'ProfileController@storeaddress')->name('ad
 Route::delete('/profile/{id}', 'ProfileController@address_delete')->name('address.destroy')->middleware('auth');
 Route::get('/profile', 'ProfileController@profile')->middleware('auth');
 Route::post('/profile/save', 'ProfileController@save')->name('profile.save')->middleware('auth');
+Route::get('/get-fedex-label/{id}', 'DeliverySytemsController@getFedexData')->middleware('auth');
 //
 //Route::get('/packages/list', 'PackagesController@pending_packages');
 //Route::get('/packages/pending', 'PackagesController@pending_packages')->name('packagePending');