Skip to content

F
fazo
Commit 5f11b416 authored by Shahzod's avatar Shahzod
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	.idea/workspace.xml
#	resources/views/main.blade.php
parents d1e089c7 97475a79
Hide whitespace changes
Inline Side-by-side
Showing with 1236 additions and 895 deletions
.gitignore
View file @ 5f11b416
......@@ -4,6 +4,7 @@
/public/storage
/storage/*.key
/vendor
.idea
.env
.phpunit.result.cache
Homestead.json
......
.idea/fazoshop.iml
View file @ 5f11b416
......@@ -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" />
......
.idea/php.xml
View file @ 5f11b416
......@@ -2,103 +2,102 @@
<project version="4">
<component name="PhpIncludePathManager">
<include_path>
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
<path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
<path value="$PROJECT_DIR$/vendor/jakub-onderka/php-console-color" />
<path value="$PROJECT_DIR$/vendor/jakub-onderka/php-console-highlighter" />
<path value="$PROJECT_DIR$/vendor/dragonmantank/cron-expression" />
<path value="$PROJECT_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
<path value="$PROJECT_DIR$/vendor/kylekatarnls/update-helper" />
<path value="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer" />
<path value="$PROJECT_DIR$/vendor/jeremy-dunn/php-fedex-api-wrapper" />
<path value="$PROJECT_DIR$/vendor/sabberworm/php-css-parser" />
<path value="$PROJECT_DIR$/vendor/nunomaduro/collision" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
<path value="$PROJECT_DIR$/vendor/fzaninotto/faker" />
<path value="$PROJECT_DIR$/vendor/beyondcode/laravel-dump-server" />
<path value="$PROJECT_DIR$/vendor/webmozart/assert" />
<path value="$PROJECT_DIR$/vendor/sebastian/version" />
<path value="$PROJECT_DIR$/vendor/sebastian/diff" />
<path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
<path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
<path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
<path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
<path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
<path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
<path value="$PROJECT_DIR$/vendor/sebastian/environment" />
<path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
<path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
<path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
<path value="$PROJECT_DIR$/vendor/phpoption/phpoption" />
<path value="$PROJECT_DIR$/vendor/paragonie/random_compat" />
<path value="$PROJECT_DIR$/vendor/fideloper/proxy" />
<path value="$PROJECT_DIR$/vendor/maximebf/debugbar" />
<path value="$PROJECT_DIR$/vendor/hamcrest/hamcrest-php" />
<path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
<path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
<path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-dompdf" />
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-debugbar" />
<path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
<path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
<path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
<path value="$PROJECT_DIR$/vendor/symfony/translation" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
<path value="$PROJECT_DIR$/vendor/dompdf/dompdf" />
<path value="$PROJECT_DIR$/vendor/erusev/parsedown" />
<path value="$PROJECT_DIR$/vendor/phenx/php-font-lib" />
<path value="$PROJECT_DIR$/vendor/phenx/php-svg-lib" />
<path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
<path value="$PROJECT_DIR$/vendor/ramsey/uuid" />
<path value="$PROJECT_DIR$/vendor/league/flysystem" />
<path value="$PROJECT_DIR$/vendor/league/oauth1-client" />
<path value="$PROJECT_DIR$/vendor/egulias/email-validator" />
<path value="$PROJECT_DIR$/vendor/laravel/framework" />
<path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" />
<path value="$PROJECT_DIR$/vendor/dnoegel/php-xdg-base-dir" />
<path value="$PROJECT_DIR$/vendor/mockery/mockery" />
<path value="$PROJECT_DIR$/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/laravel/socialite" />
<path value="$PROJECT_DIR$/vendor/laravel/tinker" />
<path value="$PROJECT_DIR$/vendor/phar-io/version" />
<path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
<path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
<path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
<path value="$PROJECT_DIR$/vendor/symfony/console" />
<path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
<path value="$PROJECT_DIR$/vendor/symfony/routing" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
<path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
<path value="$PROJECT_DIR$/vendor/symfony/finder" />
<path value="$PROJECT_DIR$/vendor/symfony/debug" />
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
<path value="$PROJECT_DIR$/vendor/symfony/mime" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
<path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
<path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php73" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php72" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
<path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-iconv" />
<path value="$PROJECT_DIR$/vendor/symfony/mime" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
<path value="$PROJECT_DIR$/vendor/symfony/routing" />
<path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
<path value="$PROJECT_DIR$/vendor/symfony/debug" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php73" />
<path value="$PROJECT_DIR$/vendor/symfony/process" />
<path value="$PROJECT_DIR$/vendor/symfony/console" />
<path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
<path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
<path value="$PROJECT_DIR$/vendor/phar-io/version" />
<path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
<path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
<path value="$PROJECT_DIR$/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/mockery/mockery" />
<path value="$PROJECT_DIR$/vendor/laravel/framework" />
<path value="$PROJECT_DIR$/vendor/laravel/tinker" />
<path value="$PROJECT_DIR$/vendor/laravel/socialite" />
<path value="$PROJECT_DIR$/vendor/egulias/email-validator" />
<path value="$PROJECT_DIR$/vendor/dnoegel/php-xdg-base-dir" />
<path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" />
<path value="$PROJECT_DIR$/vendor/ramsey/uuid" />
<path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
<path value="$PROJECT_DIR$/vendor/league/flysystem" />
<path value="$PROJECT_DIR$/vendor/league/oauth1-client" />
<path value="$PROJECT_DIR$/vendor/erusev/parsedown" />
<path value="$PROJECT_DIR$/vendor/dompdf/dompdf" />
<path value="$PROJECT_DIR$/vendor/phenx/php-font-lib" />
<path value="$PROJECT_DIR$/vendor/phenx/php-svg-lib" />
<path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
<path value="$PROJECT_DIR$/vendor/opis/closure" />
<path value="$PROJECT_DIR$/vendor/filp/whoops" />
<path value="$PROJECT_DIR$/vendor/psy/psysh" />
<path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
<path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
<path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
<path value="$PROJECT_DIR$/vendor/symfony/translation" />
<path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-debugbar" />
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-dompdf" />
<path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
<path value="$PROJECT_DIR$/vendor/hamcrest/hamcrest-php" />
<path value="$PROJECT_DIR$/vendor/maximebf/debugbar" />
<path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
<path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
<path value="$PROJECT_DIR$/vendor/phpoption/phpoption" />
<path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
<path value="$PROJECT_DIR$/vendor/fideloper/proxy" />
<path value="$PROJECT_DIR$/vendor/paragonie/random_compat" />
<path value="$PROJECT_DIR$/vendor/sebastian/diff" />
<path value="$PROJECT_DIR$/vendor/sebastian/environment" />
<path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
<path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
<path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
<path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
<path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
<path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
<path value="$PROJECT_DIR$/vendor/sebastian/version" />
<path value="$PROJECT_DIR$/vendor/webmozart/assert" />
<path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
<path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
<path value="$PROJECT_DIR$/vendor/beyondcode/laravel-dump-server" />
<path value="$PROJECT_DIR$/vendor/fzaninotto/faker" />
<path value="$PROJECT_DIR$/vendor/sabberworm/php-css-parser" />
<path value="$PROJECT_DIR$/vendor/jeremy-dunn/php-fedex-api-wrapper" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/vendor/nunomaduro/collision" />
<path value="$PROJECT_DIR$/vendor/dragonmantank/cron-expression" />
<path value="$PROJECT_DIR$/vendor/jakub-onderka/php-console-color" />
<path value="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer" />
<path value="$PROJECT_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
<path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
<path value="$PROJECT_DIR$/vendor/jakub-onderka/php-console-highlighter" />
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
<path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/psr/log" />
<path value="$PROJECT_DIR$/vendor/psr/http-message" />
<path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
<path value="$PROJECT_DIR$/vendor/psr/container" />
<path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/psr/http-message" />
<path value="$PROJECT_DIR$/vendor/opis/closure" />
<path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
<path value="$PROJECT_DIR$/vendor/psy/psysh" />
<path value="$PROJECT_DIR$/vendor/filp/whoops" />
<path value="$PROJECT_DIR$/vendor/intervention/image" />
<path value="$PROJECT_DIR$/vendor/mews/captcha" />
</include_path>
......
.idea/workspace.xml
View file @ 5f11b416
......@@ -2,11 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/fazoshop.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/fazoshop.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/main.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/main.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/user.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/user.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/main.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/main.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/questions.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/questions.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/welcome.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/welcome.blade.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -34,273 +33,120 @@
<expand />
<select />
</component>
<component name="FavoritesManager">
<favorites_list name="fazoshop" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="850">
<caret line="59" column="20" selection-start-line="59" selection-start-column="13" selection-end-line="59" selection-end-column="20" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2941">
<caret line="173" column="91" selection-start-line="173" selection-start-column="91" selection-end-line="173" selection-end-column="91" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="32" column="119" selection-start-line="32" selection-start-column="119" selection-end-line="32" selection-end-column="119" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229">
<caret line="350" column="49" selection-start-line="350" selection-start-column="49" selection-end-line="350" selection-end-column="49" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/questions.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1547">
<caret line="91" column="138" selection-start-line="91" selection-start-column="138" selection-end-line="91" selection-end-column="150" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="Git.Settings">
<option name="UPDATE_TYPE" value="MERGE" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/resources/views/pages/terms.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php" />
<option value="$PROJECT_DIR$/config/app.php" />
<option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/config/captcha.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/Auth/LoginController.php" />
<option value="$PROJECT_DIR$/resources/views/auth/login.blade.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/main.blade.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" />
<option value="$PROJECT_DIR$/resources/views/questions.blade.php" />
<option value="$PROJECT_DIR$/resources/views/main.blade.php" />
</list>
</option>
</component>
<component name="PhpWorkspaceProjectConfiguration">
<include_path>
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
<path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
<path value="$PROJECT_DIR$/vendor/jakub-onderka/php-console-color" />
<path value="$PROJECT_DIR$/vendor/jakub-onderka/php-console-highlighter" />
<path value="$PROJECT_DIR$/vendor/dragonmantank/cron-expression" />
<path value="$PROJECT_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
<path value="$PROJECT_DIR$/vendor/kylekatarnls/update-helper" />
<path value="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer" />
<path value="$PROJECT_DIR$/vendor/jeremy-dunn/php-fedex-api-wrapper" />
<path value="$PROJECT_DIR$/vendor/sabberworm/php-css-parser" />
<path value="$PROJECT_DIR$/vendor/nunomaduro/collision" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
<path value="$PROJECT_DIR$/vendor/fzaninotto/faker" />
<path value="$PROJECT_DIR$/vendor/beyondcode/laravel-dump-server" />
<path value="$PROJECT_DIR$/vendor/webmozart/assert" />
<path value="$PROJECT_DIR$/vendor/sebastian/version" />
<path value="$PROJECT_DIR$/vendor/sebastian/diff" />
<path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
<path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
<path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
<path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
<path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
<path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
<path value="$PROJECT_DIR$/vendor/sebastian/environment" />
<path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
<path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
<path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
<path value="$PROJECT_DIR$/vendor/phpoption/phpoption" />
<path value="$PROJECT_DIR$/vendor/paragonie/random_compat" />
<path value="$PROJECT_DIR$/vendor/fideloper/proxy" />
<path value="$PROJECT_DIR$/vendor/maximebf/debugbar" />
<path value="$PROJECT_DIR$/vendor/hamcrest/hamcrest-php" />
<path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
<path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
<path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-dompdf" />
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-debugbar" />
<path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
<path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
<path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
<path value="$PROJECT_DIR$/vendor/symfony/translation" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
<path value="$PROJECT_DIR$/vendor/dompdf/dompdf" />
<path value="$PROJECT_DIR$/vendor/erusev/parsedown" />
<path value="$PROJECT_DIR$/vendor/phenx/php-font-lib" />
<path value="$PROJECT_DIR$/vendor/phenx/php-svg-lib" />
<path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
<path value="$PROJECT_DIR$/vendor/ramsey/uuid" />
<path value="$PROJECT_DIR$/vendor/league/flysystem" />
<path value="$PROJECT_DIR$/vendor/league/oauth1-client" />
<path value="$PROJECT_DIR$/vendor/egulias/email-validator" />
<path value="$PROJECT_DIR$/vendor/laravel/framework" />
<path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" />
<path value="$PROJECT_DIR$/vendor/dnoegel/php-xdg-base-dir" />
<path value="$PROJECT_DIR$/vendor/mockery/mockery" />
<path value="$PROJECT_DIR$/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/laravel/socialite" />
<path value="$PROJECT_DIR$/vendor/laravel/tinker" />
<path value="$PROJECT_DIR$/vendor/phar-io/version" />
<path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
<path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
<path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
<path value="$PROJECT_DIR$/vendor/symfony/console" />
<path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
<path value="$PROJECT_DIR$/vendor/symfony/routing" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
<path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
<path value="$PROJECT_DIR$/vendor/symfony/finder" />
<path value="$PROJECT_DIR$/vendor/symfony/debug" />
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
<path value="$PROJECT_DIR$/vendor/symfony/mime" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
<path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
<path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php73" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php72" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
<path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-iconv" />
<path value="$PROJECT_DIR$/vendor/symfony/mime" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
<path value="$PROJECT_DIR$/vendor/symfony/routing" />
<path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
<path value="$PROJECT_DIR$/vendor/symfony/debug" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php73" />
<path value="$PROJECT_DIR$/vendor/symfony/process" />
<path value="$PROJECT_DIR$/vendor/symfony/console" />
<path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
<path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
<path value="$PROJECT_DIR$/vendor/phar-io/version" />
<path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
<path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
<path value="$PROJECT_DIR$/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/mockery/mockery" />
<path value="$PROJECT_DIR$/vendor/laravel/framework" />
<path value="$PROJECT_DIR$/vendor/laravel/tinker" />
<path value="$PROJECT_DIR$/vendor/laravel/socialite" />
<path value="$PROJECT_DIR$/vendor/egulias/email-validator" />
<path value="$PROJECT_DIR$/vendor/dnoegel/php-xdg-base-dir" />
<path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" />
<path value="$PROJECT_DIR$/vendor/ramsey/uuid" />
<path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
<path value="$PROJECT_DIR$/vendor/league/flysystem" />
<path value="$PROJECT_DIR$/vendor/league/oauth1-client" />
<path value="$PROJECT_DIR$/vendor/erusev/parsedown" />
<path value="$PROJECT_DIR$/vendor/dompdf/dompdf" />
<path value="$PROJECT_DIR$/vendor/phenx/php-font-lib" />
<path value="$PROJECT_DIR$/vendor/phenx/php-svg-lib" />
<path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
<path value="$PROJECT_DIR$/vendor/opis/closure" />
<path value="$PROJECT_DIR$/vendor/filp/whoops" />
<path value="$PROJECT_DIR$/vendor/psy/psysh" />
<path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
<path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
<path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
<path value="$PROJECT_DIR$/vendor/symfony/translation" />
<path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-debugbar" />
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-dompdf" />
<path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
<path value="$PROJECT_DIR$/vendor/hamcrest/hamcrest-php" />
<path value="$PROJECT_DIR$/vendor/maximebf/debugbar" />
<path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
<path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
<path value="$PROJECT_DIR$/vendor/phpoption/phpoption" />
<path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
<path value="$PROJECT_DIR$/vendor/fideloper/proxy" />
<path value="$PROJECT_DIR$/vendor/paragonie/random_compat" />
<path value="$PROJECT_DIR$/vendor/sebastian/diff" />
<path value="$PROJECT_DIR$/vendor/sebastian/environment" />
<path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
<path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
<path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
<path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
<path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
<path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
<path value="$PROJECT_DIR$/vendor/sebastian/version" />
<path value="$PROJECT_DIR$/vendor/webmozart/assert" />
<path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
<path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
<path value="$PROJECT_DIR$/vendor/beyondcode/laravel-dump-server" />
<path value="$PROJECT_DIR$/vendor/fzaninotto/faker" />
<path value="$PROJECT_DIR$/vendor/sabberworm/php-css-parser" />
<path value="$PROJECT_DIR$/vendor/jeremy-dunn/php-fedex-api-wrapper" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/vendor/nunomaduro/collision" />
<path value="$PROJECT_DIR$/vendor/dragonmantank/cron-expression" />
<path value="$PROJECT_DIR$/vendor/jakub-onderka/php-console-color" />
<path value="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer" />
<path value="$PROJECT_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
<path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
<path value="$PROJECT_DIR$/vendor/jakub-onderka/php-console-highlighter" />
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
<path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/psr/log" />
<path value="$PROJECT_DIR$/vendor/psr/http-message" />
<path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
<path value="$PROJECT_DIR$/vendor/psr/container" />
<path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/psr/http-message" />
<path value="$PROJECT_DIR$/vendor/opis/closure" />
<path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
<path value="$PROJECT_DIR$/vendor/psy/psysh" />
<path value="$PROJECT_DIR$/vendor/filp/whoops" />
<path value="$PROJECT_DIR$/vendor/intervention/image" />
<path value="$PROJECT_DIR$/vendor/mews/captcha" />
</include_path>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-7" />
<option name="y" value="2" />
<option name="width" value="1378" />
<option name="height" value="733" />
</component>
<component name="ProjectId" id="1RvHVuLiAecoShWzzuyXsxpQGtI" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Http" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Providers" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="layouts" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="routes" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="true" />
<property name="WebServerToolWindowPanel.toolwindow.highlight.mappings" value="true" />
<property name="WebServerToolWindowPanel.toolwindow.highlight.symlinks" value="true" />
<property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
<property name="editor.config.ad.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/public/assets/slider/images" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/resources/views" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" />
......@@ -313,15 +159,18 @@
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\OSPanel\domains\fazo\resources\views" />
<recent name="C:\OSPanel\domains\fazo\public\video" />
<recent name="C:\OSPanel\domains\fazo\app\Http\Controllers" />
<recent name="C:\OSPanel\domains\fazo\public\assets\slider\images" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\frontend\fonts" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles\css" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\OSPanel\domains\fazo\public\assets\slider\images" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\frontend\fonts" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
......@@ -377,28 +226,10 @@
<workItem from="1569048123758" duration="278000" />
<workItem from="1570474579928" duration="2098000" />
<workItem from="1570507468153" duration="6606000" />
<workItem from="1570540679279" duration="7153000" />
<workItem from="1570711435707" duration="5179000" />
<workItem from="1570735062090" duration="2343000" />
<workItem from="1570901455138" duration="643000" />
<workItem from="1570941286112" duration="604000" />
<workItem from="1570972136889" duration="1589000" />
<workItem from="1570994307705" duration="2047000" />
<workItem from="1571151295997" duration="3849000" />
<workItem from="1571243925350" duration="1278000" />
<workItem from="1571343471441" duration="2382000" />
<workItem from="1571412154783" duration="6797000" />
<workItem from="1571455614132" duration="511000" />
<workItem from="1571456524276" duration="2390000" />
<workItem from="1571472629558" duration="811000" />
<workItem from="1571503292519" duration="3539000" />
<workItem from="1571663060071" duration="7663000" />
<workItem from="1571746463353" duration="1468000" />
<workItem from="1571841886697" duration="6168000" />
<workItem from="1571886699361" duration="302000" />
<workItem from="1571903228232" duration="4414000" />
<workItem from="1571936375762" duration="3292000" />
<workItem from="1571993466951" duration="490000" />
<workItem from="1570540679279" duration="7189000" />
<workItem from="1570729103244" duration="651000" />
<workItem from="1571336316933" duration="11634000" />
<workItem from="1571458855290" duration="45747000" />
</task>
<task id="LOCAL-00001" summary="first commit (10/07/2019//11/;58)">
<created>1570475345391</created>
......@@ -512,97 +343,58 @@
<option name="project" value="LOCAL" />
<updated>1570571395627</updated>
</task>
<task id="LOCAL-00017" summary="10/12/2019//22:31">
<created>1570901481745</created>
<task id="LOCAL-00017" summary="fix bugs">
<created>1570572529582</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1570901481745</updated>
<updated>1570572529582</updated>
</task>
<task id="LOCAL-00018" summary="women">
<created>1571456651471</created>
<task id="LOCAL-00018" summary="fix bugs">
<created>1571355185065</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1571456651472</updated>
<updated>1571355185065</updated>
</task>
<task id="LOCAL-00019" summary="Fucking project">
<created>1571506004901</created>
<task id="LOCAL-00019" summary="fix bugs">
<created>1571370664246</created>
<option name="number" value="00019" />
<option name="presentableId" value="LOCAL-00019" />
<option name="project" value="LOCAL" />
<updated>1571506004901</updated>
<updated>1571370664246</updated>
</task>
<task id="LOCAL-00020" summary="Fucking project утв">
<created>1571664113631</created>
<task id="LOCAL-00020" summary="fix bugs">
<created>1571520322538</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1571664113631</updated>
<updated>1571520322539</updated>
</task>
<task id="LOCAL-00021" summary="Captcha">
<created>1571746707740</created>
<task id="LOCAL-00021" summary="fix bugs">
<created>1571608082942</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1571746707741</updated>
<updated>1571608082942</updated>
</task>
<task id="LOCAL-00022" summary="fix bugs">
<created>1571785022272</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1571785022272</updated>
</task>
<task id="LOCAL-00023" summary="video">
<created>1571944244758</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1571944244758</updated>
</task>
<option name="localTasksCounter" value="22" />
<option name="localTasksCounter" value="24" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="58432000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="2" width="1378" height="733" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49833333" visible="true" weight="0.1411229" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" sideWeight="0.50166667" side_tool="true" weight="0.21471927" />
<window_info id="npm" order="3" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.32936078" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" weight="0.2831424" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50067115" side_tool="true" weight="0.27659574" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Remote Host" order="3" weight="0.32852808" />
<window_info anchor="right" id="Database" order="4" weight="0.32852808" />
</layout>
<layout-to-restore>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49833333" visible="true" weight="0.12746586" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" sideWeight="0.50166667" side_tool="true" weight="0.21471927" />
<window_info id="npm" order="3" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.32936078" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" weight="0.2831424" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50067115" side_tool="true" weight="0.27659574" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Remote Host" order="3" weight="0.32852808" />
<window_info anchor="right" id="Database" order="4" weight="0.32852808" />
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
......@@ -612,12 +404,6 @@
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="COLUMN_ORDER" />
</State>
</value>
......@@ -644,13 +430,8 @@
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="first commit (10/07/2019//11/;58)" />
<MESSAGE value="fix bugs" />
<MESSAGE value="10/10/2019//1:20" />
<MESSAGE value="10/12/2019//22:31" />
<MESSAGE value="women" />
<MESSAGE value="Fucking project" />
<MESSAGE value="Fucking project утв" />
<MESSAGE value="Captcha" />
<option name="LAST_COMMIT_MESSAGE" value="Captcha" />
<MESSAGE value="video" />
<option name="LAST_COMMIT_MESSAGE" value="video" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -663,159 +444,4 @@
</breakpoints>
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/assets/slider/css/style.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="935">
<caret line="55" column="46" selection-start-line="55" selection-start-column="46" selection-end-line="55" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/admin.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="969">
<caret line="57" column="40" selection-start-line="57" selection-start-column="40" selection-end-line="57" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-504" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/about.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="26" column="108" selection-start-line="26" selection-start-column="108" selection-end-line="26" selection-end-column="108" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="8" column="6" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/terms.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-255">
<caret line="6" column="48" selection-start-line="6" selection-start-column="48" selection-end-line="6" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="27" column="55" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-663">
<caret line="17" column="6" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-179">
<caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/LoginController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="663">
<caret line="40" column="5" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" />
<folding>
<element signature="e#45#81#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/RegisterController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="10" column="6" selection-start-line="10" selection-start-column="6" selection-end-line="10" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3927">
<caret line="231" column="57" selection-start-line="231" selection-start-column="57" selection-end-line="231" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/captcha.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="25" column="26" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Providers/AppServiceProvider.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="301">
<caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
<folding>
<element signature="e#2468#2569#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="850">
<caret line="59" column="20" selection-start-line="59" selection-start-column="13" selection-end-line="59" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2941">
<caret line="173" column="91" selection-start-line="173" selection-start-column="91" selection-end-line="173" selection-end-column="91" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="32" column="119" selection-start-line="32" selection-start-column="119" selection-end-line="32" selection-end-column="119" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/questions.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1547">
<caret line="91" column="138" selection-start-line="91" selection-start-column="138" selection-end-line="91" selection-end-column="150" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229">
<caret line="350" column="49" selection-start-line="350" selection-start-column="49" selection-end-line="350" selection-end-column="49" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
app/Http/Controllers/Controller.php
View file @ 5f11b416
......@@ -16,4 +16,5 @@ class Controller extends BaseController
{
return (int)substr(number_format(time() * rand(), 0, '', ''), 0, $digit);
}
}
app/Http/Controllers/DeliverySytemsController.php 0 → 100644
View file @ 5f11b416
<?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
View file @ 5f11b416
......@@ -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
View file @ 5f11b416
......@@ -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
View file @ 5f11b416
{
"_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
View file @ 5f11b416
......@@ -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
View file @ 5f11b416
......@@ -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
View file @ 5f11b416
......@@ -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/pages/parcels/order_create.blade.php
View file @ 5f11b416
......@@ -29,7 +29,7 @@
#progressbar li {
list-style-type: none;
width: 33.33%;
width: 25%;
float: left;
position: relative;
text-align: center;
......@@ -72,6 +72,15 @@
color: #7d7d7d;
left: -45%;
}
.scroll-horizantal {
overflow-y: scroll;
overflow-x: hidden;
transform: rotate(270deg) translateX(-100%);
transform-origin: top left;
background-color: #999;
position: absolute;
}
</style>
<!-- multistep form -->
......@@ -124,6 +133,7 @@
<ul id="progressbar" class="needs-validation border border-1 bg-white">
<li class="active">СБОР ПОСЫЛКИ</li>
<li>АДРЕСА</li>
<li>ВЫБЕРИТЕ ТИП ОТПРАВКИ</li>
<li>ПОДТВЕРЖДЕНИЕ</li>
</ul>
<hr>
......@@ -158,8 +168,8 @@
<th class="col-3">Название товара</th>
<th class="col-2">Количество (шт)</th>
<th class="col-2">Цена ($)</th>
<th class="col-2">Коммент...</th>
<th class="col-1">Стоим...</th>
<th class="col-2">Комментарий</th>
<th class="col-1">Сумма</th>
<th class="col-1"></th>
</tr>
</thead>
......@@ -216,8 +226,8 @@
посылку</strong></a>
</div>
<div class="col-6 text-right">
Итоговая сумма в декларации: <strong><span class="text-success"
id="total_price">$2</span></strong>
<b>Итоговая сумма в декларации:</b> <strong><span class="text-success"
id="total_price">$2</span></strong>
</div>
</div>
<br><br>
......@@ -239,7 +249,8 @@
</div>
<br/><br/>
<input type="button" name="next" class="next action-button btn btn-primary btn-lg btn-block mt-4"
<input type="button" name="next"
class="next action-button btn btn-primary btn-lg btn-block mt-4"
value="Next"/>
<br>
<hr>
......@@ -254,21 +265,15 @@
<label for="">На этой странице вам необходимо указать ваш адрес в США. Этот адрес будет
использоваться в качестве адреса отправителя</label>
</div>
<hr>
<div class="row">
<div class="col-md-12" style="display: inline-flex">
@foreach($senderAddresses as $item)
@if($item->type == 'sender')
<div class="custom-control custom-radio"
style="width: 300px;height: 120px;border: 1px solid #e9ecef;padding: 10px 10px 10px 40px;margin: 6px;">
<input type="radio" class="custom-control-input"
name="from_address" value="{{ $item->id }}"
id="from_address{{ $item->id }}">
<label class="custom-control-label"
for="from_address{{ $item->id }}">{{ $item->country.', '.$item->city.', '.$item->street.', '.$item->house.', '.$item->apartment.', '.$item->zip }}</label>
</div>
@endif
@endforeach
<div id="senderAddresses" style="display: inline-flex; overflow-y: hidden; overflow-x: scroll"
class="col-md-10">
<label for="">У вас еще нет адресов</label>
</div>
<div class="col-md-2">
<input type="button" name="add_sender" class="btn btn-primary btn-lg btn-block mt-4"
style="font-size: 16px;" value="Добавить адрес" data-toggle="modal"
data-target="#addSenderAddressAddModal"/>
</div>
</div>
<br>
......@@ -279,35 +284,43 @@
адрес :</label>
</div>
<div class="row">
<div class="col-md-12" style="display: inline-flex">
@foreach($senderAddresses as $item)
@if($item->type == 'recipient')
<div class="custom-control custom-radio"
style="width: 300px;height: 120px;border: 1px solid #e9ecef;padding: 10px 10px 10px 40px;margin: 6px;">
<input type="radio" class="custom-control-input"
name="to_address_id" value="{{ $item->id }}"
id="to_address_id{{ $item->id }}">
<label class="custom-control-label"
for="to_address_id{{ $item->id }}">{{ $item->country.', '.$item->city.', '.$item->street.', '.$item->house.', '.$item->apartment.', '.$item->zip.' | Limit: $1000' }}</label>
</div>
@endif
@endforeach
<div id="recAddresses" style="display: inline-flex; overflow-y: hidden; overflow-x: scroll"
class="col-md-10">
<label for="">У вас еще нет адресов</label>
</div>
<div class="col-md-2">
<input type="button" name="add_rec" class="btn btn-primary btn-lg btn-block mt-4"
style="font-size: 16px;" value="Добавить адрес" data-toggle="modal"
data-target="#addRecAddressAddModal"/>
</div>
</div>
<br/><br/>
<input type="button" name="previous"
style="width: 35%; float: left;"
style="width: 30%; float: left;" x
class="previous action-button btn btn-primary btn-lg btn-block mt-4"
value="Предыдущий"/>
<input type="button" name="next"
style="width: 35%; float: right"
style="width: 30%; float: right"
class="next action-button btn btn-primary btn-lg btn-block mt-4"
value="Следующий"/>
</fieldset>
<fieldset>
<input type="button" name="next" data-type="newyork"
style="width: 50%; height: 60px; margin-left: 25%;"
class="next action-button btn btn-primary btn-lg btn-block mt-4"
value="Отправить из Нью-Йорка"/>
<br>
<hr>
<br>
<input type="button" name="next" data-type="outnewyork"
style="width: 50%; height: 60px; margin-left: 25%;"
class="next action-button btn btn-primary btn-lg btn-block mt-4"
value="Отправить из других штатов"/>
</fieldset>
<fieldset>
......@@ -325,21 +338,25 @@
</div>
</div>
<br>
<hr>
<h1>Выберите тип доставки</h1>
<div class="row">
<div class="col-md-4">
<div class="custom-control custom-radio">
<input type="radio" class="custom-control-input" id="defaultUnchecked11"
name="delivery_info" value="Само достовка" checked>
<label class="custom-control-label" for="defaultUnchecked11">Само достовка</label>
</div>
<input type="hidden" id="is_site" name="is_site" value="0">
<div id="pickUp">
<hr>
<h1>Выберите тип доставки</h1>
<div class="row">
<div class="col-md-4">
<div class="custom-control custom-radio">
<input type="radio" class="custom-control-input" id="defaultUnchecked11"
name="delivery_info" value="Само достовка" checked>
<label class="custom-control-label" for="defaultUnchecked11">Само достовка</label>
</div>
<!-- Default checked -->
<div class="custom-control custom-radio">
<input type="radio" class="custom-control-input" id="defaultChecked22"
name="delivery_info" value="Вызов курьера">
<label class="custom-control-label" for="defaultChecked22">Вызов курьера</label>
</div>
<!-- Default checked -->
<div class="custom-control custom-radio">
<input type="radio" class="custom-control-input" id="defaultChecked22"
name="delivery_info" value="Вызов курьера">
<label class="custom-control-label" for="defaultChecked22">Вызов курьера</label>
</div>
</div>
</div>
......@@ -351,18 +368,18 @@
<div class="custom-control custom-radio">
<input type="radio" class="custom-control-input" id="defaultUnchecked12"
name="payment_info" value="Наличньыми" checked>
<label class="custom-control-label" for="defaultUnchecked12">Наличньыми</label>
<label class="custom-control-label" for="defaultUnchecked12">Оплачу по телефону</label>
</div>
<!-- Default checked -->
<div class="custom-control custom-radio">
<input type="radio" class="custom-control-input" id="defaultChecked21"
name="payment_info" value="По телефону">
<label class="custom-control-label" for="defaultChecked21">По телефону</label>
<label class="custom-control-label" for="defaultChecked21">Оплачу Наличными</label>
</div><!-- Default checked -->
<div class="custom-control custom-radio">
<input type="radio" class="custom-control-input" id="defaultChecked32"
name="payment_info" value="Online">
<label class="custom-control-label" for="defaultChecked32">Online (VISA, PayPal,
<label class="custom-control-label" for="defaultChecked32">Оплачу электронной формой оплаты (VISA, PayPal,
MasterCard, AmericanExpress)</label>
</div>
</div>
......@@ -383,6 +400,302 @@
</form>
</div>
</section>
<div class="modal fade" id="addSenderAddressAddModal" tabindex="-1" role="dialog"
aria-labelledby="addSenderAddressAddModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="addSenderAddressAddModalLabel">Добавление адреса отправителя</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<form id="addSenderForm" method="post" action="{{ route('address.store') }}"
class="needs-validation border border-1 bg-white p-5">
<div class="modal-body">
@csrf
<div class="row">
<div class="col-xs-12 col-sm-4">
<div class="form-group">
<label class="form-label" for="forms-check-name1">Имя <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-name1" type="text" name="firstname"
data-constraints="@Required" placeholder="Имя" required>
</div>
</div>
<div class="col-xs-12 col-sm-4">
<div class="form-group">
<label class="form-label" for="forms-check-last-name1">Фамилия <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-last-name1" type="text"
name="secondname"
data-constraints="@Required" placeholder="Фамилия" required>
</div>
</div>
<div class="col-xs-12 col-sm-4">
<div class="form-group">
<label class="form-label" for="forms-check-last-name1">Отчество <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-last-name1" type="text"
name="fathername"
data-constraints="@Required" placeholder="Отчество" required>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<!-- RD SelectMenu-->
<div class="form-group">
<label class="form-label" for="involve-form-country1">Страна <span
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
</select>
</div>
</div>
</div>
<div class="col-xs-12 select">
<!-- RD SelectMenu-->
<div class="form-group form-wrap-validation">
<label class="form-label" for="involve-form-country1">Область <span
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)
<option value="{{ $value->id }}">{{ $value->title_ru }}</option>
@endforeach
</select>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="form-label" for="forms-check-street">Улица <span
style="color: #ff0912">*</span></label>
<input type="text" class="form-control" id="forms-check-street" name="street"
placeholder="Улица" required>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="form-label" for="forms-check-house">Дом <span
style="color: #ff0912">*</span></label>
<input type="text" class="form-control" id="forms-check-house" name="house"
placeholder="Дом" required>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="form-label" for="forms-check-appartment">Квартира <span
style="color: #ff0912">*</span></label>
<input type="text" class="form-control" id="forms-check-appartment" name="apartment"
placeholder="Квартира" required>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="form-label" for="forms-check-postcode1">ZIP код <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-postcode1" type="text" name="zip"
data-constraints="@Required" placeholder="ZIP код" required>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-wrap">
<label class="form-label" for="forms-check-phone">Номер телефона <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-phone" type="text" name="phone"
data-constraints="@Required" placeholder="Номер телефона" required>
</div>
</div>
<div class="col-md-6 select">
<input type="hidden" name="type" value="sender">
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Закрыть</button>
<button type="submit" class="btn btn-primary">Сохранить</button>
</div>
</form>
</div>
</div>
</div>
<div class="modal fade" id="addRecAddressAddModal" tabindex="-1" role="dialog"
aria-labelledby="addRecAddressAddModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="addRecAddressAddModalLabel">Добавление адреса получателя</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<form id="addRecForm" method="post" action="{{ route('address.store') }}"
class="needs-validation border border-1 bg-white p-5">
<div class="modal-body">
@csrf
<div class="row">
<div class="col-xs-12 col-sm-4">
<div class="form-group">
<label class="form-label" for="forms-check-name1">Имя <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-name1" type="text" name="firstname"
data-constraints="@Required" placeholder="Имя" required>
</div>
</div>
<div class="col-xs-12 col-sm-4">
<div class="form-group">
<label class="form-label" for="forms-check-last-name1">Фамилия <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-last-name1" type="text"
name="secondname"
data-constraints="@Required" placeholder="Фамилия" required>
</div>
</div>
<div class="col-xs-12 col-sm-4">
<div class="form-group">
<label class="form-label" for="forms-check-last-name1">Отчество <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-last-name1" type="text"
name="fathername"
data-constraints="@Required" placeholder="Отчество" required>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label class="form-label" for="forms-check-company1">Паспорт серия и номер <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-company1" type="text" name="passport"
data-constraints="@Required" placeholder="Паспорт серия и номер" required>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label class="form-label" for="forms-check-company1">Когда выдан <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-company1" type="date"
name="passport_issue"
data-constraints="@Required" placeholder="Когда выдан" required>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label class="form-label" for="forms-check-company1">Кем выдан <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-company1" type="text" name="passport_by"
data-constraints="@Required" placeholder="Кем выдан" required>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<!-- RD SelectMenu-->
<div class="form-group">
<label class="form-label" for="involve-form-country1">Страна <span
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
</select>
</div>
</div>
</div>
<div class="col-xs-12 select">
<!-- RD SelectMenu-->
<div class="form-group form-wrap-validation">
<label class="form-label" for="involve-form-country1">Область <span
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)
<option value="{{ $value->id }}">{{ $value->title_ru }}</option>
@endforeach
</select>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="form-label" for="forms-check-street">Улица <span
style="color: #ff0912">*</span></label>
<input type="text" class="form-control" id="forms-check-street" name="street"
placeholder="Улица" required>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="form-label" for="forms-check-house">Дом <span
style="color: #ff0912">*</span></label>
<input type="text" class="form-control" id="forms-check-house" name="house"
placeholder="Дом" required>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="form-label" for="forms-check-appartment">Квартира <span
style="color: #ff0912">*</span></label>
<input type="text" class="form-control" id="forms-check-appartment" name="apartment"
placeholder="Квартира" required>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="form-label" for="forms-check-postcode1">ZIP код <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-postcode1" type="text" name="zip"
data-constraints="@Required" placeholder="ZIP код" required>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-wrap">
<label class="form-label" for="forms-check-phone">Номер телефона <span
style="color: #ff0912">*</span></label>
<input class="form-control" id="forms-check-phone" type="text" name="phone"
data-constraints="@Required" placeholder="Номер телефона" required>
</div>
</div>
<div class="col-md-6 select">
<input type="hidden" name="type" value="recipient">
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Закрыть</button>
<button type="submit" class="btn btn-primary">Сохранить</button>
</div>
</form>
</div>
</div>
</div>
<script>
'use strict'
//jQuery time
......@@ -408,15 +721,16 @@
return false;
}
// var package_name = $('#package_name').val();
// if (package_name === "") {
// // Пожалуйста, введите имя для пакета
// window.alert('Пожалуйста, введите имя для пакета');
// return false;
// }
// console.log($(this).data('type'));
if ($(this).data('type') === 'outnewyork') {
$('#pickUp').hide();
$('#is_site').val(1);
}
if ($(this).data('type') === 'newyork') {
$('#pickUp').show();
$('#is_site').val(0);
}
// if (animating) return false;
// animating = true;
current_fs = $(this).parent();
next_fs = $(this).parent().next();
......@@ -427,29 +741,7 @@
next_fs.show();
//hide the current fieldset with style
current_fs.hide();
// current_fs.animate({opacity: 0}, {
// step: function (now, mx) {
// //as the opacity of current_fs reduces to 0 - stored in "now"
// //1. scale current_fs down to 80%
// scale = 1 - (1 - now) * 0.2;
// //2. bring next_fs from the right(50%)
// left = (now * 50) + "%";
// //3. increase opacity of next_fs to 1 as it moves in
// opacity = 1 - now;
// current_fs.css({
// 'transform': 'scale(' + scale + ')',
// 'position': 'absolute'
// });
// next_fs.css({'left': left, 'opacity': opacity});
// },
// duration: 800,
// complete: function () {
// current_fs.hide();
// animating = false;
// },
// //this comes from the custom easing plugin
// easing: 'easeInOutBack'
// });
});
$(".previous").click(function () {
......@@ -467,32 +759,8 @@
previous_fs.show();
//hide the current fieldset with style
current_fs.hide();
// current_fs.animate({opacity: 0}, {
// step: function (now, mx) {
// //as the opacity of current_fs reduces to 0 - stored in "now"
// //1. scale previous_fs from 80% to 100%
// scale = 0.8 + (1 - now) * 0.2;
// //2. take current_fs to the right(50%) - from 0%
// left = ((1 - now) * 50) + "%";
// //3. increase opacity of previous_fs to 1 as it moves in
// opacity = 1 - now;
// current_fs.css({'left': left});
// previous_fs.css({'transform': 'scale(' + scale + ')', 'opacity': opacity});
// },
// duration: 800,
// complete: function () {
// current_fs.hide();
// animating = false;
// },
// //this comes from the custom easing plugin
// easing: 'easeInOutBack'
// });
});
// $(".submit").click(function () {
// return false;
// })
</script>
......@@ -501,6 +769,147 @@
@section('custom_script')
<script>
$("#addSenderForm").submit(function (e) {
e.preventDefault(); // avoid to execute the actual submit of the form.
var form = $(this);
var url = form.attr('action');
$.ajax({
type: "POST",
url: url,
data: form.serialize(), // serializes the form's elements.
success: function (data) {
$.ajax({
type: "GET",
url: '{{ route('package.getAddressAjaxS') }}',
success: function (data1) {
// console.log(data[0].city_name)
var htmlData = "";
$.each(data1, function (key, value) {
// console.log(key);
// console.log(value.id);
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=\"from_address\" value=\"" + value.id + "\"\n" +
" id=\"from_address" + value.id + "\">\n" +
" <label class=\"custom-control-label\"\n" +
" for=\"from_address" + value.id + "\">" + value.country_name + ", " + value.city_name + ", " + value.street + ", " + value.house + ", "
+ value.apartment + ", " + value.zip + " | " + value.firstname + " " + value.secondname + "</label>\n" +
" </div></div>"
});
$('#senderAddresses').empty();
$('#senderAddresses').append(htmlData);
}
});
$('#addSenderAddressAddModal').modal('hide');
}
});
});
$.ajax({
type: "GET",
url: '{{ route('package.getAddressAjaxS') }}',
success: function (data) {
// console.log(data[0].city_name)
var htmlData = "";
$.each(data, function (key, value) {
// console.log(key);
// console.log(value.id);
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=\"from_address\" value=\"" + value.id + "\"\n" +
" id=\"from_address" + value.id + "\">\n" +
" <label class=\"custom-control-label\"\n" +
" for=\"from_address" + value.id + "\">" + value.country_name + ", " + value.city_name + ", " + value.street + ", " + value.house + ", "
+ value.apartment + ", " + value.zip + " | " + value.firstname + " " + value.secondname + "</label>\n" +
" </div></div>"
});
$('#senderAddresses').empty();
$('#senderAddresses').append(htmlData);
}
});
$("#addRecForm").submit(function (e) {
e.preventDefault(); // avoid to execute the actual submit of the form.
var form = $(this);
var url = form.attr('action');
$.ajax({
type: "POST",
url: url,
data: form.serialize(), // serializes the form's elements.
success: function (data) {
$.ajax({
type: "GET",
url: '{{ route('package.getAddressAjaxR') }}',
success: function (data1) {
// console.log(data[0].city_name)
var htmlData = "";
$.each(data1, function (key, value) {
// console.log(key);
// console.log(value.id);
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" +
" <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" +
" </div></div>"
});
$('#recAddresses').empty();
$('#recAddresses').append(htmlData);
}
});
$('#addRecAddressAddModal').modal('hide');
}
});
});
$.ajax({
type: "GET",
url: '{{ route('package.getAddressAjaxR') }}',
success: function (data) {
// console.log(data[0].city_name)
var htmlData = "";
$.each(data, function (key, value) {
// console.log(key);
// console.log(value.id);
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" +
" <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" +
" </div></div>"
});
$('#recAddresses').empty();
$('#recAddresses').append(htmlData);
}
});
</script>
<script>
var counter = 1;
......
resources/views/templates/declaration.blade.php
View file @ 5f11b416
......@@ -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 0 → 100644
View file @ 5f11b416
<!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
View file @ 5f11b416
<!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
View file @ 5f11b416
......@@ -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');
......
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