Customers Add+Edit, API WP
This commit is contained in:
Kevin Adametz
parent
dc63fa9fb2
commit
75a0f9a38a
120 changed files with 11894 additions and 6134 deletions
42
.idea/mivita.care.iml
generated
42
.idea/mivita.care.iml
generated
|
|
@ -2,15 +2,18 @@
|
|||
<module type="WEB_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Tests\" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/app" isTestSource="false" packagePrefix="App\" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/app" isTestSource="false" packagePrefix="App\" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Tests\" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/askedio/laravel5-profanity-filter" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/barryvdh/laravel-debugbar" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/barryvdh/laravel-dompdf" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/barryvdh/laravel-ide-helper" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/barryvdh/reflection-docblock" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/cocur/slugify" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/cviebrock/eloquent-sluggable" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/defuse/php-encryption" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/dnoegel/php-xdg-base-dir" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/cache" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/dbal" />
|
||||
|
|
@ -18,13 +21,13 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/inflector" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/instantiator" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/lexer" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/dompdf/dompdf" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/dragonmantank/cron-expression" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/egulias/email-validator" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/erusev/parsedown" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/fideloper/proxy" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/filp/whoops" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/firebase/php-jwt" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/fzaninotto/faker" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/gloudemans/shoppingcart" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/guzzle" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/promises" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/psr7" />
|
||||
|
|
@ -33,36 +36,55 @@
|
|||
<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/jenssegers/date" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/jeremeamia/SuperClosure" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/justinrainbow/json-schema" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/kylekatarnls/update-helper" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/laminas/laminas-diactoros" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/laminas/laminas-zendframework-bridge" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/laracasts/flash" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/laravel/framework" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/laravel/helpers" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/laravel/passport" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/laravel/tinker" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/laravelcollective/html" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/lcobucci/jwt" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/league/commonmark" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/league/event" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/league/flysystem" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/league/oauth2-server" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/maatwebsite/excel" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/complex" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/matrix" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/maximebf/debugbar" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/mockery/mockery" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/monolog/monolog" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/deep-copy" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/nesbot/carbon" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/nunomaduro/collision" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/nyholm/psr7" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/olimortimer/laravelshoppingcart" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/opis/closure" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/paragonie/random_compat" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/manifest" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/version" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phenx/php-font-lib" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phenx/php-svg-lib" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/php-http/message-factory" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-common" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-docblock" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/type-resolver" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/phpexcel" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/phpspreadsheet" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpoption/phpoption" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpseclib/phpseclib" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpspec/prophecy" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-code-coverage" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-file-iterator" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-invoker" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-text-template" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-timer" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-token-stream" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/psr/container" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-factory" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-message" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/psr/log" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/psr/simple-cache" />
|
||||
|
|
@ -70,6 +92,8 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/vendor/ralouphie/getallheaders" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/ramsey/uuid" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/reliese/laravel" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/sabberworm/php-css-parser" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/code-unit" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/diff" />
|
||||
|
|
@ -80,6 +104,7 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-reflector" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/recursion-context" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/resource-operations" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/type" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/version" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/seld/jsonlint" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/seld/phar-utils" />
|
||||
|
|
@ -101,11 +126,10 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-iconv" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-idn" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php56" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php72" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php73" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-util" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/process" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/psr-http-message-bridge" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/routing" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/service-contracts" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/translation" />
|
||||
|
|
|
|||
46
.idea/php.xml
generated
46
.idea/php.xml
generated
|
|
@ -10,23 +10,19 @@
|
|||
<path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
|
||||
<path value="$PROJECT_DIR$/vendor/composer" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
|
||||
<path value="$PROJECT_DIR$/vendor/maatwebsite/excel" />
|
||||
<path value="$PROJECT_DIR$/vendor/barryvdh/reflection-docblock" />
|
||||
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-ide-helper" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
|
||||
<path value="$PROJECT_DIR$/vendor/jakub-onderka/php-console-highlighter" />
|
||||
<path value="$PROJECT_DIR$/vendor/jenssegers/date" />
|
||||
<path value="$PROJECT_DIR$/vendor/jakub-onderka/php-console-color" />
|
||||
<path value="$PROJECT_DIR$/vendor/erusev/parsedown" />
|
||||
<path value="$PROJECT_DIR$/vendor/league/flysystem" />
|
||||
<path value="$PROJECT_DIR$/vendor/fideloper/proxy" />
|
||||
<path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" />
|
||||
<path value="$PROJECT_DIR$/vendor/laracasts/flash" />
|
||||
<path value="$PROJECT_DIR$/vendor/psy/psysh" />
|
||||
<path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/debug" />
|
||||
<path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php56" />
|
||||
<path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/console" />
|
||||
|
|
@ -34,7 +30,6 @@
|
|||
<path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-util" />
|
||||
<path value="$PROJECT_DIR$/vendor/seld/jsonlint" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php72" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
|
||||
|
|
@ -58,7 +53,6 @@
|
|||
<path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
|
||||
<path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
|
||||
<path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpoffice/phpexcel" />
|
||||
<path value="$PROJECT_DIR$/vendor/sebastian/environment" />
|
||||
<path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
|
||||
<path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
|
||||
|
|
@ -76,7 +70,6 @@
|
|||
<path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
|
||||
<path value="$PROJECT_DIR$/vendor/intervention/image" />
|
||||
<path value="$PROJECT_DIR$/vendor/webmozart/assert" />
|
||||
<path value="$PROJECT_DIR$/vendor/jeremeamia/SuperClosure" />
|
||||
<path value="$PROJECT_DIR$/vendor/yajra/laravel-datatables-oracle" />
|
||||
<path value="$PROJECT_DIR$/vendor/fzaninotto/faker" />
|
||||
<path value="$PROJECT_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
|
||||
|
|
@ -96,12 +89,9 @@
|
|||
<path value="$PROJECT_DIR$/vendor/hamcrest/hamcrest-php" />
|
||||
<path value="$PROJECT_DIR$/vendor/dragonmantank/cron-expression" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
|
||||
<path value="$PROJECT_DIR$/vendor/cocur/slugify" />
|
||||
<path value="$PROJECT_DIR$/vendor/cviebrock/eloquent-sluggable" />
|
||||
<path value="$PROJECT_DIR$/vendor/gloudemans/shoppingcart" />
|
||||
<path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
|
||||
<path value="$PROJECT_DIR$/vendor/askedio/laravel5-profanity-filter" />
|
||||
<path value="$PROJECT_DIR$/vendor/kylekatarnls/update-helper" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/mime" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/error-handler" />
|
||||
|
|
@ -113,9 +103,43 @@
|
|||
<path value="$PROJECT_DIR$/vendor/reliese/laravel" />
|
||||
<path value="$PROJECT_DIR$/vendor/setasign/fpdf" />
|
||||
<path value="$PROJECT_DIR$/vendor/setasign/fpdi" />
|
||||
<path value="$PROJECT_DIR$/vendor/olimortimer/laravelshoppingcart" />
|
||||
<path value="$PROJECT_DIR$/vendor/league/commonmark" />
|
||||
<path value="$PROJECT_DIR$/vendor/opis/closure" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpoption/phpoption" />
|
||||
<path value="$PROJECT_DIR$/vendor/maximebf/debugbar" />
|
||||
<path value="$PROJECT_DIR$/vendor/laracasts/flash" />
|
||||
<path value="$PROJECT_DIR$/vendor/cocur/slugify" />
|
||||
<path value="$PROJECT_DIR$/vendor/sebastian/type" />
|
||||
<path value="$PROJECT_DIR$/vendor/sebastian/code-unit" />
|
||||
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-debugbar" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge" />
|
||||
<path value="$PROJECT_DIR$/vendor/laminas/laminas-diactoros" />
|
||||
<path value="$PROJECT_DIR$/vendor/laminas/laminas-zendframework-bridge" />
|
||||
<path value="$PROJECT_DIR$/vendor/dompdf/dompdf" />
|
||||
<path value="$PROJECT_DIR$/vendor/php-http/message-factory" />
|
||||
<path value="$PROJECT_DIR$/vendor/lcobucci/jwt" />
|
||||
<path value="$PROJECT_DIR$/vendor/laravel/passport" />
|
||||
<path value="$PROJECT_DIR$/vendor/laravel/helpers" />
|
||||
<path value="$PROJECT_DIR$/vendor/nyholm/psr7" />
|
||||
<path value="$PROJECT_DIR$/vendor/phenx/php-font-lib" />
|
||||
<path value="$PROJECT_DIR$/vendor/phenx/php-svg-lib" />
|
||||
<path value="$PROJECT_DIR$/vendor/defuse/php-encryption" />
|
||||
<path value="$PROJECT_DIR$/vendor/firebase/php-jwt" />
|
||||
<path value="$PROJECT_DIR$/vendor/sabberworm/php-css-parser" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpseclib/phpseclib" />
|
||||
<path value="$PROJECT_DIR$/vendor/league/event" />
|
||||
<path value="$PROJECT_DIR$/vendor/league/oauth2-server" />
|
||||
<path value="$PROJECT_DIR$/vendor/psr/http-factory" />
|
||||
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-dompdf" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
|
||||
<path value="$PROJECT_DIR$/vendor/maatwebsite/excel" />
|
||||
<path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
|
||||
<path value="$PROJECT_DIR$/vendor/markbaker/complex" />
|
||||
</include_path>
|
||||
</component>
|
||||
<component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
|
||||
<component name="PhpProjectSharedConfiguration" php_language_level="7.2" />
|
||||
<component name="PhpUnit">
|
||||
<phpunit_settings>
|
||||
<PhpUnitSettings custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" />
|
||||
|
|
|
|||
234
.idea/workspace.xml
generated
234
.idea/workspace.xml
generated
|
|
@ -2,57 +2,118 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="2fbaac5f-25ba-4502-a970-cc14728d7d55" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/CustomerController.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/ModalController.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Repositories/CustomerRepository.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Services/CustomerPriority.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Services/Payment.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Services/Shop.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/admin/customer/_detail.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/admin/customer/detail.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/admin/customer/index.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/admin/modal/is_like_member.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/admin/modal/member.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/admin/sales/_detail.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/sys/admin/customers.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/user/shop/sales/order_detail.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/AuthController.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/ShoppingUserController.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/Sys/ImportController.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/User/CustomerController.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Imports/ImportCollection.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Models/Import.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Repositories/ImportRepository.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/public/phpinfo.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/admin/customer/_edit.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/admin/customer/edit.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/sys/admin/import-show.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/sys/admin/import.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/user/_user_form.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/user/customer/add.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/user/customer/detail.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/user/customer/edit.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/user/customer/index.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/user/shop/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/mivita.care.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/mivita.care.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$/app/Http/Controllers/Api/PayoneController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/PayoneController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.phpstorm.meta.php" beforeDir="false" afterPath="$PROJECT_DIR$/.phpstorm.meta.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/_ide_helper.php" beforeDir="false" afterPath="$PROJECT_DIR$/_ide_helper.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/_ide_helper_models.php" beforeDir="false" afterPath="$PROJECT_DIR$/_ide_helper_models.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/KasController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/KasController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/AttributeController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/AttributeController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CategoryController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CategoryController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CountryController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CountryController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CustomerController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CustomerController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/ImportProductController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/ImportProductController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/LeadController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/LeadController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/MembershipController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/MembershipController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/ProductController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/ProductController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/SalesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/SalesController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/ShippingController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/ShippingController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/SitesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/SitesController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Sys/AdminToolsController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Sys/AdminToolsController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/TranslationController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TranslationController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/TranslationFileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TranslationFileController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/User/ShopSalesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/User/ShopSalesController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/User/TeamController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/User/TeamController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/UserDataController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/UserDataController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/UserDeleteController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/UserDeleteController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/UserLevelController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/UserLevelController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/UserShopController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/UserShopController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/UserUpdateEmailController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/UserUpdateEmailController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/UserUpdatePasswordController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/UserUpdatePasswordController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/CardController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/CardController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/ContactController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/ContactController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/RegisterController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/RegisterController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/SiteController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/SiteController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/WizardController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/WizardController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Mail/MailCheckout.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailCheckout.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Mail/MailInfo.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailInfo.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/Country.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Country.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/PaymentTransaction.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/PaymentTransaction.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/Product.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Product.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/ShoppingOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingOrder.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/ShoppingOrderItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingOrderItem.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/ShoppingPayment.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingPayment.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/ShoppingUser.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingUser.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/UserAccount.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserAccount.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/HTMLHelper.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/HTMLHelper.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/UserService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/UserService.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/UserHistory.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserHistory.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/UserMessage.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserMessage.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Providers/AuthServiceProvider.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Providers/AuthServiceProvider.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Providers/RouteServiceProvider.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Providers/RouteServiceProvider.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Repositories/FileRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/FileRepository.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Repositories/ProductRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/ProductRepository.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/CustomerPriority.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/CustomerPriority.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Payment.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Payment.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Shop.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Shop.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Util.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Util.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Yard.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Yard.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/User.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/User.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/helpers.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/helpers.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/archiv.tar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/bootstrap/cache/packages.php" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/cache/packages.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/bootstrap/cache/services.php" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/cache/services.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/auth.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/auth.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/database.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/database.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/excel.php" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/filesystems.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/filesystems.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2018_09_29_145909_create_countries_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_09_29_145909_create_countries_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2018_10_21_164001_create_products_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_21_164001_create_products_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2019_02_23_161530_create_shopping_users_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_02_23_161530_create_shopping_users_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2019_02_23_163527_create_shopping_orders_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_02_23_163527_create_shopping_orders_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/.htaccess" beforeDir="false" afterPath="$PROJECT_DIR$/public/.htaccess" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/css/application.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/application.css" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/js/custom.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/custom.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/lead/m_data_form_edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/lead/m_data_form_edit.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/product/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/product/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/sales/customer_detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/sales/customer_detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/sales/customers.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/sales/customers.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/sales/user_detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/sales/user_detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/sales/users.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/sales/users.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/checkout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/checkout.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/layouts/application.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/application.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/lang/de.json" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/lang/de/navigation.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/navigation.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/lang/de/validation.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/validation.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/country/form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/country/form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/country/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/country/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/customer/_detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/customer/_detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/customer/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/customer/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/customer/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/customer/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/modal/is_like_member.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/modal/is_like_member.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/product/form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/product/form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/sys/admin/shopping-orders.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/sys/admin/shopping-orders.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/shop/sales/orders.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/shop/sales/orders.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/sys/admin/cronjobs.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/sys/admin/cronjobs.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/sys/admin/customers.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/sys/admin/customers.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/edit.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/membership/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/membership/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/team/members.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/team/members.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/user_form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/user_form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/user_new_form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/user_new_form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/api.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
|
|
@ -148,23 +209,19 @@
|
|||
<path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
|
||||
<path value="$PROJECT_DIR$/vendor/composer" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
|
||||
<path value="$PROJECT_DIR$/vendor/maatwebsite/excel" />
|
||||
<path value="$PROJECT_DIR$/vendor/barryvdh/reflection-docblock" />
|
||||
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-ide-helper" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
|
||||
<path value="$PROJECT_DIR$/vendor/jakub-onderka/php-console-highlighter" />
|
||||
<path value="$PROJECT_DIR$/vendor/jenssegers/date" />
|
||||
<path value="$PROJECT_DIR$/vendor/jakub-onderka/php-console-color" />
|
||||
<path value="$PROJECT_DIR$/vendor/erusev/parsedown" />
|
||||
<path value="$PROJECT_DIR$/vendor/league/flysystem" />
|
||||
<path value="$PROJECT_DIR$/vendor/fideloper/proxy" />
|
||||
<path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" />
|
||||
<path value="$PROJECT_DIR$/vendor/laracasts/flash" />
|
||||
<path value="$PROJECT_DIR$/vendor/psy/psysh" />
|
||||
<path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/debug" />
|
||||
<path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php56" />
|
||||
<path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/console" />
|
||||
|
|
@ -172,7 +229,6 @@
|
|||
<path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-util" />
|
||||
<path value="$PROJECT_DIR$/vendor/seld/jsonlint" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php72" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
|
||||
|
|
@ -196,7 +252,6 @@
|
|||
<path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
|
||||
<path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
|
||||
<path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpoffice/phpexcel" />
|
||||
<path value="$PROJECT_DIR$/vendor/sebastian/environment" />
|
||||
<path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
|
||||
<path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
|
||||
|
|
@ -214,7 +269,6 @@
|
|||
<path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
|
||||
<path value="$PROJECT_DIR$/vendor/intervention/image" />
|
||||
<path value="$PROJECT_DIR$/vendor/webmozart/assert" />
|
||||
<path value="$PROJECT_DIR$/vendor/jeremeamia/SuperClosure" />
|
||||
<path value="$PROJECT_DIR$/vendor/yajra/laravel-datatables-oracle" />
|
||||
<path value="$PROJECT_DIR$/vendor/fzaninotto/faker" />
|
||||
<path value="$PROJECT_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
|
||||
|
|
@ -234,12 +288,9 @@
|
|||
<path value="$PROJECT_DIR$/vendor/hamcrest/hamcrest-php" />
|
||||
<path value="$PROJECT_DIR$/vendor/dragonmantank/cron-expression" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
|
||||
<path value="$PROJECT_DIR$/vendor/cocur/slugify" />
|
||||
<path value="$PROJECT_DIR$/vendor/cviebrock/eloquent-sluggable" />
|
||||
<path value="$PROJECT_DIR$/vendor/gloudemans/shoppingcart" />
|
||||
<path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
|
||||
<path value="$PROJECT_DIR$/vendor/askedio/laravel5-profanity-filter" />
|
||||
<path value="$PROJECT_DIR$/vendor/kylekatarnls/update-helper" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/mime" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/error-handler" />
|
||||
|
|
@ -251,6 +302,40 @@
|
|||
<path value="$PROJECT_DIR$/vendor/reliese/laravel" />
|
||||
<path value="$PROJECT_DIR$/vendor/setasign/fpdf" />
|
||||
<path value="$PROJECT_DIR$/vendor/setasign/fpdi" />
|
||||
<path value="$PROJECT_DIR$/vendor/olimortimer/laravelshoppingcart" />
|
||||
<path value="$PROJECT_DIR$/vendor/league/commonmark" />
|
||||
<path value="$PROJECT_DIR$/vendor/opis/closure" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpoption/phpoption" />
|
||||
<path value="$PROJECT_DIR$/vendor/maximebf/debugbar" />
|
||||
<path value="$PROJECT_DIR$/vendor/laracasts/flash" />
|
||||
<path value="$PROJECT_DIR$/vendor/cocur/slugify" />
|
||||
<path value="$PROJECT_DIR$/vendor/sebastian/type" />
|
||||
<path value="$PROJECT_DIR$/vendor/sebastian/code-unit" />
|
||||
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-debugbar" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge" />
|
||||
<path value="$PROJECT_DIR$/vendor/laminas/laminas-diactoros" />
|
||||
<path value="$PROJECT_DIR$/vendor/laminas/laminas-zendframework-bridge" />
|
||||
<path value="$PROJECT_DIR$/vendor/dompdf/dompdf" />
|
||||
<path value="$PROJECT_DIR$/vendor/php-http/message-factory" />
|
||||
<path value="$PROJECT_DIR$/vendor/lcobucci/jwt" />
|
||||
<path value="$PROJECT_DIR$/vendor/laravel/passport" />
|
||||
<path value="$PROJECT_DIR$/vendor/laravel/helpers" />
|
||||
<path value="$PROJECT_DIR$/vendor/nyholm/psr7" />
|
||||
<path value="$PROJECT_DIR$/vendor/phenx/php-font-lib" />
|
||||
<path value="$PROJECT_DIR$/vendor/phenx/php-svg-lib" />
|
||||
<path value="$PROJECT_DIR$/vendor/defuse/php-encryption" />
|
||||
<path value="$PROJECT_DIR$/vendor/firebase/php-jwt" />
|
||||
<path value="$PROJECT_DIR$/vendor/sabberworm/php-css-parser" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpseclib/phpseclib" />
|
||||
<path value="$PROJECT_DIR$/vendor/league/event" />
|
||||
<path value="$PROJECT_DIR$/vendor/league/oauth2-server" />
|
||||
<path value="$PROJECT_DIR$/vendor/psr/http-factory" />
|
||||
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-dompdf" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
|
||||
<path value="$PROJECT_DIR$/vendor/maatwebsite/excel" />
|
||||
<path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
|
||||
<path value="$PROJECT_DIR$/vendor/markbaker/complex" />
|
||||
</include_path>
|
||||
</component>
|
||||
<component name="ProjectId" id="1Ply2ASLtUbE38LpjzejPOnh0np" />
|
||||
|
|
@ -268,7 +353,7 @@
|
|||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/app/Services" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/app/Http/Controllers/Api" />
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
<property name="nodejs_package_manager_path" value="npm" />
|
||||
|
|
@ -276,18 +361,18 @@
|
|||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/app/Services" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/admin/modal" />
|
||||
<recent name="$PROJECT_DIR$/app/Http/Controllers/Api" />
|
||||
<recent name="$PROJECT_DIR$/app/Http/Middleware" />
|
||||
<recent name="$PROJECT_DIR$/app" />
|
||||
<recent name="$PROJECT_DIR$/app/Import" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/sys/admin" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/admin/customer" />
|
||||
<recent name="$PROJECT_DIR$/app/Repositories" />
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/resources/views/user/customer" />
|
||||
<recent name="$PROJECT_DIR$/public/vendor/libs/dropzone" />
|
||||
<recent name="$PROJECT_DIR$/public/vendor/libs" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/admin/user" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/admin/lead" />
|
||||
<recent name="$PROJECT_DIR$/public/download" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
|
|
@ -469,6 +554,31 @@
|
|||
<workItem from="1588761249067" duration="27000" />
|
||||
<workItem from="1588761617312" duration="1790000" />
|
||||
<workItem from="1588771915210" duration="5000" />
|
||||
<workItem from="1588778353962" duration="35000" />
|
||||
<workItem from="1588779256522" duration="57000" />
|
||||
<workItem from="1588921253853" duration="2440000" />
|
||||
<workItem from="1589023916958" duration="245000" />
|
||||
<workItem from="1589355379810" duration="20000" />
|
||||
<workItem from="1589365636618" duration="4232000" />
|
||||
<workItem from="1589442905154" duration="21886000" />
|
||||
<workItem from="1589474488991" duration="3220000" />
|
||||
<workItem from="1589526578461" duration="28000" />
|
||||
<workItem from="1589881416788" duration="7714000" />
|
||||
<workItem from="1589891829781" duration="681000" />
|
||||
<workItem from="1589892673376" duration="9169000" />
|
||||
<workItem from="1589902453020" duration="273000" />
|
||||
<workItem from="1589974449247" duration="240000" />
|
||||
<workItem from="1590758073413" duration="5869000" />
|
||||
<workItem from="1590826972537" duration="2356000" />
|
||||
<workItem from="1590829892402" duration="8158000" />
|
||||
<workItem from="1591187714339" duration="7341000" />
|
||||
<workItem from="1591361845658" duration="2000" />
|
||||
<workItem from="1591619467115" duration="326000" />
|
||||
<workItem from="1591864110935" duration="4671000" />
|
||||
<workItem from="1591868858012" duration="15798000" />
|
||||
<workItem from="1591889648864" duration="8510000" />
|
||||
<workItem from="1591959307471" duration="5000" />
|
||||
<workItem from="1591959326440" duration="5517000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
|
@ -509,39 +619,49 @@
|
|||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="754" y="395" key="#com.intellij.execution.impl.EditConfigurationsDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1583573436293" />
|
||||
<state x="968" y="472" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1581691507125">
|
||||
<state x="1219" y="419" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1589898669859">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="968" y="472" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1581691507125" />
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1588762863647">
|
||||
<state x="1219" y="419" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1589898669859" />
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1591964088698">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1588762863647" />
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1591964088698" />
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585733837456" />
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1587109063136" />
|
||||
<state width="239" height="457" key="HiddenNamespacesPopup" timestamp="1583573337041">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state width="239" height="457" key="HiddenNamespacesPopup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1583573337041" />
|
||||
<state x="1002" y="464" key="NewPhpClassDialog" timestamp="1589893405691">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="1002" y="464" key="NewPhpClassDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1589893405691" />
|
||||
<state x="1143" y="547" key="com.intellij.database.view.ui.DbObjectDialog" timestamp="1583573350583">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="1143" y="547" key="com.intellij.database.view.ui.DbObjectDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1583573350583" />
|
||||
<state x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1588577892504">
|
||||
<state x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1591963287409">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1588577892504" />
|
||||
<state x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1591963287409" />
|
||||
<state x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585748173200" />
|
||||
<state x="805" y="444" width="1115" height="793" key="find.popup" timestamp="1588762308736">
|
||||
<state x="951" y="549" key="com.jetbrains.php.test.PhpNewTestDialog" timestamp="1591961096724">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="805" y="444" width="1115" height="793" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1588762308736" />
|
||||
<state x="951" y="549" key="com.jetbrains.php.test.PhpNewTestDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1591961096724" />
|
||||
<state x="805" y="444" width="1115" height="793" key="find.popup" timestamp="1591963257685">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="805" y="444" width="1115" height="793" key="find.popup/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1589024021327" />
|
||||
<state x="-1755" y="444" width="1115" height="793" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@-2560.23.2560.1417" timestamp="1589974580416" />
|
||||
<state x="805" y="444" width="1115" height="793" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1591963257685" />
|
||||
<state x="863" y="438" width="1115" height="793" key="find.popup/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585758694219" />
|
||||
<state x="863" y="438" width="1115" height="793" key="find.popup/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1587109016568" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup" timestamp="1588673694658">
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup" timestamp="1591880669124">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1588673694658" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1591880669124" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585408665805" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace PHPSTORM_META {
|
|||
|
||||
/**
|
||||
* PhpStorm Meta file, to provide autocomplete information for PhpStorm
|
||||
* Generated on 2020-03-07 13:24:22.
|
||||
* Generated on 2020-06-12 14:15:43.
|
||||
*
|
||||
* @author Barry vd. Heuvel <barryvdh@gmail.com>
|
||||
* @see https://github.com/barryvdh/laravel-ide-helper
|
||||
|
|
@ -13,6 +13,7 @@ namespace PHPSTORM_META {
|
|||
override(new \Illuminate\Contracts\Container\Container, map([
|
||||
'' => '@',
|
||||
'App\Services\Yard' => \App\Services\Yard::class,
|
||||
'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
|
||||
'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class,
|
||||
'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
|
||||
'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
|
||||
|
|
@ -27,13 +28,22 @@ namespace PHPSTORM_META {
|
|||
'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
|
||||
'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
|
||||
'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
|
||||
'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
|
||||
'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
|
||||
'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
|
||||
'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
|
||||
'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
|
||||
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
|
||||
'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
|
||||
'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
|
||||
'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class,
|
||||
'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class,
|
||||
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
|
||||
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
|
||||
'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
|
||||
'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
|
||||
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
|
||||
'auth' => \Illuminate\Auth\AuthManager::class,
|
||||
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
|
||||
|
|
@ -43,8 +53,6 @@ namespace PHPSTORM_META {
|
|||
'cache' => \Illuminate\Cache\CacheManager::class,
|
||||
'cache.store' => \Illuminate\Cache\Repository::class,
|
||||
'cart' => \Gloudemans\Shoppingcart\Cart::class,
|
||||
'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class,
|
||||
'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class,
|
||||
'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class,
|
||||
'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class,
|
||||
'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class,
|
||||
|
|
@ -55,9 +63,14 @@ namespace PHPSTORM_META {
|
|||
'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
|
||||
'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
|
||||
'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
|
||||
'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
|
||||
'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
|
||||
'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
|
||||
'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
|
||||
'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class,
|
||||
'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class,
|
||||
'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
|
||||
'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class,
|
||||
'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class,
|
||||
'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
|
||||
'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
|
||||
|
|
@ -82,6 +95,8 @@ namespace PHPSTORM_META {
|
|||
'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
|
||||
'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
|
||||
'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
|
||||
'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class,
|
||||
'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
|
||||
'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
|
||||
'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
|
||||
'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class,
|
||||
|
|
@ -120,15 +135,11 @@ namespace PHPSTORM_META {
|
|||
'db' => \Illuminate\Database\DatabaseManager::class,
|
||||
'db.connection' => \Illuminate\Database\MySqlConnection::class,
|
||||
'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
|
||||
'dompdf' => \Dompdf\Dompdf::class,
|
||||
'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class,
|
||||
'encrypter' => \Illuminate\Encryption\Encrypter::class,
|
||||
'events' => \Illuminate\Events\Dispatcher::class,
|
||||
'excel' => \Maatwebsite\Excel\Excel::class,
|
||||
'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class,
|
||||
'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class,
|
||||
'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class,
|
||||
'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class,
|
||||
'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class,
|
||||
'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class,
|
||||
'files' => \Illuminate\Filesystem\Filesystem::class,
|
||||
'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
|
||||
'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class,
|
||||
|
|
@ -144,7 +155,6 @@ namespace PHPSTORM_META {
|
|||
'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
|
||||
'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
|
||||
'migrator' => \Illuminate\Database\Migrations\Migrator::class,
|
||||
'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class,
|
||||
'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class,
|
||||
'queue' => \Illuminate\Queue\QueueManager::class,
|
||||
'queue.connection' => \Illuminate\Queue\SyncQueue::class,
|
||||
|
|
@ -169,6 +179,7 @@ namespace PHPSTORM_META {
|
|||
override(\Illuminate\Container\Container::makeWith(0), map([
|
||||
'' => '@',
|
||||
'App\Services\Yard' => \App\Services\Yard::class,
|
||||
'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
|
||||
'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class,
|
||||
'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
|
||||
'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
|
||||
|
|
@ -183,13 +194,22 @@ namespace PHPSTORM_META {
|
|||
'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
|
||||
'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
|
||||
'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
|
||||
'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
|
||||
'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
|
||||
'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
|
||||
'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
|
||||
'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
|
||||
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
|
||||
'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
|
||||
'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
|
||||
'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class,
|
||||
'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class,
|
||||
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
|
||||
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
|
||||
'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
|
||||
'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
|
||||
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
|
||||
'auth' => \Illuminate\Auth\AuthManager::class,
|
||||
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
|
||||
|
|
@ -199,8 +219,6 @@ namespace PHPSTORM_META {
|
|||
'cache' => \Illuminate\Cache\CacheManager::class,
|
||||
'cache.store' => \Illuminate\Cache\Repository::class,
|
||||
'cart' => \Gloudemans\Shoppingcart\Cart::class,
|
||||
'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class,
|
||||
'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class,
|
||||
'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class,
|
||||
'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class,
|
||||
'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class,
|
||||
|
|
@ -211,9 +229,14 @@ namespace PHPSTORM_META {
|
|||
'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
|
||||
'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
|
||||
'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
|
||||
'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
|
||||
'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
|
||||
'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
|
||||
'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
|
||||
'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class,
|
||||
'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class,
|
||||
'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
|
||||
'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class,
|
||||
'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class,
|
||||
'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
|
||||
'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
|
||||
|
|
@ -238,6 +261,8 @@ namespace PHPSTORM_META {
|
|||
'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
|
||||
'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
|
||||
'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
|
||||
'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class,
|
||||
'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
|
||||
'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
|
||||
'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
|
||||
'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class,
|
||||
|
|
@ -276,15 +301,11 @@ namespace PHPSTORM_META {
|
|||
'db' => \Illuminate\Database\DatabaseManager::class,
|
||||
'db.connection' => \Illuminate\Database\MySqlConnection::class,
|
||||
'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
|
||||
'dompdf' => \Dompdf\Dompdf::class,
|
||||
'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class,
|
||||
'encrypter' => \Illuminate\Encryption\Encrypter::class,
|
||||
'events' => \Illuminate\Events\Dispatcher::class,
|
||||
'excel' => \Maatwebsite\Excel\Excel::class,
|
||||
'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class,
|
||||
'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class,
|
||||
'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class,
|
||||
'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class,
|
||||
'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class,
|
||||
'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class,
|
||||
'files' => \Illuminate\Filesystem\Filesystem::class,
|
||||
'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
|
||||
'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class,
|
||||
|
|
@ -300,7 +321,6 @@ namespace PHPSTORM_META {
|
|||
'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
|
||||
'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
|
||||
'migrator' => \Illuminate\Database\Migrations\Migrator::class,
|
||||
'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class,
|
||||
'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class,
|
||||
'queue' => \Illuminate\Queue\QueueManager::class,
|
||||
'queue.connection' => \Illuminate\Queue\SyncQueue::class,
|
||||
|
|
@ -325,6 +345,7 @@ namespace PHPSTORM_META {
|
|||
override(\Illuminate\Contracts\Container\Container::make(0), map([
|
||||
'' => '@',
|
||||
'App\Services\Yard' => \App\Services\Yard::class,
|
||||
'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
|
||||
'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class,
|
||||
'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
|
||||
'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
|
||||
|
|
@ -339,13 +360,22 @@ namespace PHPSTORM_META {
|
|||
'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
|
||||
'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
|
||||
'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
|
||||
'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
|
||||
'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
|
||||
'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
|
||||
'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
|
||||
'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
|
||||
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
|
||||
'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
|
||||
'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
|
||||
'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class,
|
||||
'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class,
|
||||
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
|
||||
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
|
||||
'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
|
||||
'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
|
||||
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
|
||||
'auth' => \Illuminate\Auth\AuthManager::class,
|
||||
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
|
||||
|
|
@ -355,8 +385,6 @@ namespace PHPSTORM_META {
|
|||
'cache' => \Illuminate\Cache\CacheManager::class,
|
||||
'cache.store' => \Illuminate\Cache\Repository::class,
|
||||
'cart' => \Gloudemans\Shoppingcart\Cart::class,
|
||||
'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class,
|
||||
'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class,
|
||||
'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class,
|
||||
'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class,
|
||||
'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class,
|
||||
|
|
@ -367,9 +395,14 @@ namespace PHPSTORM_META {
|
|||
'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
|
||||
'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
|
||||
'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
|
||||
'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
|
||||
'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
|
||||
'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
|
||||
'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
|
||||
'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class,
|
||||
'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class,
|
||||
'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
|
||||
'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class,
|
||||
'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class,
|
||||
'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
|
||||
'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
|
||||
|
|
@ -394,6 +427,8 @@ namespace PHPSTORM_META {
|
|||
'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
|
||||
'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
|
||||
'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
|
||||
'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class,
|
||||
'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
|
||||
'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
|
||||
'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
|
||||
'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class,
|
||||
|
|
@ -432,15 +467,11 @@ namespace PHPSTORM_META {
|
|||
'db' => \Illuminate\Database\DatabaseManager::class,
|
||||
'db.connection' => \Illuminate\Database\MySqlConnection::class,
|
||||
'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
|
||||
'dompdf' => \Dompdf\Dompdf::class,
|
||||
'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class,
|
||||
'encrypter' => \Illuminate\Encryption\Encrypter::class,
|
||||
'events' => \Illuminate\Events\Dispatcher::class,
|
||||
'excel' => \Maatwebsite\Excel\Excel::class,
|
||||
'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class,
|
||||
'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class,
|
||||
'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class,
|
||||
'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class,
|
||||
'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class,
|
||||
'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class,
|
||||
'files' => \Illuminate\Filesystem\Filesystem::class,
|
||||
'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
|
||||
'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class,
|
||||
|
|
@ -456,7 +487,6 @@ namespace PHPSTORM_META {
|
|||
'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
|
||||
'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
|
||||
'migrator' => \Illuminate\Database\Migrations\Migrator::class,
|
||||
'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class,
|
||||
'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class,
|
||||
'queue' => \Illuminate\Queue\QueueManager::class,
|
||||
'queue.connection' => \Illuminate\Queue\SyncQueue::class,
|
||||
|
|
@ -481,6 +511,7 @@ namespace PHPSTORM_META {
|
|||
override(\Illuminate\Contracts\Container\Container::makeWith(0), map([
|
||||
'' => '@',
|
||||
'App\Services\Yard' => \App\Services\Yard::class,
|
||||
'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
|
||||
'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class,
|
||||
'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
|
||||
'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
|
||||
|
|
@ -495,13 +526,22 @@ namespace PHPSTORM_META {
|
|||
'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
|
||||
'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
|
||||
'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
|
||||
'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
|
||||
'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
|
||||
'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
|
||||
'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
|
||||
'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
|
||||
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
|
||||
'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
|
||||
'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
|
||||
'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class,
|
||||
'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class,
|
||||
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
|
||||
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
|
||||
'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
|
||||
'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
|
||||
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
|
||||
'auth' => \Illuminate\Auth\AuthManager::class,
|
||||
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
|
||||
|
|
@ -511,8 +551,6 @@ namespace PHPSTORM_META {
|
|||
'cache' => \Illuminate\Cache\CacheManager::class,
|
||||
'cache.store' => \Illuminate\Cache\Repository::class,
|
||||
'cart' => \Gloudemans\Shoppingcart\Cart::class,
|
||||
'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class,
|
||||
'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class,
|
||||
'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class,
|
||||
'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class,
|
||||
'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class,
|
||||
|
|
@ -523,9 +561,14 @@ namespace PHPSTORM_META {
|
|||
'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
|
||||
'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
|
||||
'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
|
||||
'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
|
||||
'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
|
||||
'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
|
||||
'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
|
||||
'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class,
|
||||
'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class,
|
||||
'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
|
||||
'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class,
|
||||
'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class,
|
||||
'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
|
||||
'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
|
||||
|
|
@ -550,6 +593,8 @@ namespace PHPSTORM_META {
|
|||
'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
|
||||
'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
|
||||
'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
|
||||
'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class,
|
||||
'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
|
||||
'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
|
||||
'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
|
||||
'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class,
|
||||
|
|
@ -588,15 +633,11 @@ namespace PHPSTORM_META {
|
|||
'db' => \Illuminate\Database\DatabaseManager::class,
|
||||
'db.connection' => \Illuminate\Database\MySqlConnection::class,
|
||||
'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
|
||||
'dompdf' => \Dompdf\Dompdf::class,
|
||||
'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class,
|
||||
'encrypter' => \Illuminate\Encryption\Encrypter::class,
|
||||
'events' => \Illuminate\Events\Dispatcher::class,
|
||||
'excel' => \Maatwebsite\Excel\Excel::class,
|
||||
'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class,
|
||||
'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class,
|
||||
'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class,
|
||||
'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class,
|
||||
'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class,
|
||||
'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class,
|
||||
'files' => \Illuminate\Filesystem\Filesystem::class,
|
||||
'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
|
||||
'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class,
|
||||
|
|
@ -612,7 +653,6 @@ namespace PHPSTORM_META {
|
|||
'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
|
||||
'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
|
||||
'migrator' => \Illuminate\Database\Migrations\Migrator::class,
|
||||
'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class,
|
||||
'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class,
|
||||
'queue' => \Illuminate\Queue\QueueManager::class,
|
||||
'queue.connection' => \Illuminate\Queue\SyncQueue::class,
|
||||
|
|
@ -637,6 +677,7 @@ namespace PHPSTORM_META {
|
|||
override(\App::make(0), map([
|
||||
'' => '@',
|
||||
'App\Services\Yard' => \App\Services\Yard::class,
|
||||
'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
|
||||
'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class,
|
||||
'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
|
||||
'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
|
||||
|
|
@ -651,13 +692,22 @@ namespace PHPSTORM_META {
|
|||
'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
|
||||
'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
|
||||
'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
|
||||
'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
|
||||
'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
|
||||
'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
|
||||
'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
|
||||
'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
|
||||
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
|
||||
'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
|
||||
'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
|
||||
'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class,
|
||||
'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class,
|
||||
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
|
||||
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
|
||||
'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
|
||||
'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
|
||||
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
|
||||
'auth' => \Illuminate\Auth\AuthManager::class,
|
||||
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
|
||||
|
|
@ -667,8 +717,6 @@ namespace PHPSTORM_META {
|
|||
'cache' => \Illuminate\Cache\CacheManager::class,
|
||||
'cache.store' => \Illuminate\Cache\Repository::class,
|
||||
'cart' => \Gloudemans\Shoppingcart\Cart::class,
|
||||
'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class,
|
||||
'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class,
|
||||
'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class,
|
||||
'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class,
|
||||
'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class,
|
||||
|
|
@ -679,9 +727,14 @@ namespace PHPSTORM_META {
|
|||
'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
|
||||
'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
|
||||
'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
|
||||
'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
|
||||
'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
|
||||
'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
|
||||
'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
|
||||
'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class,
|
||||
'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class,
|
||||
'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
|
||||
'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class,
|
||||
'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class,
|
||||
'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
|
||||
'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
|
||||
|
|
@ -706,6 +759,8 @@ namespace PHPSTORM_META {
|
|||
'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
|
||||
'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
|
||||
'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
|
||||
'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class,
|
||||
'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
|
||||
'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
|
||||
'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
|
||||
'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class,
|
||||
|
|
@ -744,15 +799,11 @@ namespace PHPSTORM_META {
|
|||
'db' => \Illuminate\Database\DatabaseManager::class,
|
||||
'db.connection' => \Illuminate\Database\MySqlConnection::class,
|
||||
'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
|
||||
'dompdf' => \Dompdf\Dompdf::class,
|
||||
'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class,
|
||||
'encrypter' => \Illuminate\Encryption\Encrypter::class,
|
||||
'events' => \Illuminate\Events\Dispatcher::class,
|
||||
'excel' => \Maatwebsite\Excel\Excel::class,
|
||||
'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class,
|
||||
'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class,
|
||||
'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class,
|
||||
'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class,
|
||||
'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class,
|
||||
'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class,
|
||||
'files' => \Illuminate\Filesystem\Filesystem::class,
|
||||
'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
|
||||
'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class,
|
||||
|
|
@ -768,7 +819,6 @@ namespace PHPSTORM_META {
|
|||
'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
|
||||
'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
|
||||
'migrator' => \Illuminate\Database\Migrations\Migrator::class,
|
||||
'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class,
|
||||
'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class,
|
||||
'queue' => \Illuminate\Queue\QueueManager::class,
|
||||
'queue.connection' => \Illuminate\Queue\SyncQueue::class,
|
||||
|
|
@ -793,6 +843,7 @@ namespace PHPSTORM_META {
|
|||
override(\App::makeWith(0), map([
|
||||
'' => '@',
|
||||
'App\Services\Yard' => \App\Services\Yard::class,
|
||||
'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
|
||||
'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class,
|
||||
'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
|
||||
'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
|
||||
|
|
@ -807,13 +858,22 @@ namespace PHPSTORM_META {
|
|||
'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
|
||||
'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
|
||||
'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
|
||||
'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
|
||||
'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
|
||||
'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
|
||||
'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
|
||||
'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
|
||||
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
|
||||
'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
|
||||
'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
|
||||
'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class,
|
||||
'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class,
|
||||
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
|
||||
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
|
||||
'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
|
||||
'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
|
||||
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
|
||||
'auth' => \Illuminate\Auth\AuthManager::class,
|
||||
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
|
||||
|
|
@ -823,8 +883,6 @@ namespace PHPSTORM_META {
|
|||
'cache' => \Illuminate\Cache\CacheManager::class,
|
||||
'cache.store' => \Illuminate\Cache\Repository::class,
|
||||
'cart' => \Gloudemans\Shoppingcart\Cart::class,
|
||||
'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class,
|
||||
'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class,
|
||||
'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class,
|
||||
'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class,
|
||||
'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class,
|
||||
|
|
@ -835,9 +893,14 @@ namespace PHPSTORM_META {
|
|||
'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
|
||||
'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
|
||||
'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
|
||||
'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
|
||||
'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
|
||||
'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
|
||||
'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
|
||||
'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class,
|
||||
'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class,
|
||||
'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
|
||||
'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class,
|
||||
'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class,
|
||||
'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
|
||||
'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
|
||||
|
|
@ -862,6 +925,8 @@ namespace PHPSTORM_META {
|
|||
'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
|
||||
'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
|
||||
'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
|
||||
'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class,
|
||||
'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
|
||||
'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
|
||||
'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
|
||||
'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class,
|
||||
|
|
@ -900,15 +965,11 @@ namespace PHPSTORM_META {
|
|||
'db' => \Illuminate\Database\DatabaseManager::class,
|
||||
'db.connection' => \Illuminate\Database\MySqlConnection::class,
|
||||
'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
|
||||
'dompdf' => \Dompdf\Dompdf::class,
|
||||
'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class,
|
||||
'encrypter' => \Illuminate\Encryption\Encrypter::class,
|
||||
'events' => \Illuminate\Events\Dispatcher::class,
|
||||
'excel' => \Maatwebsite\Excel\Excel::class,
|
||||
'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class,
|
||||
'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class,
|
||||
'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class,
|
||||
'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class,
|
||||
'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class,
|
||||
'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class,
|
||||
'files' => \Illuminate\Filesystem\Filesystem::class,
|
||||
'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
|
||||
'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class,
|
||||
|
|
@ -924,7 +985,6 @@ namespace PHPSTORM_META {
|
|||
'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
|
||||
'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
|
||||
'migrator' => \Illuminate\Database\Migrations\Migrator::class,
|
||||
'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class,
|
||||
'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class,
|
||||
'queue' => \Illuminate\Queue\QueueManager::class,
|
||||
'queue.connection' => \Illuminate\Queue\SyncQueue::class,
|
||||
|
|
@ -949,6 +1009,7 @@ namespace PHPSTORM_META {
|
|||
override(\app(0), map([
|
||||
'' => '@',
|
||||
'App\Services\Yard' => \App\Services\Yard::class,
|
||||
'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
|
||||
'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class,
|
||||
'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
|
||||
'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
|
||||
|
|
@ -963,13 +1024,22 @@ namespace PHPSTORM_META {
|
|||
'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
|
||||
'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
|
||||
'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
|
||||
'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
|
||||
'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
|
||||
'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
|
||||
'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
|
||||
'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
|
||||
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
|
||||
'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
|
||||
'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
|
||||
'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class,
|
||||
'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class,
|
||||
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
|
||||
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
|
||||
'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
|
||||
'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
|
||||
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
|
||||
'auth' => \Illuminate\Auth\AuthManager::class,
|
||||
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
|
||||
|
|
@ -979,8 +1049,6 @@ namespace PHPSTORM_META {
|
|||
'cache' => \Illuminate\Cache\CacheManager::class,
|
||||
'cache.store' => \Illuminate\Cache\Repository::class,
|
||||
'cart' => \Gloudemans\Shoppingcart\Cart::class,
|
||||
'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class,
|
||||
'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class,
|
||||
'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class,
|
||||
'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class,
|
||||
'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class,
|
||||
|
|
@ -991,9 +1059,14 @@ namespace PHPSTORM_META {
|
|||
'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
|
||||
'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
|
||||
'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
|
||||
'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
|
||||
'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
|
||||
'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
|
||||
'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
|
||||
'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class,
|
||||
'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class,
|
||||
'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
|
||||
'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class,
|
||||
'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class,
|
||||
'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
|
||||
'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
|
||||
|
|
@ -1018,6 +1091,8 @@ namespace PHPSTORM_META {
|
|||
'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
|
||||
'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
|
||||
'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
|
||||
'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class,
|
||||
'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
|
||||
'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
|
||||
'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
|
||||
'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class,
|
||||
|
|
@ -1056,15 +1131,11 @@ namespace PHPSTORM_META {
|
|||
'db' => \Illuminate\Database\DatabaseManager::class,
|
||||
'db.connection' => \Illuminate\Database\MySqlConnection::class,
|
||||
'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
|
||||
'dompdf' => \Dompdf\Dompdf::class,
|
||||
'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class,
|
||||
'encrypter' => \Illuminate\Encryption\Encrypter::class,
|
||||
'events' => \Illuminate\Events\Dispatcher::class,
|
||||
'excel' => \Maatwebsite\Excel\Excel::class,
|
||||
'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class,
|
||||
'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class,
|
||||
'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class,
|
||||
'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class,
|
||||
'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class,
|
||||
'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class,
|
||||
'files' => \Illuminate\Filesystem\Filesystem::class,
|
||||
'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
|
||||
'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class,
|
||||
|
|
@ -1080,7 +1151,6 @@ namespace PHPSTORM_META {
|
|||
'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
|
||||
'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
|
||||
'migrator' => \Illuminate\Database\Migrations\Migrator::class,
|
||||
'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class,
|
||||
'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class,
|
||||
'queue' => \Illuminate\Queue\QueueManager::class,
|
||||
'queue.connection' => \Illuminate\Queue\SyncQueue::class,
|
||||
|
|
@ -1105,6 +1175,7 @@ namespace PHPSTORM_META {
|
|||
override(\resolve(0), map([
|
||||
'' => '@',
|
||||
'App\Services\Yard' => \App\Services\Yard::class,
|
||||
'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
|
||||
'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class,
|
||||
'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
|
||||
'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
|
||||
|
|
@ -1119,13 +1190,22 @@ namespace PHPSTORM_META {
|
|||
'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
|
||||
'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
|
||||
'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
|
||||
'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
|
||||
'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
|
||||
'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
|
||||
'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
|
||||
'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
|
||||
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
|
||||
'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
|
||||
'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
|
||||
'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class,
|
||||
'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class,
|
||||
'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class,
|
||||
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
|
||||
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
|
||||
'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
|
||||
'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
|
||||
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
|
||||
'auth' => \Illuminate\Auth\AuthManager::class,
|
||||
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
|
||||
|
|
@ -1135,8 +1215,6 @@ namespace PHPSTORM_META {
|
|||
'cache' => \Illuminate\Cache\CacheManager::class,
|
||||
'cache.store' => \Illuminate\Cache\Repository::class,
|
||||
'cart' => \Gloudemans\Shoppingcart\Cart::class,
|
||||
'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class,
|
||||
'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class,
|
||||
'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class,
|
||||
'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class,
|
||||
'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class,
|
||||
|
|
@ -1147,9 +1225,14 @@ namespace PHPSTORM_META {
|
|||
'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
|
||||
'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
|
||||
'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
|
||||
'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
|
||||
'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
|
||||
'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
|
||||
'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
|
||||
'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class,
|
||||
'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class,
|
||||
'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
|
||||
'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class,
|
||||
'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class,
|
||||
'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
|
||||
'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
|
||||
|
|
@ -1174,6 +1257,8 @@ namespace PHPSTORM_META {
|
|||
'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
|
||||
'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
|
||||
'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
|
||||
'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class,
|
||||
'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
|
||||
'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
|
||||
'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
|
||||
'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class,
|
||||
|
|
@ -1212,15 +1297,11 @@ namespace PHPSTORM_META {
|
|||
'db' => \Illuminate\Database\DatabaseManager::class,
|
||||
'db.connection' => \Illuminate\Database\MySqlConnection::class,
|
||||
'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
|
||||
'dompdf' => \Dompdf\Dompdf::class,
|
||||
'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class,
|
||||
'encrypter' => \Illuminate\Encryption\Encrypter::class,
|
||||
'events' => \Illuminate\Events\Dispatcher::class,
|
||||
'excel' => \Maatwebsite\Excel\Excel::class,
|
||||
'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class,
|
||||
'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class,
|
||||
'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class,
|
||||
'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class,
|
||||
'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class,
|
||||
'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class,
|
||||
'files' => \Illuminate\Filesystem\Filesystem::class,
|
||||
'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
|
||||
'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class,
|
||||
|
|
@ -1236,7 +1317,6 @@ namespace PHPSTORM_META {
|
|||
'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
|
||||
'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
|
||||
'migrator' => \Illuminate\Database\Migrations\Migrator::class,
|
||||
'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class,
|
||||
'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class,
|
||||
'queue' => \Illuminate\Queue\QueueManager::class,
|
||||
'queue.connection' => \Illuminate\Queue\SyncQueue::class,
|
||||
|
|
|
|||
BIN
.rnd
Normal file
BIN
.rnd
Normal file
Binary file not shown.
6655
_ide_helper.php
6655
_ide_helper.php
File diff suppressed because it is too large
Load diff
|
|
@ -88,9 +88,31 @@ namespace App{
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereMLevel($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereMSponsor($value)
|
||||
* @property string|null $release_account
|
||||
* @property int|null $payment_order_id
|
||||
* @property int|null $abo_options
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\File[] $files
|
||||
* @property-read int|null $files_count
|
||||
* @property-read \App\Models\Product|null $payment_order
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrder[] $shopping_orders
|
||||
* @property-read int|null $shopping_orders_count
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereAboOptions($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\User wherePaymentOrderId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereReleaseAccount($value)
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\UserHistory[] $user_histories
|
||||
* @property-read int|null $user_histories_count
|
||||
* @property int|null $test_mode
|
||||
* @property array|null $settings
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrder[] $member_shopping_orders
|
||||
* @property-read int|null $member_shopping_orders_count
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingUser[] $member_shopping_users
|
||||
* @property-read int|null $member_shopping_users_count
|
||||
* @property-read \App\Models\Product|null $payment_order_product
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereSettings($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereTestMode($value)
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\Laravel\Passport\Client[] $clients
|
||||
* @property-read int|null $clients_count
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\Laravel\Passport\Token[] $tokens
|
||||
* @property-read int|null $tokens_count
|
||||
*/
|
||||
class User extends \Eloquent {}
|
||||
}
|
||||
|
|
@ -192,6 +214,13 @@ namespace App\Models{
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrderItem whereSlug($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrderItem whereUpdatedAt($value)
|
||||
* @mixin \Eloquent
|
||||
* @property \Illuminate\Support\Carbon|null $deleted_at
|
||||
* @property string|null $user_deleted_at
|
||||
* @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrderItem onlyTrashed()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrderItem whereDeletedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrderItem whereUserDeletedAt($value)
|
||||
* @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrderItem withTrashed()
|
||||
* @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrderItem withoutTrashed()
|
||||
*/
|
||||
class ShoppingOrderItem extends \Eloquent {}
|
||||
}
|
||||
|
|
@ -252,6 +281,18 @@ namespace App\Models{
|
|||
class ShippingPrice extends \Eloquent {}
|
||||
}
|
||||
|
||||
namespace App\Models{
|
||||
/**
|
||||
* App\Models\Import
|
||||
*
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Import newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Import newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Import query()
|
||||
* @mixin \Eloquent
|
||||
*/
|
||||
class Import extends \Eloquent {}
|
||||
}
|
||||
|
||||
namespace App\Models{
|
||||
/**
|
||||
* App\Models\ShoppingUser
|
||||
|
|
@ -322,6 +363,35 @@ namespace App\Models{
|
|||
* @property-read \App\Models\ShoppingOrder $shopping_order
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrder[] $shopping_orders
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereOrders($value)
|
||||
* @property int|null $abo_options
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereAboOptions($value)
|
||||
* @property int|null $member_id
|
||||
* @property int|null $number
|
||||
* @property bool $is_like
|
||||
* @property array|null $notice
|
||||
* @property-read \App\User|null $auth_user
|
||||
* @property-read \App\User|null $member
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereIsLike($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereMemberId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereNotice($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereNumber($value)
|
||||
* @property bool|null $has_buyed
|
||||
* @property bool|null $subscribed
|
||||
* @property int|null $wp_order_number
|
||||
* @property string|null $wp_order_date
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereHasBuyed($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereSubscribed($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereWpOrderDate($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereWpOrderNumber($value)
|
||||
* @property \Illuminate\Support\Carbon|null $deleted_at
|
||||
* @property string|null $user_deleted_at
|
||||
* @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingUser onlyTrashed()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereDeletedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereUserDeletedAt($value)
|
||||
* @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingUser withTrashed()
|
||||
* @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingUser withoutTrashed()
|
||||
* @property string|null $mode
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereMode($value)
|
||||
*/
|
||||
class ShoppingUser extends \Eloquent {}
|
||||
}
|
||||
|
|
@ -351,6 +421,8 @@ namespace App\Models{
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereUpdatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereUserShopId($value)
|
||||
* @mixin \Eloquent
|
||||
* @property int|null $payment
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance wherePayment($value)
|
||||
*/
|
||||
class ShoppingInstance extends \Eloquent {}
|
||||
}
|
||||
|
|
@ -440,10 +512,60 @@ namespace App\Models{
|
|||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProductImage[] $imagesActive
|
||||
* @property-read int|null $images_active_count
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product wherePoints($value)
|
||||
* @property string|null $identifier
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereIdentifier($value)
|
||||
* @property int|null $upgrade_to_id
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereUpgradeToId($value)
|
||||
* @property int|null $contents_total
|
||||
* @property int|null $unit
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereContentsTotal($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereUnit($value)
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\CountryPrice[] $country_prices
|
||||
* @property-read int|null $country_prices_count
|
||||
* @property int|null $wp_number
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereWpNumber($value)
|
||||
*/
|
||||
class Product extends \Eloquent {}
|
||||
}
|
||||
|
||||
namespace App\Models{
|
||||
/**
|
||||
* Class UserHistory
|
||||
*
|
||||
* @property int $id
|
||||
* @property int $user_id
|
||||
* @property int $shopping_order_id
|
||||
* @property int $product_id
|
||||
* @property string $action
|
||||
* @property int $referenz
|
||||
* @property int $status
|
||||
* @property Carbon $created_at
|
||||
* @property Carbon $updated_at
|
||||
* @property Product $product
|
||||
* @property ShoppingOrder $shopping_order
|
||||
* @property User $user
|
||||
* @package App\Models
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory query()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereAction($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereCreatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereProductId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereReferenz($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereShoppingOrderId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereStatus($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereUpdatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereUserId($value)
|
||||
* @mixin \Eloquent
|
||||
* @property string|null $identifier
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereIdentifier($value)
|
||||
* @property int|null $abo_options
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereAboOptions($value)
|
||||
*/
|
||||
class UserHistory extends \Eloquent {}
|
||||
}
|
||||
|
||||
namespace App\Models{
|
||||
/**
|
||||
* App\Models\Shipping
|
||||
|
|
@ -540,6 +662,21 @@ namespace App\Models{
|
|||
* @property array|null $attr
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereAttr($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereTransName($value)
|
||||
* @property bool|null $switch
|
||||
* @property bool|null $own_eur
|
||||
* @property bool|null $currency
|
||||
* @property string|null $currency_unit
|
||||
* @property bool|null $currency_calc
|
||||
* @property float|null $currency_faktor
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrency($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyCalc($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyFaktor($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyName($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereOwnEur($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereSwitch($value)
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\CountryPrice[] $country_prices
|
||||
* @property-read int|null $country_prices_count
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyUnit($value)
|
||||
*/
|
||||
class Country extends \Eloquent {}
|
||||
}
|
||||
|
|
@ -613,10 +750,53 @@ namespace App\Models{
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereSize($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereUpdatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereUserId($value)
|
||||
* @mixin \Eloquent
|
||||
*/
|
||||
class File extends \Eloquent {}
|
||||
}
|
||||
|
||||
namespace App\Models{
|
||||
/**
|
||||
* Class UserMessage
|
||||
*
|
||||
* @property int $id
|
||||
* @property int $user_id
|
||||
* @property int $send_user_id
|
||||
* @property string $email
|
||||
* @property string $subject
|
||||
* @property string $message
|
||||
* @property bool $send
|
||||
* @property bool $fail
|
||||
* @property string $error
|
||||
* @property Carbon $sent_at
|
||||
* @property Carbon $scheduled_at
|
||||
* @property Carbon $delivered_at
|
||||
* @property Carbon $created_at
|
||||
* @property Carbon $updated_at
|
||||
* @property User $user
|
||||
* @package App\Models
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage query()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereCreatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereDeliveredAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereEmail($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereError($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereFail($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereMessage($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereScheduledAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSend($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSendUserId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSentAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSubject($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereUpdatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereUserId($value)
|
||||
* @mixin \Eloquent
|
||||
*/
|
||||
class UserMessage extends \Eloquent {}
|
||||
}
|
||||
|
||||
namespace App\Models{
|
||||
/**
|
||||
* App\Models\ShoppingPayment
|
||||
|
|
@ -652,6 +832,8 @@ namespace App\Models{
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereUpdatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereWallettype($value)
|
||||
* @mixin \Eloquent
|
||||
* @property string|null $mode
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereMode($value)
|
||||
*/
|
||||
class ShoppingPayment extends \Eloquent {}
|
||||
}
|
||||
|
|
@ -693,6 +875,8 @@ namespace App\Models{
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereUpdatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereUserid($value)
|
||||
* @mixin \Eloquent
|
||||
* @property string|null $mode
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereMode($value)
|
||||
*/
|
||||
class PaymentTransaction extends \Eloquent {}
|
||||
}
|
||||
|
|
@ -732,54 +916,36 @@ namespace App\Models{
|
|||
|
||||
namespace App\Models{
|
||||
/**
|
||||
* App\Models\ShoppingOrder
|
||||
* Class CountryPrice
|
||||
*
|
||||
* @property int $id
|
||||
* @property int $shopping_user_id
|
||||
* @property int|null $auth_user_id
|
||||
* @property int $country_id
|
||||
* @property int $user_shop_id
|
||||
* @property float|null $total
|
||||
* @property float|null $shipping
|
||||
* @property float|null $subtotal
|
||||
* @property float|null $tax_rate
|
||||
* @property float|null $tax
|
||||
* @property float|null $total_shipping
|
||||
* @property int|null $weight
|
||||
* @property int|null $paid
|
||||
* @property string|null $txaction
|
||||
* @property \Illuminate\Support\Carbon|null $created_at
|
||||
* @property \Illuminate\Support\Carbon|null $updated_at
|
||||
* @property-read \App\User|null $auth_user
|
||||
* @property-read \App\Models\Country $country
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrderItem[] $shopping_order_items
|
||||
* @property-read int|null $shopping_order_items_count
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingPayment[] $shopping_payments
|
||||
* @property-read int|null $shopping_payments_count
|
||||
* @property-read \App\Models\ShoppingUser $shopping_user
|
||||
* @property-read \App\Models\UserShop $user_shop
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder query()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereAuthUserId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereCountryId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereCreatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder wherePaid($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereShipping($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereShoppingUserId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereSubtotal($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereTax($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereTaxRate($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereTotal($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereTotalShipping($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereTxaction($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereUpdatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereUserShopId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereWeight($value)
|
||||
* @property int $product_id
|
||||
* @property float $c_price
|
||||
* @property float $c_tax
|
||||
* @property float $c_price_old
|
||||
* @property float $c_currency
|
||||
* @property Carbon $created_at
|
||||
* @property Carbon $updated_at
|
||||
* @property Country $country
|
||||
* @property Product $product
|
||||
* @package App\Models
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice query()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCOwnEur($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCPrice($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCPriceOld($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCTax($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCountryId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCreatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereProductId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereUpdatedAt($value)
|
||||
* @mixin \Eloquent
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCCurrency($value)
|
||||
*/
|
||||
class ShoppingOrder extends \Eloquent {}
|
||||
class CountryPrice extends \Eloquent {}
|
||||
}
|
||||
|
||||
namespace App\Models{
|
||||
|
|
@ -958,6 +1124,12 @@ namespace App\Models{
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMNotes($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMSalutation($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereTaxableSales($value)
|
||||
* @property array|null $payment_data
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount wherePaymentData($value)
|
||||
* @property string|null $accepted_contract
|
||||
* @property array|null $notice
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereAcceptedContract($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereNotice($value)
|
||||
*/
|
||||
class UserAccount extends \Eloquent {}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,8 +9,7 @@ use App\Repositories\UserRepository;
|
|||
use App\User;
|
||||
use Auth;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Input;
|
||||
use Illuminate\Http\Request;
|
||||
use Request;
|
||||
use Validator;
|
||||
|
||||
|
||||
|
|
@ -59,7 +58,7 @@ class AdminUserController extends Controller
|
|||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
$user = User::findOrFail($data['id']);
|
||||
|
||||
if(isset($data['save-admin'])){
|
||||
|
|
|
|||
103
app/Http/Controllers/Api/AuthController.php
Executable file
103
app/Http/Controllers/Api/AuthController.php
Executable file
|
|
@ -0,0 +1,103 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Api;
|
||||
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Carbon\Carbon;
|
||||
|
||||
|
||||
|
||||
class AuthController extends Controller
|
||||
{
|
||||
|
||||
//protected static API_MAIL = 'api.thomas.krummel@gmail.com';
|
||||
//protected static API_PASS = 'UF(Q<9knap!ev3vH?5~!b8DP';
|
||||
//protected static API_URL = 'https://mein.sterntours.test/api/';
|
||||
|
||||
|
||||
public $successStatus = 200;
|
||||
|
||||
|
||||
public function login(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'email' => 'required|string|email',
|
||||
'password' => 'required|string',
|
||||
'remember_me' => 'boolean'
|
||||
]);
|
||||
$credentials = request(['email', 'password']);
|
||||
|
||||
if (!Auth::attempt($credentials))
|
||||
return response()->json([
|
||||
'message' => 'Unauthorized'
|
||||
], 401);
|
||||
$user = $request->user();
|
||||
|
||||
$tokenResult = $user->createToken('Personal Access Token');
|
||||
$token = $tokenResult->token;
|
||||
|
||||
if ($request->remember_me){
|
||||
$token->expires_at = Carbon::now()->addWeeks(1);
|
||||
}else{
|
||||
$token->expires_at = Carbon::now()->addDays(1);
|
||||
}
|
||||
|
||||
$token->save();
|
||||
return response()->json([
|
||||
'access_token' => $tokenResult->accessToken,
|
||||
'token_type' => 'Bearer',
|
||||
'expires_at' => Carbon::parse(
|
||||
$tokenResult->token->expires_at
|
||||
)->toDateTimeString()
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
public function checked(Request $request)
|
||||
{
|
||||
return response()->json([
|
||||
'message' => 'login'
|
||||
]);
|
||||
}
|
||||
|
||||
public function logout(Request $request)
|
||||
{
|
||||
$request->user()->token()->revoke();
|
||||
return response()->json([
|
||||
'message' => 'Successfully logged out'
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the authenticated User
|
||||
*
|
||||
* @return [json] user object
|
||||
*/
|
||||
/* public function user(Request $request)
|
||||
{
|
||||
return response()->json($request->user());
|
||||
}
|
||||
*/
|
||||
|
||||
/*public function signup(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'name' => 'required|string',
|
||||
'email' => 'required|string|email|unique:users',
|
||||
'password' => 'required|string|confirmed'
|
||||
]);
|
||||
$user = new User([
|
||||
'name' => $request->name,
|
||||
'email' => $request->email,
|
||||
'password' => Hash::make($request->password),
|
||||
]);
|
||||
$user->save();
|
||||
return response()->json([
|
||||
'message' => 'Successfully created user!'
|
||||
], 201);
|
||||
}*/
|
||||
|
||||
}
|
||||
|
|
@ -4,7 +4,6 @@ namespace App\Http\Controllers\Api;
|
|||
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Input;
|
||||
use Session;
|
||||
use \SoapClient;
|
||||
|
||||
|
|
|
|||
526
app/Http/Controllers/Api/ShoppingUserController.php
Executable file
526
app/Http/Controllers/Api/ShoppingUserController.php
Executable file
|
|
@ -0,0 +1,526 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Api;
|
||||
|
||||
use App\Models\Country;
|
||||
use App\Models\Product;
|
||||
use App\Models\ShippingCountry;
|
||||
use App\Models\ShoppingOrder;
|
||||
use App\Models\ShoppingOrderItem;
|
||||
use App\Models\ShoppingUser;
|
||||
use App\Services\CustomerPriority;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Carbon\Carbon;
|
||||
use PHPUnit\Framework\Constraint\Count;
|
||||
use Yard;
|
||||
|
||||
|
||||
class ShoppingUserController extends Controller
|
||||
{
|
||||
|
||||
//protected static API_MAIL = 'api.thomas.krummel@gmail.com';
|
||||
//protected static API_PASS = 'UF(Q<9knap!ev3vH?5~!b8DP';
|
||||
|
||||
|
||||
protected $successStatus = 200;
|
||||
protected $member_id = 3; //thomas.krummel@gmail.com
|
||||
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* wp_order_numbers[1234, 1234]
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function status(Request $request)
|
||||
{
|
||||
//$this->member_id = auth()->user()->m_sponsor;
|
||||
|
||||
$request->validate([
|
||||
'wp_order_numbers' => 'required',
|
||||
]);
|
||||
|
||||
$wp_order_numbers = json_decode($request->wp_order_numbers);
|
||||
|
||||
|
||||
if(!$wp_order_numbers || !is_array($wp_order_numbers)){
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'wp_order_numbers need as json [1234, 1234] ',
|
||||
'time' => Carbon::now()->toDateTimeString()
|
||||
], 400);
|
||||
}
|
||||
$status = [];
|
||||
foreach ($wp_order_numbers as $wp_order_number){
|
||||
$shopping_user = ShoppingUser::where('wp_order_number', '=', $wp_order_number)->first();
|
||||
$status[] = [
|
||||
'wp_order_number' => $wp_order_number,
|
||||
'user' => $shopping_user ? true : false,
|
||||
'order' => ($shopping_user && $shopping_user->shopping_order) ? true : false,
|
||||
'status' => 'open | sent | ...',
|
||||
];
|
||||
}
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'data' => $status,
|
||||
'time' => Carbon::now()->toDateTimeString()
|
||||
], 200);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* wp_order_numbers [1234, 1234]
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function show(Request $request)
|
||||
{
|
||||
//$this->member_id = auth()->user()->m_sponsor;
|
||||
$request->validate([
|
||||
'wp_order_numbers' => 'required',
|
||||
]);
|
||||
|
||||
$wp_order_numbers = json_decode($request->wp_order_numbers);
|
||||
|
||||
if(!$wp_order_numbers || !is_array($wp_order_numbers)){
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'wp_order_numbers need as json [1234, 1234] ',
|
||||
'time' => Carbon::now()->toDateTimeString()
|
||||
], 400);
|
||||
}
|
||||
$data = [];
|
||||
|
||||
foreach ($wp_order_numbers as $wp_order_number){
|
||||
$shopping_user = ShoppingUser::where('wp_order_number', '=', $wp_order_number)->first();
|
||||
$user = false;
|
||||
$order = false;
|
||||
if ($shopping_user) {
|
||||
$user = $this->prepareForShow($shopping_user);
|
||||
$order = $this->prepareForShowOrder($shopping_user->shopping_order);
|
||||
}
|
||||
$data[] = [
|
||||
'wp_order_number' => $wp_order_number,
|
||||
'user' => $user,
|
||||
'order' => $order,
|
||||
'customer_number' => $shopping_user ? $shopping_user->number : false,
|
||||
'member_email' => ($shopping_user && $shopping_user->member) ? $shopping_user->member->email : false,
|
||||
'status' => 'open | sent | ...',
|
||||
];
|
||||
}
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'data' => $data,
|
||||
'time' => Carbon::now()->toDateTimeString()
|
||||
], 200);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'billing_email' => 'required|string|email',
|
||||
'billing_firstname' => 'required|string',
|
||||
'billing_lastname' => 'required|string',
|
||||
'billing_address' => 'required|string',
|
||||
'billing_zipcode' => 'required|string',
|
||||
'billing_city' => 'required|string',
|
||||
'billing_country_code' => 'required|string',
|
||||
'wp_order_number' => 'required|int|unique:shopping_users,wp_order_number',
|
||||
'wp_order_date' => 'required|date',
|
||||
]);
|
||||
|
||||
$this->member_id = auth()->user()->m_sponsor;
|
||||
|
||||
$data = $this->prepareForStore($request->all());
|
||||
$data['member_id'] = $this->member_id ;
|
||||
$data['number'] = ShoppingUser::max('number') + 1;
|
||||
$data['mode'] = $request->mode ? $request->mode : 'live';
|
||||
|
||||
$shopping_user = ShoppingUser::create($data);
|
||||
|
||||
//Kundenhoheit prüfen
|
||||
$priority = CustomerPriority::checkOne($shopping_user, true, false);
|
||||
\App\Services\Shop::newUserOrder($shopping_user->number);
|
||||
//exists //like //update
|
||||
$user = $this->prepareForShow($shopping_user);
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'data' => [
|
||||
'wp_order_number' => $shopping_user->wp_order_number,
|
||||
'user' => $user,
|
||||
'customer_priority' => $priority,
|
||||
'customer_number' => $shopping_user->number,
|
||||
'member_email' => $shopping_user->member->email
|
||||
],
|
||||
'time' => Carbon::now()->toDateTimeString()
|
||||
], 200);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function update(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'wp_order_number' => 'required|int',
|
||||
]);
|
||||
$shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->first();
|
||||
if (!$shopping_user) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' not found',
|
||||
'time' => Carbon::now()->toDateTimeString()
|
||||
], 400);
|
||||
}
|
||||
|
||||
$data = $this->prepareForUpdate($request->all());
|
||||
//Kundenhoheit prüfen
|
||||
$priority = CustomerPriority::checkChangeOne($shopping_user, $data, true);
|
||||
$updated = $shopping_user->fill($data)->save();
|
||||
\App\Services\Shop::newUserOrder($shopping_user->number);
|
||||
|
||||
if ($updated){
|
||||
$user = $this->prepareForShow($shopping_user);
|
||||
$order = $this->prepareForShowOrder($shopping_user->shopping_order);
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'data' => [
|
||||
'wp_order_number' => $shopping_user->wp_order_number,
|
||||
'user' => $user,
|
||||
'order' => $order,
|
||||
'customer_priority' => $priority,
|
||||
'customer_number' => $shopping_user ? $shopping_user->number : false,
|
||||
'member_email' => ($shopping_user && $shopping_user->member) ? $shopping_user->member->email : false,
|
||||
'status' => 'open | sent | ...',
|
||||
],
|
||||
'time' => Carbon::now()->toDateTimeString()
|
||||
], 200);
|
||||
}
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Entry could not be updated'
|
||||
], 500);
|
||||
}
|
||||
|
||||
public function order(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'wp_order_number' => 'required|int',
|
||||
'wp_order' => 'required',
|
||||
]);
|
||||
|
||||
$shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->first();
|
||||
if (!$shopping_user) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' not found',
|
||||
'time' => Carbon::now()->toDateTimeString()
|
||||
], 400);
|
||||
}
|
||||
|
||||
if($shopping_user->shopping_order){
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Order with wp_order_number ' . $request->wp_order_number . ' exists',
|
||||
'time' => Carbon::now()->toDateTimeString()
|
||||
], 400);
|
||||
}
|
||||
|
||||
$wp_order = json_decode($request->wp_order);
|
||||
$wp_order = $this->prepareOrder($wp_order, $shopping_user);
|
||||
if ($wp_order){
|
||||
$user = $this->prepareForShow($shopping_user);
|
||||
$order = $this->prepareForShowOrder($shopping_user->shopping_order);
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'data' => [
|
||||
'wp_order_number' => $shopping_user->wp_order_number,
|
||||
'wp_order' => $wp_order,
|
||||
'user' => $user,
|
||||
'order' => $order,
|
||||
'customer_number' => $shopping_user->number,
|
||||
'member_email' => $shopping_user->member->email,
|
||||
],
|
||||
'time' => Carbon::now()->toDateTimeString()
|
||||
], 200);
|
||||
}
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Order could not be stored'
|
||||
], 500);
|
||||
}
|
||||
|
||||
public function delete(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'wp_order_number' => 'required|int',
|
||||
]);
|
||||
$shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->where('mode', '=', 'dev')->first();
|
||||
if (!$shopping_user) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' not found or mode != dev',
|
||||
'time' => Carbon::now()->toDateTimeString()
|
||||
], 400);
|
||||
}
|
||||
$shopping_order = $shopping_user->shopping_order;
|
||||
if($shopping_order){
|
||||
foreach ($shopping_order->shopping_order_items as $shopping_order_item){
|
||||
$shopping_order_item->delete();
|
||||
}
|
||||
$shopping_order->delete();
|
||||
}
|
||||
if ($shopping_user->delete()) {
|
||||
return response()->json([
|
||||
'success' => true
|
||||
]);
|
||||
}
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Entry could not be deleted'
|
||||
], 500);
|
||||
}
|
||||
|
||||
private function prepareForShow($shopping_user){
|
||||
|
||||
if(!$shopping_user){
|
||||
return false;
|
||||
}
|
||||
|
||||
$shopping_user_data = $shopping_user->toArray();
|
||||
$needs = ['wp_order_number', 'wp_order_date', 'billing_company', 'billing_firstname', 'billing_lastname', 'billing_address', 'billing_address_2', 'billing_zipcode', 'billing_city', 'billing_phone', 'billing_email',
|
||||
'same_as_billing', 'shipping_company', 'shipping_firstname', 'shipping_lastname', 'shipping_address', 'shipping_address_2', 'shipping_zipcode', 'shipping_city', 'shipping_phone',
|
||||
'created_at', 'updated_at', 'user_deleted_at']; //'has_buyed', 'subscribed',
|
||||
|
||||
//$salutation = array('mr' => 1, 'ms' => 2);
|
||||
$ret = [];
|
||||
foreach ($shopping_user_data as $key=>$value){
|
||||
|
||||
if($key === 'billing_country_id'){
|
||||
$ret['billing_country_code'] = $shopping_user->billing_country_id ? $shopping_user->billing_country->code : null;
|
||||
}
|
||||
if($key === 'shipping_country_id'){
|
||||
$ret['shipping_country_code'] = $shopping_user->shipping_country_id ? $shopping_user->shipping_country->code : null;
|
||||
}
|
||||
if($key === 'billing_salutation'){
|
||||
$ret['billing_salutation'] = $shopping_user->billing_salutation === 'ms' ? 2 : 1;
|
||||
}
|
||||
if($key === 'shipping_salutation'){
|
||||
$ret['shipping_salutation'] = $shopping_user->shipping_salutation === 'ms' ? 2 : 1;
|
||||
}
|
||||
|
||||
if(in_array($key, $needs)){
|
||||
$ret[$key] = $value;
|
||||
}
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
private function prepareForShowOrder($shopping_order){
|
||||
|
||||
if(!$shopping_order){
|
||||
return false;
|
||||
}
|
||||
$ret = [
|
||||
'country' => isset($shopping_order->shipping_country->country->code) ? $shopping_order->shipping_country->country->code : '',
|
||||
'total' => ($shopping_order->total*100),
|
||||
'shipping' => ($shopping_order->shipping*100),
|
||||
'total_net' => ($shopping_order->subtotal*100),
|
||||
'tax_rate' => ($shopping_order->tax_rate*100),
|
||||
'tax' => ($shopping_order->tax*100),
|
||||
'total_with_shipping' => ($shopping_order->total_shipping*100),
|
||||
'weight' => $shopping_order->weight,
|
||||
];
|
||||
$ret['items'] = [];
|
||||
foreach ($shopping_order->shopping_order_items as $item){
|
||||
$ret['items'][] = [
|
||||
'article' => $item->product->wp_number,
|
||||
'name' => $item->product->name,
|
||||
'qty' => $item->qty,
|
||||
'price' => ($item->price * 100),
|
||||
];
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
private function prepareForUpdate($data){
|
||||
|
||||
//$salutation = array(1 => 'mr', 2 => 'ms', 3=>null);
|
||||
$ret = [];
|
||||
$needs = [ 'billing_salutation', 'billing_company', 'billing_firstname', 'billing_lastname', 'billing_address', 'billing_address_2', 'billing_zipcode', 'billing_city', 'billing_phone', 'billing_email',
|
||||
'shipping_salutation', 'shipping_company', 'shipping_firstname', 'shipping_lastname', 'shipping_address', 'shipping_address_2', 'shipping_zipcode', 'shipping_city', 'shipping_phone'];
|
||||
|
||||
foreach ($data as $key=>$value){
|
||||
|
||||
if($key === 'billing_salutation') {
|
||||
$ret['billing_salutation'] = $data['billing_salutation'] == 2 ? 'ms' : 'mr';
|
||||
}
|
||||
if($key === 'shipping_salutation') {
|
||||
$ret['shipping_salutation'] = $data['shipping_salutation'] == 2 ? 'ms' : 'mr';
|
||||
}
|
||||
if($key === 'billing_country_code' && isset($data['billing_country_code'])) {
|
||||
$ret['billing_country_id'] = Country::getCountryIdByCodeOrOne($data['billing_country_code']);
|
||||
}
|
||||
if($key === 'shipping_country_code' && isset($data['shipping_country_code']) ) {
|
||||
$ret['shipping_country_id'] = Country::getCountryIdByCodeOrOne($data['shipping_country_code']);
|
||||
}
|
||||
if($key === 'billing_phone') {
|
||||
$ret['billing_phone'] = strlen($data['billing_phone']) <= 3 ? '' : $data['billing_phone'];
|
||||
}
|
||||
if($key === 'shipping_phone') {
|
||||
$ret['shipping_phone'] = strlen($data['shipping_phone']) <= 3 ? '' : $data['shipping_phone'];
|
||||
}
|
||||
if(in_array($key, $needs)){
|
||||
$ret[$key] = $value;
|
||||
}
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
private function prepareForStore($data){
|
||||
|
||||
//$salutation = array(1 => 'mr', 2 => 'ms', 3=>null);
|
||||
$ret = [];
|
||||
$needs = [ 'billing_salutation', 'billing_company', 'billing_firstname', 'billing_lastname', 'billing_address', 'billing_address_2', 'billing_zipcode', 'billing_city', 'billing_country_id', 'billing_phone', 'billing_email',
|
||||
'shipping_salutation', 'shipping_company', 'shipping_firstname', 'shipping_lastname', 'shipping_address', 'shipping_address_2', 'shipping_zipcode', 'shipping_city', 'shipping_country_id', 'shipping_phone',
|
||||
//'same_as_billing', 'has_buyed', 'subscribed',
|
||||
'wp_order_number', 'wp_order_date'];
|
||||
|
||||
foreach ($needs as $need){
|
||||
|
||||
$ret[$need] = isset($data[$need]) ? $data[$need] : null;
|
||||
|
||||
if ($need === 'billing_salutation' && $ret[$need] !== null) {
|
||||
$ret['billing_salutation'] = $ret['billing_salutation'] == 2 ? 'ms' : 'mr';
|
||||
}
|
||||
if ($need === 'shipping_salutation' && $ret[$need] !== null) {
|
||||
$ret['shipping_salutation'] = $ret['shipping_salutation'] == 2 ? 'ms' : 'mr';
|
||||
}
|
||||
if ($need === 'billing_country_id') {
|
||||
$ret['billing_country_id'] = isset($data['billing_country_code']) ? Country::getCountryIdByCodeOrOne($data['billing_country_code']) : 1;
|
||||
}
|
||||
if ($need === 'shipping_country_id') {
|
||||
$ret['shipping_country_id'] = isset($data['shipping_country_code']) ? Country::getCountryIdByCodeOrOne($data['shipping_country_code']) : $ret['billing_country_id'];
|
||||
}
|
||||
if ($need === 'billing_phone' && $ret[$need] !== null) {
|
||||
$ret['billing_phone'] = strlen($data['billing_phone']) <= 3 ? '' : $data['billing_phone'];
|
||||
}
|
||||
if ($need === 'shipping_phone' && $ret[$need] !== null) {
|
||||
$ret['shipping_phone'] = strlen($data['shipping_phone']) <= 3 ? '' : $data['shipping_phone'];
|
||||
}
|
||||
if ($need === 'wp_order_date') {
|
||||
$ret['wp_order_date'] = Carbon::parse($ret['wp_order_date'])->toDateTimeString();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
$ret['same_as_billing'] = $ret['shipping_lastname'] !== null ? true : false;
|
||||
$ret['has_buyed'] = true;
|
||||
$ret['subscribed'] = false;
|
||||
return $ret;
|
||||
}
|
||||
|
||||
private function prepareOrder($wp_shopping_order, $shopping_user){
|
||||
Yard::instance('shopping')->destroy();
|
||||
$ret = [];
|
||||
|
||||
if(is_array($wp_shopping_order)){
|
||||
foreach ($wp_shopping_order as $order) {
|
||||
$error = [];
|
||||
if (!isset($order->article) || !isset($order->qty) || !isset($order->price)) {
|
||||
$error[] = "article parameter is missing";
|
||||
} else {
|
||||
|
||||
$product = Product::whereWpNumber($order->article)->first();
|
||||
if (!$product) {
|
||||
$error[] = "article not found";
|
||||
} else {
|
||||
if ($order->price != ($product->price * 100)) {
|
||||
$error[] = "different price: " . ($product->price * 100);
|
||||
}
|
||||
Yard::instance('shopping')->add($product->id, $product->name, (int) $order->qty, $product->price, ['image' => [], 'slug' => $product->slug, 'weight' => $product->weight]);
|
||||
}
|
||||
}
|
||||
$order->message = $error;
|
||||
$ret[] = $order;
|
||||
}
|
||||
|
||||
$ShippingCountry = ShippingCountry::whereCountryId($shopping_user->shipping_country_id)->first();
|
||||
if($ShippingCountry){
|
||||
Yard::instance('shopping')->setShippingCountryWithPrice($ShippingCountry->id);
|
||||
}
|
||||
$shopping_order = $this->makeShoppingOrder($shopping_user);
|
||||
$shopping_user->shopping_order = $shopping_order;
|
||||
Yard::instance('shopping')->destroy();
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
private function makeShoppingOrder($shopping_user){
|
||||
|
||||
$data = [
|
||||
'shopping_user_id' => $shopping_user->id,
|
||||
'auth_user_id' => $shopping_user->auth_user_id,
|
||||
'country_id' => Yard::instance('shopping')->getShippingCountryId(),
|
||||
'user_shop_id' => auth()->user()->user_sponsor->shop->id,
|
||||
'member_id' => $shopping_user->member_id,
|
||||
'total' => Yard::instance('shopping')->total(2, '.', ''),
|
||||
'shipping' => Yard::instance('shopping')->shipping(2, '.', ','),
|
||||
'subtotal' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ''),
|
||||
'tax_rate' => Yard::getTaxRate(),
|
||||
'tax' => Yard::instance('shopping')->taxWithShipping(2, '.', ''),
|
||||
'total_shipping' => Yard::instance('shopping')->totalWithShipping(2, '.', ''),
|
||||
'weight' => Yard::instance('shopping')->weight(),
|
||||
'paid' => true,
|
||||
'txaction' => 'extern',
|
||||
'mode' => $shopping_user->mode,
|
||||
];
|
||||
$shopping_order = $shopping_user->shopping_order;
|
||||
if($shopping_order){
|
||||
$shopping_order->fill($data);
|
||||
$shopping_order->save();
|
||||
}else{
|
||||
$shopping_order= ShoppingOrder::create($data);
|
||||
}
|
||||
$items = Yard::instance('shopping')->content();
|
||||
|
||||
$shopping_order->shopping_order_items()->each(function($model) use ($items, $shopping_order) {
|
||||
foreach ($items as $item) {
|
||||
if ($model->row_id === $item->rowId) {
|
||||
$model->fill([
|
||||
'shopping_order_id' => $shopping_order->id,
|
||||
'row_id' => $item->rowId,
|
||||
'product_id' => $item->id,
|
||||
'qty' => $item->qty,
|
||||
'price' => $item->price,
|
||||
'slug' => $item->options->slug,
|
||||
])->save();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return $model->delete();
|
||||
});
|
||||
|
||||
|
||||
foreach ($items as $item) {
|
||||
if (!ShoppingOrderItem::where('shopping_order_id', $shopping_order->id)->where('row_id', $item->rowId)->count())
|
||||
ShoppingOrderItem::create([
|
||||
'shopping_order_id' => $shopping_order->id,
|
||||
'row_id' => $item->rowId,
|
||||
'product_id' => $item->id,
|
||||
'qty' => $item->qty,
|
||||
'price' => $item->price,
|
||||
'slug' => $item->options->slug
|
||||
]);
|
||||
}
|
||||
return $shopping_order;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@ namespace App\Http\Controllers;
|
|||
|
||||
use App\Models\Attribute;
|
||||
use App\Models\ProductAttribute;
|
||||
use Input;
|
||||
use Request;
|
||||
|
||||
|
||||
class AttributeController extends Controller
|
||||
|
|
@ -29,7 +29,7 @@ class AttributeController extends Controller
|
|||
public function store()
|
||||
{
|
||||
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
if($data['id'] == "new"){
|
||||
$model = Attribute::create([
|
||||
'parent_id' => null,
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace App\Http\Controllers;
|
|||
use App\Models\Category;
|
||||
use App\Models\IqImage;
|
||||
use App\Models\ProductCategory;
|
||||
use Input;
|
||||
use\Request;
|
||||
|
||||
|
||||
class CategoryController extends Controller
|
||||
|
|
@ -45,7 +45,7 @@ class CategoryController extends Controller
|
|||
public function store()
|
||||
{
|
||||
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
$data['active'] = isset($data['active']) ? true : false;
|
||||
$data['parent_id'] = isset($data['parent_id']) ? $data['parent_id'] : null;
|
||||
if($data['id'] == "new"){
|
||||
|
|
@ -105,7 +105,7 @@ class CategoryController extends Controller
|
|||
|
||||
public function imageUpload(){
|
||||
|
||||
$category_id = Input::get('category_id');
|
||||
$category_id = Request::get('category_id');
|
||||
$category = Category::findOrFail($category_id);
|
||||
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace App\Http\Controllers;
|
|||
|
||||
|
||||
use App\Models\Country;
|
||||
use Input;
|
||||
use Request;
|
||||
|
||||
|
||||
class CountryController extends Controller
|
||||
|
|
@ -48,7 +48,14 @@ class CountryController extends Controller
|
|||
public function store()
|
||||
{
|
||||
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
|
||||
$data['active'] = isset($data['active']) ? true : false;
|
||||
$data['switch'] = isset($data['switch']) ? true : false;
|
||||
$data['own_eur'] = isset($data['own_eur']) ? true : false;
|
||||
$data['currency'] = isset($data['currency']) ? true : false;
|
||||
$data['currency_faktor'] = $data['currency_faktor'] == "" ? null : reFormatNumber($data['currency_faktor']);
|
||||
|
||||
if(!isset($data['attr'])){
|
||||
$data['attr'] = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ use App\Repositories\CustomerRepository;
|
|||
use App\Services\CustomerPriority;
|
||||
use App\Services\HTMLHelper;
|
||||
use Request;
|
||||
use Validator;
|
||||
|
||||
|
||||
class CustomerController extends Controller
|
||||
|
|
@ -35,6 +36,17 @@ class CustomerController extends Controller
|
|||
}
|
||||
|
||||
|
||||
public function detail($id)
|
||||
{
|
||||
$shopping_user = ShoppingUser::findOrFail($id);
|
||||
$data = [
|
||||
'shopping_user' => $shopping_user,
|
||||
'isAdmin' => true,
|
||||
'isView' => 'customer',
|
||||
];
|
||||
return view('admin.customer.detail', $data);
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
{
|
||||
if($id === "new"){
|
||||
|
|
@ -49,32 +61,76 @@ class CustomerController extends Controller
|
|||
'isView' => 'customer',
|
||||
|
||||
];
|
||||
return view('admin.customer.detail', $data);
|
||||
return view('admin.customer.edit', $data);
|
||||
}
|
||||
|
||||
public function store($id)
|
||||
{
|
||||
$data = Request::all();
|
||||
$change_member_error = false;
|
||||
if($data['action']==='shopping-user-change-member'){
|
||||
if(!isset($data['change_member_key']) || $data['change_member_key'] !== config('mivita.edit_data_pass')){
|
||||
$change_member_error = "Das Passwort ist falsch.";
|
||||
}else{
|
||||
//change
|
||||
$shopping_user = ShoppingUser::findOrFail($data['id']);
|
||||
CustomerPriority::newMemberForCustomer($shopping_user, $data['change_member_id'], $data['customer_set_member_for']);
|
||||
\Session()->flash('alert-save', true);
|
||||
return redirect(route('admin_customer_edit', [$shopping_user->id]));
|
||||
}
|
||||
}
|
||||
|
||||
if ($data['action'] === 'shopping-user-change-member') {
|
||||
if (!isset($data['change_member_key']) || $data['change_member_key'] !== config('mivita.edit_data_pass')) {
|
||||
$data = [
|
||||
'change_member_error' => $change_member_error,
|
||||
'change_member_error' => "Das Passwort ist falsch.",
|
||||
'shopping_user' => ShoppingUser::find($id),
|
||||
'isAdmin' => true,
|
||||
'isView' => 'customer',
|
||||
];
|
||||
return view('admin.customer.detail', $data);
|
||||
}
|
||||
//change
|
||||
$shopping_user = ShoppingUser::findOrFail($data['id']);
|
||||
CustomerPriority::newMemberForCustomer($shopping_user, $data['change_member_id'], $data['customer_set_member_for']);
|
||||
\Session()->flash('alert-save', true);
|
||||
return redirect(route('admin_customer_detail', [$shopping_user->id]));
|
||||
}
|
||||
if ($data['action'] === 'shopping-user-store') {
|
||||
$rules = array(
|
||||
'billing_salutation' => 'required',
|
||||
'billing_firstname'=>'required',
|
||||
'billing_lastname'=>'required',
|
||||
'billing_email'=>'required|email',
|
||||
'billing_address'=>'required',
|
||||
'billing_zipcode'=>'required',
|
||||
'billing_city' => 'required',
|
||||
'billing_country_id' => 'required'
|
||||
);
|
||||
|
||||
if(!Request::get('same_as_billing')){
|
||||
$rules = array_merge($rules, [
|
||||
'shipping_firstname'=>'required',
|
||||
'shipping_lastname'=>'required',
|
||||
'shipping_address'=>'required',
|
||||
'shipping_zipcode'=>'required',
|
||||
'shipping_city' => 'required',
|
||||
'shipping_salutation' => 'required',
|
||||
'shipping_country_id' => 'required'
|
||||
]);
|
||||
}
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
return back()->withErrors($validator)->withInput(Request::all());
|
||||
}
|
||||
|
||||
$shopping_user = ShoppingUser::findOrFail($id);
|
||||
$data['has_buyed'] = true;
|
||||
$data['subscribed'] = true;
|
||||
if($shopping_user->auth_user_id > 0){
|
||||
$data['has_buyed'] = true;
|
||||
$data['subscribed'] = false;
|
||||
}
|
||||
$data['same_as_billing'] = isset($data['same_as_billing']) ? true : false;
|
||||
$data['shipping_country_id'] = isset($data['shipping_country_id']) ? $data['shipping_country_id'] : $data['billing_country_id'];
|
||||
CustomerPriority::checkChangeOne($shopping_user, $data, true);
|
||||
$shopping_user->fill($data);
|
||||
$shopping_user->save();
|
||||
\App\Services\Shop::newUserOrder($shopping_user->number);
|
||||
|
||||
\Session()->flash('alert-save', true);
|
||||
}
|
||||
return redirect(route('admin_customer_detail', [$shopping_user->id]));
|
||||
|
||||
}
|
||||
|
||||
public function getCustomers()
|
||||
{
|
||||
|
|
@ -95,7 +151,7 @@ class CustomerController extends Controller
|
|||
}*/
|
||||
return \DataTables::eloquent($query)
|
||||
->addColumn('id', function (ShoppingUser $ShoppingUser) {
|
||||
return '<a href="' . route('admin_customer_edit', [$ShoppingUser->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="far fa-edit"></span></a>';
|
||||
return '<a href="' . route('admin_customer_detail', [$ShoppingUser->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="far fa-edit"></span></a>';
|
||||
})
|
||||
->addColumn('billing_salutation', function (ShoppingUser $ShoppingUser) {
|
||||
return HTMLHelper::getSalutationLang($ShoppingUser->billing_salutation);
|
||||
|
|
@ -104,7 +160,7 @@ class CustomerController extends Controller
|
|||
return $ShoppingUser->billing_country ? $ShoppingUser->billing_country->getLocated() : '';
|
||||
})
|
||||
->addColumn('isMember', function (ShoppingUser $ShoppingUser) {
|
||||
return $ShoppingUser->auth_user_id ? '<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
|
||||
return get_active_badge($ShoppingUser->auth_user_id).($ShoppingUser->mode==='dev' ? ' <span class="badge badge-warning">dev</span>' : '');
|
||||
})
|
||||
->addColumn('member_id', function (ShoppingUser $ShoppingUser) {
|
||||
if($ShoppingUser->member_id){
|
||||
|
|
@ -123,13 +179,17 @@ class CustomerController extends Controller
|
|||
->addColumn('created_at', function (ShoppingUser $ShoppingUser) {
|
||||
return $ShoppingUser->created_at->format('d.m.Y');
|
||||
})
|
||||
->addColumn('subscribed', function (ShoppingUser $ShoppingUser) {
|
||||
return get_active_badge($ShoppingUser->subscribed);
|
||||
})
|
||||
->orderColumn('id', 'id $1')
|
||||
->orderColumn('billing_country_id', 'billing_country_id $1')
|
||||
->orderColumn('billing_salutation', 'billing_salutation $1')
|
||||
->orderColumn('created_at', 'created_at $1')
|
||||
->orderColumn('isMember', 'auth_user_id $1')
|
||||
->orderColumn('member_id', 'member_id $1')
|
||||
->rawColumns(['id', 'isMember', 'member_id'])
|
||||
->orderColumn('subscribed', 'subscribed $1')
|
||||
->rawColumns(['id', 'subscribed', 'isMember', 'member_id'])
|
||||
->make(true);
|
||||
}
|
||||
}
|
||||
|
|
@ -15,7 +15,7 @@ class DataTableController extends Controller
|
|||
|
||||
public function getUsers()
|
||||
{
|
||||
$query = User::with('account')->select('users.*')->where('users.deleted_at', '=', null);
|
||||
$query = User::with('account')->select('users.*')->where('users.deleted_at', '=', null)->where('users.admin', "<", 4);
|
||||
|
||||
return \DataTables::eloquent($query)
|
||||
->addColumn('first_name', function (User $user) {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ use Auth;
|
|||
use Carbon\Carbon;
|
||||
use Config;
|
||||
use Request;
|
||||
use Input;
|
||||
use Util;
|
||||
|
||||
class HomeController extends Controller
|
||||
|
|
@ -48,8 +47,8 @@ class HomeController extends Controller
|
|||
|
||||
public function loadingModal(){
|
||||
|
||||
$data = Input::get('data');
|
||||
$target = Input::get('target');
|
||||
$data = Request::get('data');
|
||||
$target = Request::get('target');
|
||||
|
||||
$response = "";
|
||||
if($data === "data_protection"){
|
||||
|
|
@ -203,7 +202,7 @@ class HomeController extends Controller
|
|||
*/
|
||||
public function checkMail(){
|
||||
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
if($data['user_id'] === "new"){
|
||||
if(User::where('email', $data['email'])->count()){
|
||||
return json_encode(false);
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace App\Http\Controllers;
|
|||
use App\Models\Product;
|
||||
use App\Models\ProductImage;
|
||||
use App\Repositories\ProductRepository;
|
||||
use Input;
|
||||
use Request;
|
||||
use Validator;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
|
||||
|
||||
use App\Mail\MailCustomMessage;
|
||||
use App\Mail\MailVerifyAccount;
|
||||
use App\Mail\MailVerifyContact;
|
||||
|
|
@ -15,12 +13,9 @@ use App\Repositories\UserRepository;
|
|||
use App\Services\UserService;
|
||||
use App\User;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Input;
|
||||
use Illuminate\Http\Request;
|
||||
use Request;
|
||||
use Validator;
|
||||
|
||||
|
||||
|
||||
class LeadController extends Controller
|
||||
{
|
||||
protected $userRepo;
|
||||
|
|
@ -64,7 +59,7 @@ class LeadController extends Controller
|
|||
}
|
||||
}
|
||||
$data = [
|
||||
'show' => Input::get('show'),
|
||||
'show' => Request::get('show'),
|
||||
'user' => $user,
|
||||
'can_change_mail' => true,
|
||||
'm_data_load' => false,
|
||||
|
|
@ -120,8 +115,8 @@ class LeadController extends Controller
|
|||
public function store(Request $request)
|
||||
{
|
||||
|
||||
$data = Input::all();
|
||||
$show = Input::get('show');
|
||||
$data = Request::all();
|
||||
$show = Request::get('show');
|
||||
|
||||
if ($data['user_id'] === "new" || $data['user_id'] == 0) {
|
||||
$rules = array(
|
||||
|
|
@ -142,7 +137,7 @@ class LeadController extends Controller
|
|||
'email' => 'required|string|email|max:255|exists:users,email',
|
||||
'email-confirm' => 'required|same:email',
|
||||
);
|
||||
if(!Input::get('same_as_billing')){
|
||||
if(!Request::get('same_as_billing')){
|
||||
$rules = array_merge($rules, [
|
||||
'shipping_firstname'=>'required',
|
||||
'shipping_lastname'=>'required',
|
||||
|
|
@ -161,7 +156,7 @@ class LeadController extends Controller
|
|||
|
||||
|
||||
}
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
|
||||
if ($data['user_id'] === "new" || $data['user_id'] == 0) {
|
||||
|
|
@ -170,7 +165,7 @@ class LeadController extends Controller
|
|||
$user = User::findOrFail($data['user_id']);
|
||||
$user_id = $user->id;
|
||||
}
|
||||
return redirect(route('admin_lead_edit', [$user_id])."?show=".$show)->withErrors($validator)->withInput(Input::all());
|
||||
return redirect(route('admin_lead_edit', [$user_id])."?show=".$show)->withErrors($validator)->withRequest(Request::all());
|
||||
}
|
||||
|
||||
if ($data['user_id'] === "new" || $data['user_id'] == 0) {
|
||||
|
|
@ -224,7 +219,7 @@ class LeadController extends Controller
|
|||
$user = User::findOrFail($id);
|
||||
|
||||
if($action === 'completed'){
|
||||
$validator = Validator::make(Input::all(), []);
|
||||
$validator = Validator::make(Request::all(), []);
|
||||
if(!$user->m_sponsor){
|
||||
$validator->errors()->add('m_sponsor', __('Berater hat keinen Sponsor.'));
|
||||
}
|
||||
|
|
@ -238,7 +233,7 @@ class LeadController extends Controller
|
|||
$validator->errors()->add('m_account', __('Berater hat keine Account ID'));
|
||||
}
|
||||
if ($validator->errors()->count()) {
|
||||
return back()->withErrors($validator)->withInput(Input::all());
|
||||
return back()->withErrors($validator)->withRequest(Request::all());
|
||||
}
|
||||
|
||||
//create PDF
|
||||
|
|
@ -276,7 +271,7 @@ class LeadController extends Controller
|
|||
$user->release_account = null;
|
||||
$user->save();
|
||||
|
||||
$input = Input::all();
|
||||
$input = Request::all();
|
||||
$data = [
|
||||
'subject' => $input['account_incomplete_subject'],
|
||||
'message' => $input['account_incomplete_message'],
|
||||
|
|
@ -340,7 +335,7 @@ class LeadController extends Controller
|
|||
public function getLeads()
|
||||
{
|
||||
|
||||
$query = User::with('account')->select('users.*')->where('users.deleted_at', '=', null);
|
||||
$query = User::with('account')->select('users.*')->where('users.deleted_at', '=', null)->where('users.admin', "<", 4);
|
||||
|
||||
return \DataTables::eloquent($query)
|
||||
->addColumn('first_name', function (User $user) {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ use Carbon;
|
|||
use Config;
|
||||
use Illuminate\Validation\Rules\In;
|
||||
use Request;
|
||||
use Input;
|
||||
use Util;
|
||||
use Yard;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
|
|
@ -62,11 +61,11 @@ class MembershipController extends Controller
|
|||
public function storePayment($action){
|
||||
|
||||
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
|
||||
//#### remove_abo
|
||||
if($action === "remove_abo"){
|
||||
if(Input::get('abo_options_remove')){
|
||||
if(Request::get('abo_options_remove')){
|
||||
$user = User::find(Auth::user()->id);
|
||||
$user->abo_options = false;
|
||||
$user->save();
|
||||
|
|
@ -82,12 +81,12 @@ class MembershipController extends Controller
|
|||
//#### payment order
|
||||
//#### shop upgrade
|
||||
if($action === "upgrade_order" || $action === "payment_order"){
|
||||
if(Input::get('switchers-package-wizard')){
|
||||
if(Request::get('switchers-package-wizard')){
|
||||
$user = User::find(Auth::user()->id);
|
||||
Yard::instance('shopping')->destroy();
|
||||
$product = Product::find(Input::get('switchers-package-wizard'));
|
||||
$product = Product::find(Request::get('switchers-package-wizard'));
|
||||
$showAboOptions = false;
|
||||
if(Input::get('abo_options')){
|
||||
if(Request::get('abo_options')){
|
||||
$showAboOptions = true;
|
||||
$user->abo_options = true;
|
||||
$user->save();
|
||||
|
|
@ -97,7 +96,7 @@ class MembershipController extends Controller
|
|||
if($product->images->count()){
|
||||
$image = $product->images->first()->slug;
|
||||
}
|
||||
$qty = Input::get('qty') ? Input::get('qty') : 1;
|
||||
$qty = Request::get('qty') ? Request::get('qty') : 1;
|
||||
Yard::instance('shopping')->add($product->id, $product->getLang('name'), $qty, $product->price, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight]);
|
||||
|
||||
do {
|
||||
|
|
@ -124,9 +123,9 @@ class MembershipController extends Controller
|
|||
}
|
||||
|
||||
if($action === "change_order"){
|
||||
if(Input::get('switchers-package-wizard')){
|
||||
if(Request::get('switchers-package-wizard')){
|
||||
$user = User::find(Auth::user()->id);
|
||||
$product = Product::find(Input::get('switchers-package-wizard'));
|
||||
$product = Product::find(Request::get('switchers-package-wizard'));
|
||||
if($user->payment_order_id == $product->id){
|
||||
\Session()->flash('alert-success', "keine Änderung vorgenommen.");
|
||||
return back();
|
||||
|
|
@ -142,7 +141,7 @@ class MembershipController extends Controller
|
|||
}
|
||||
}
|
||||
if($action === "delete_membership"){
|
||||
if(Input::get('delete_membership_mivita')){
|
||||
if(Request::get('delete_membership_mivita')){
|
||||
//TODO
|
||||
$user = User::find(Auth::user()->id);
|
||||
if($user->isTestMode()){
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Country;
|
||||
use App\Models\Product;
|
||||
use App\Models\ProductImage;
|
||||
use App\Repositories\ProductRepository;
|
||||
use Input;
|
||||
use Request;
|
||||
use Validator;
|
||||
|
||||
|
|
@ -47,8 +47,11 @@ class ProductController extends Controller
|
|||
}else{
|
||||
$model = Product::findOrFail($id);
|
||||
}
|
||||
|
||||
$country_for_prices = Country::where('own_eur', '=', true)->orWhere('currency', '=', true)->get();
|
||||
$data = [
|
||||
'product' => $model,
|
||||
'country_for_prices' => $country_for_prices,
|
||||
];
|
||||
return view('admin.product.edit', $data);
|
||||
}
|
||||
|
|
@ -56,12 +59,12 @@ class ProductController extends Controller
|
|||
public function store()
|
||||
{
|
||||
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
|
||||
$rules = array(
|
||||
'name' => 'required',
|
||||
);
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
|
||||
if($data['id'] == "new"){
|
||||
$model = new Product();
|
||||
|
|
@ -77,7 +80,7 @@ class ProductController extends Controller
|
|||
return view('admin.product.edit', $data)->withErrors($validator);
|
||||
|
||||
} else {
|
||||
$product = $this->productRepo->update(Input::all());
|
||||
$product = $this->productRepo->update(Request::all());
|
||||
\Session()->flash('alert-save', true);
|
||||
return redirect(route('admin_product_edit', [$product->id]));
|
||||
}
|
||||
|
|
@ -111,7 +114,7 @@ class ProductController extends Controller
|
|||
|
||||
public function imageUpload(){
|
||||
|
||||
$product_id = Input::get('product_id');
|
||||
$product_id = Request::get('product_id');
|
||||
$product = Product::findOrFail($product_id);
|
||||
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -2,14 +2,11 @@
|
|||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Country;
|
||||
use App\Models\ShoppingOrder;
|
||||
use App\Models\ShoppingUser;
|
||||
use App\Models\UserShop;
|
||||
use App\Services\CustomerPriority;
|
||||
use App\Services\Payment;
|
||||
use App\User;
|
||||
use Input;
|
||||
use Request;
|
||||
|
||||
class SalesController extends Controller
|
||||
|
|
@ -140,8 +137,9 @@ class SalesController extends Controller
|
|||
$shopping_user = ShoppingUser::findOrFail($data['id']);
|
||||
$set_like_shopping_user = ShoppingUser::findOrFail($data['is_like_shopping_user_id']);
|
||||
$send_member_mail = isset($data['send_member_mail']) ? true : false;
|
||||
$change_shopping_user = isset($data['change_shopping_user']) ? true : false;
|
||||
//Mail send in setIsLike
|
||||
CustomerPriority::setIsLike($shopping_user, $set_like_shopping_user, $send_member_mail);
|
||||
CustomerPriority::setIsLike($shopping_user, $set_like_shopping_user, $send_member_mail, $change_shopping_user);
|
||||
\Session()->flash('alert-save', true);
|
||||
return redirect($data['back']);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@ namespace App\Http\Controllers;
|
|||
use App\Models\Shipping;
|
||||
use App\Models\ShippingCountry;
|
||||
use App\Models\ShippingPrice;
|
||||
use Input;
|
||||
use Illuminate\Http\Request;
|
||||
use Request;
|
||||
use Validator;
|
||||
|
||||
|
||||
|
|
@ -58,7 +57,7 @@ class ShippingController extends Controller
|
|||
public function store(Request $request)
|
||||
{
|
||||
$shipping = false;
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
|
||||
if($data['action'] == 'shipping'){
|
||||
if ($data['id'] == "new") {
|
||||
|
|
@ -69,11 +68,11 @@ class ShippingController extends Controller
|
|||
$rules = array('name' => 'required');
|
||||
}
|
||||
$ret = ['value' => $shipping];
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
return view('admin.shipping.edit', $ret)->withErrors($validator);
|
||||
}
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
$shipping->name = $data['name'];
|
||||
$shipping->free = $data['free'];
|
||||
$shipping->active = isset($data['active']) ? true : false;
|
||||
|
|
@ -84,7 +83,7 @@ class ShippingController extends Controller
|
|||
$shipping = Shipping::findOrFail($data['shipping_id']);
|
||||
$rules = array('price' => 'required');
|
||||
$ret = ['value' => $shipping];
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
return view('admin.shipping.edit', $ret)->withErrors($validator);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ namespace App\Http\Controllers;
|
|||
|
||||
use App\Models\IqImage;
|
||||
use App\Models\IqSite;
|
||||
use Input;
|
||||
use Request;
|
||||
|
||||
|
||||
class SitesController extends Controller
|
||||
|
|
@ -31,7 +31,7 @@ class SitesController extends Controller
|
|||
|
||||
public function store($site)
|
||||
{
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
$data['products'] = isset($data['products']) ? $data['products'] : null;
|
||||
$data['set_products'] = isset($data['set_products']) ? $data['set_products'] : null;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Sys;
|
||||
|
||||
namespace App\Http\Controllers\SyS;
|
||||
|
||||
|
||||
use App\Http\Controllers\Api\KasController;
|
||||
|
|
@ -14,8 +13,7 @@ use App\Services\CustomerPriority;
|
|||
use App\Services\Shop;
|
||||
use Auth;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Input;
|
||||
use Illuminate\Http\Request;
|
||||
use Request;
|
||||
|
||||
|
||||
class AdminToolsController extends Controller
|
||||
|
|
@ -39,7 +37,7 @@ class AdminToolsController extends Controller
|
|||
public function customers()
|
||||
{
|
||||
|
||||
$shopping_users = CustomerPriority::checkForAll();
|
||||
$shopping_users = ShoppingUser::where('member_id', '=', NULL)->where('auth_user_id', '=', NULL)->get();
|
||||
$data = [
|
||||
'values' => $shopping_users,
|
||||
'text' => '',
|
||||
|
|
@ -47,10 +45,20 @@ class AdminToolsController extends Controller
|
|||
|
||||
return view('sys.admin.customers', $data);
|
||||
}
|
||||
|
||||
|
||||
public function customerStore()
|
||||
{
|
||||
$data = Input::all();
|
||||
\Session()->flash('alert-save', true);
|
||||
$data = Request::all();
|
||||
if($data['action'] === 'checkForAll'){
|
||||
$shopping_users = CustomerPriority::checkForAll();
|
||||
}
|
||||
if(strpos($data['action'], 'checkOne_') !== false){
|
||||
$id = (int) str_replace('checkOne_', '', $data['action']);
|
||||
$shopping_user = ShoppingUser::findOrFail($id);
|
||||
$ret = CustomerPriority::checkOne($shopping_user);
|
||||
}
|
||||
\Session()->flash('alert-success', $ret);
|
||||
return back();
|
||||
}
|
||||
|
||||
|
|
@ -73,7 +81,7 @@ class AdminToolsController extends Controller
|
|||
}
|
||||
public function cronjobsStore()
|
||||
{
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
\Session()->flash('alert-save', true);
|
||||
return back();
|
||||
}
|
||||
|
|
@ -114,7 +122,7 @@ class AdminToolsController extends Controller
|
|||
}
|
||||
public function domainSSLStore()
|
||||
{
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
\Session()->flash('alert-save', true);
|
||||
return back();
|
||||
}
|
||||
|
|
@ -132,7 +140,7 @@ class AdminToolsController extends Controller
|
|||
public function shoppingOrdersStore()
|
||||
{
|
||||
//first run
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
|
||||
if($data['action'] === 'first_run'){
|
||||
$shopping_users = ShoppingUser::whereHas('shopping_order', function($q) {
|
||||
|
|
|
|||
54
app/Http/Controllers/Sys/ImportController.php
Executable file
54
app/Http/Controllers/Sys/ImportController.php
Executable file
|
|
@ -0,0 +1,54 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\SyS;
|
||||
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Repositories\ImportRepository;
|
||||
use Request;
|
||||
|
||||
|
||||
class ImportController extends Controller
|
||||
{
|
||||
protected $userRepo;
|
||||
protected $import;
|
||||
|
||||
public function __construct(ImportRepository $import)
|
||||
{
|
||||
$this->middleware('sysadmin');
|
||||
$this->import = $import;
|
||||
|
||||
}
|
||||
|
||||
|
||||
public function import()
|
||||
{
|
||||
$data = [
|
||||
];
|
||||
return view('sys.admin.import', $data);
|
||||
}
|
||||
|
||||
|
||||
public function importStore()
|
||||
{
|
||||
$input = Request::all();
|
||||
return $this->import->upload($input);
|
||||
}
|
||||
|
||||
public function importShow($type, $file, $skip = 0, $limit = 4000)
|
||||
{
|
||||
$import = $this->import->read($type, $file, $skip, $limit);
|
||||
$data = [
|
||||
'limit' => $limit,
|
||||
'type' => $type,
|
||||
'file' => $file,
|
||||
'import' => $import,
|
||||
'skip' => $skip,
|
||||
];
|
||||
return view('sys.admin.import-show', $data);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@ namespace App\Http\Controllers;
|
|||
|
||||
use App;
|
||||
use File;
|
||||
use Input;
|
||||
use Request;
|
||||
|
||||
class TranslationController extends Controller
|
||||
{
|
||||
|
|
@ -65,7 +65,7 @@ class TranslationController extends Controller
|
|||
|
||||
$path = $this->resourcePath($this->languagesPath);
|
||||
$file = $path.$language.".json";
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
$this->backup($path, $language.".json");
|
||||
unset($data['_token']);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,5 @@
|
|||
<?php
|
||||
|
||||
//use Input;
|
||||
//use Request;
|
||||
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App;
|
||||
|
|
@ -14,8 +10,6 @@ use Illuminate\Support\Collection;
|
|||
use App\Requests\TranslationRequest;
|
||||
|
||||
|
||||
|
||||
|
||||
class TranslationFileController extends Controller
|
||||
{
|
||||
|
||||
|
|
|
|||
220
app/Http/Controllers/User/CustomerController.php
Executable file
220
app/Http/Controllers/User/CustomerController.php
Executable file
|
|
@ -0,0 +1,220 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\User;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\ShoppingUser;
|
||||
use App\Repositories\CustomerRepository;
|
||||
use App\Services\CustomerPriority;
|
||||
use App\Services\HTMLHelper;
|
||||
use App\User;
|
||||
use Illuminate\Support\Collection;
|
||||
use Request;
|
||||
use Validator;
|
||||
|
||||
|
||||
class CustomerController extends Controller
|
||||
{
|
||||
protected $customerRepository;
|
||||
|
||||
public function __construct(CustomerRepository $customerRepository)
|
||||
{
|
||||
$this->middleware('active.account');
|
||||
$this->customerRepository = $customerRepository;
|
||||
|
||||
}
|
||||
|
||||
public function index()
|
||||
{
|
||||
if(Request::get('reset') === 'filter'){
|
||||
// set_user_attr('filter_member_id', null);
|
||||
// set_user_attr('filter_customer_member', null);
|
||||
return redirect(route('admin_customers'));
|
||||
}
|
||||
$data = [
|
||||
|
||||
];
|
||||
return view('user.customer.index', $data);
|
||||
}
|
||||
|
||||
|
||||
public function detail($id)
|
||||
{
|
||||
$shopping_user = ShoppingUser::findOrFail($id);
|
||||
if($shopping_user->member_id != \Auth::user()->id){
|
||||
abort(404);
|
||||
}
|
||||
$data = [
|
||||
'shopping_user' => $shopping_user,
|
||||
'isAdmin' => false,
|
||||
'isView' => 'customer',
|
||||
|
||||
];
|
||||
return view('user.customer.detail', $data);
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
{
|
||||
$shopping_user = ShoppingUser::findOrFail($id);
|
||||
if($shopping_user->member_id != \Auth::user()->id){
|
||||
abort(404);
|
||||
}
|
||||
$data = [
|
||||
'shopping_user' => $shopping_user,
|
||||
'isAdmin' => false,
|
||||
'isView' => 'customer',
|
||||
|
||||
];
|
||||
return view('user.customer.edit', $data);
|
||||
}
|
||||
|
||||
public function add($id, $step=0)
|
||||
{
|
||||
if($id === "new"){
|
||||
$shopping_user = new ShoppingUser();
|
||||
$shopping_user->id = "new";
|
||||
}else{
|
||||
$shopping_user = ShoppingUser::findOrFail($id);
|
||||
if($shopping_user->member_id != \Auth::user()->id){
|
||||
abort(404);
|
||||
}
|
||||
}
|
||||
if(old('email') || old('billing_email')){
|
||||
$step = 1;
|
||||
$shopping_user->same_as_billing = true;
|
||||
}
|
||||
$data = [
|
||||
'shopping_user' => $shopping_user,
|
||||
'isAdmin' => false,
|
||||
'isView' => $step === 0 ? 'customer' : 'customer-add',
|
||||
'step' => $step,
|
||||
'billing_email' => old('email'),
|
||||
|
||||
];
|
||||
return view('user.customer.add', $data);
|
||||
}
|
||||
|
||||
public function store($id)
|
||||
{
|
||||
$data = Request::all();
|
||||
|
||||
if($id === 'new' && $data['action'] === 'add_customer_step_email'){
|
||||
$rules = array(
|
||||
'email' => 'required|string|email|max:255|unique:shopping_users,billing_email',
|
||||
);
|
||||
$messages = [
|
||||
'unique' => __('validation.custom.unique_email_client'),
|
||||
];
|
||||
$validator = Validator::make(Request::all(), $rules, $messages);
|
||||
if ($validator->fails()) {
|
||||
return back()->withErrors($validator)->withInput(Request::all());
|
||||
}
|
||||
//okay, go to step 1
|
||||
return back()->withInput(Request::all());
|
||||
|
||||
}
|
||||
|
||||
if($data['action'] === 'shopping-user-store-new' || $data['action']==='shopping-user-store'){
|
||||
$rules = array(
|
||||
'billing_salutation' => 'required',
|
||||
'billing_firstname'=>'required',
|
||||
'billing_lastname'=>'required',
|
||||
'billing_email'=>'required|email',
|
||||
'billing_address'=>'required',
|
||||
'billing_zipcode'=>'required',
|
||||
'billing_city' => 'required',
|
||||
'billing_country_id' => 'required',
|
||||
);
|
||||
|
||||
if(!Request::get('same_as_billing')){
|
||||
$rules = array_merge($rules, [
|
||||
'shipping_firstname'=>'required',
|
||||
'shipping_lastname'=>'required',
|
||||
'shipping_address'=>'required',
|
||||
'shipping_zipcode'=>'required',
|
||||
'shipping_city' => 'required',
|
||||
'shipping_salutation' => 'required',
|
||||
'shipping_country_id' => 'required'
|
||||
]);
|
||||
}
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
return back()->withErrors($validator)->withInput(Request::all());
|
||||
}
|
||||
}
|
||||
|
||||
$data['has_buyed'] = isset($data['has_buyed']) ? true : false;
|
||||
$data['subscribed'] = isset($data['subscribed']) ? true : false;
|
||||
//subscribed can only true when has_buyed ist active
|
||||
$data['subscribed'] = $data['has_buyed'] ? $data['subscribed'] : false;
|
||||
|
||||
$data['same_as_billing'] = isset($data['same_as_billing']) ? true : false;
|
||||
$data['shipping_country_id'] = isset($data['shipping_country_id']) ? $data['shipping_country_id'] : $data['billing_country_id'];
|
||||
|
||||
if($id > 0 && $data['action'] === 'shopping-user-store'){
|
||||
$shopping_user = ShoppingUser::findOrFail($id);
|
||||
if($shopping_user->member_id != \Auth::user()->id){
|
||||
abort(404);
|
||||
}
|
||||
CustomerPriority::checkChangeOne($shopping_user, $data, true);
|
||||
$shopping_user->fill($data);
|
||||
$shopping_user->save();
|
||||
}
|
||||
|
||||
if($id === 'new' && $data['action'] === 'shopping-user-store-new') {
|
||||
$shopping_user = ShoppingUser::create($data);
|
||||
$shopping_user->member_id = \Auth::user()->id;
|
||||
$shopping_user->save();
|
||||
CustomerPriority::checkNewOne($shopping_user, true);
|
||||
}
|
||||
\App\Services\Shop::newUserOrder($shopping_user->number);
|
||||
|
||||
\Session()->flash('alert-save', true);
|
||||
return redirect(route('user_customer_detail', [$shopping_user->id]));
|
||||
}
|
||||
|
||||
public function getCustomers()
|
||||
{
|
||||
$user = User::find(\Auth::user()->id);
|
||||
|
||||
$query = ShoppingUser::select(['id', 'billing_company', 'billing_salutation', 'billing_firstname', 'billing_lastname', 'billing_email', 'billing_zipcode', 'billing_city', 'billing_country_id', 'orders', 'subscribed', 'created_at', 'number', 'mode', 'wp_order_number'])
|
||||
->where('shopping_users.member_id', '=', $user->id);
|
||||
//->groupBy('shopping_users.number');
|
||||
|
||||
/*set_user_attr('filter_member_id', Request::get('filter_member_id'));
|
||||
if(Request::get('filter_member_id') != ""){
|
||||
$query->where('member_id', '=', Request::get('filter_member_id'));
|
||||
}*/
|
||||
return \DataTables::eloquent($query)
|
||||
|
||||
->addColumn('id', function (ShoppingUser $ShoppingUser) {
|
||||
return '<a href="' . route('user_customer_detail', [$ShoppingUser->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="far fa-edit"></span></a>';
|
||||
})
|
||||
->addColumn('billing_salutation', function (ShoppingUser $ShoppingUser) {
|
||||
return HTMLHelper::getSalutationLang($ShoppingUser->billing_salutation);
|
||||
})
|
||||
->addColumn('billing_country_id', function (ShoppingUser $ShoppingUser) {
|
||||
return $ShoppingUser->billing_country ? $ShoppingUser->billing_country->getLocated() : '';
|
||||
})
|
||||
->addColumn('first_created_at', function (ShoppingUser $ShoppingUser) {
|
||||
return $ShoppingUser->firstEntryByNumber()->created_at->format('d.m.Y');
|
||||
})
|
||||
->addColumn('orders', function (ShoppingUser $ShoppingUser) {
|
||||
return $ShoppingUser->lastEntryByNumber()->orders;
|
||||
})
|
||||
->addColumn('subscribed', function (ShoppingUser $ShoppingUser) {
|
||||
return get_active_badge($ShoppingUser->subscribed);
|
||||
})
|
||||
->addColumn('extras', function (ShoppingUser $ShoppingUser) {
|
||||
return $ShoppingUser->wp_order_number.($ShoppingUser->mode==='dev' ? ' <span class="badge badge-warning">dev</span>' : '');
|
||||
})
|
||||
->orderColumn('id', 'id $1')
|
||||
->orderColumn('billing_country_id', 'billing_country_id $1')
|
||||
->orderColumn('billing_salutation', 'billing_salutation $1')
|
||||
->orderColumn('first_created_at', 'created_at $1')
|
||||
->orderColumn('orders', 'orders $1')
|
||||
->orderColumn('subscribed', 'subscribed $1')
|
||||
->rawColumns(['id', 'subscribed', 'extras'])
|
||||
->make(true);
|
||||
}
|
||||
}
|
||||
|
|
@ -26,11 +26,8 @@ class ShopSalesController extends Controller
|
|||
public function orderDetail($id)
|
||||
{
|
||||
$user = User::find(\Auth::user()->id);
|
||||
$shopping_order = ShoppingOrder::find($id);
|
||||
if(!$shopping_order){
|
||||
abort(404);
|
||||
}
|
||||
if($shopping_order->user_shop_id !== $user->shop->id){
|
||||
$shopping_order = ShoppingOrder::findOrFail($id);
|
||||
if($shopping_order->member_id !== $user->id){
|
||||
abort(404);
|
||||
}
|
||||
$data = [
|
||||
|
|
@ -43,7 +40,7 @@ class ShopSalesController extends Controller
|
|||
public function ordersDatatable(){
|
||||
|
||||
$user = User::find(\Auth::user()->id);
|
||||
$query = ShoppingOrder::with('shopping_user')->select('shopping_orders.*')->where('user_shop_id', $user->shop->id);
|
||||
$query = ShoppingOrder::with('shopping_user')->select('shopping_orders.*')->where('member_id', $user->id);
|
||||
|
||||
return \DataTables::eloquent($query)
|
||||
->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace App\Http\Controllers;
|
|||
use App\Repositories\UserRepository;
|
||||
use App\User;
|
||||
use Auth;
|
||||
use Input;
|
||||
use Request;
|
||||
use Validator;
|
||||
|
||||
|
||||
|
|
@ -55,7 +55,7 @@ class UserDataController extends Controller
|
|||
'email' => 'required|string|email|max:255|exists:users,email',
|
||||
'email-confirm' => 'required|same:email',
|
||||
);
|
||||
if(!Input::get('same_as_billing')){
|
||||
if(!Request::get('same_as_billing')){
|
||||
$rules = array_merge($rules, [
|
||||
'shipping_firstname'=>'required',
|
||||
'shipping_lastname'=>'required',
|
||||
|
|
@ -69,14 +69,14 @@ class UserDataController extends Controller
|
|||
$data = [
|
||||
'user' => $user,
|
||||
];
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
|
||||
if ($validator->fails()) {
|
||||
|
||||
return view('user.edit', $data)->withErrors($validator);
|
||||
|
||||
} else {
|
||||
$this->userRepo->update(Input::all());
|
||||
$this->userRepo->update(Request::all());
|
||||
\Session()->flash('alert-save', true);
|
||||
return redirect('/user/edit');
|
||||
}
|
||||
|
|
@ -103,7 +103,7 @@ class UserDataController extends Controller
|
|||
$rules['accepted_active'] = 'required';
|
||||
}
|
||||
|
||||
if(Input::get('company') == 1){
|
||||
if(Request::get('company') == 1){
|
||||
$rules['company_name'] = 'required|max:255';
|
||||
$rules['company_country_id'] = 'required|integer|min:1';
|
||||
}
|
||||
|
|
@ -112,7 +112,7 @@ class UserDataController extends Controller
|
|||
'user' => $user,
|
||||
];
|
||||
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
|
||||
if ($validator->fails()) {
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ class UserDataController extends Controller
|
|||
return view('user.edit', $data)->withErrors($validator);
|
||||
|
||||
} else {
|
||||
$this->userRepo->update(Input::all());
|
||||
$this->userRepo->update(Request::all());
|
||||
|
||||
if($user->active == 0) {
|
||||
$account = $user->account;
|
||||
|
|
@ -134,7 +134,7 @@ class UserDataController extends Controller
|
|||
$user->save();
|
||||
}
|
||||
|
||||
if(Input::get('accepted_active') == "on"){
|
||||
if(Request::get('accepted_active') == "on"){
|
||||
$user->agreement = now();
|
||||
}else{
|
||||
$user->agreement = null;
|
||||
|
|
@ -152,7 +152,7 @@ class UserDataController extends Controller
|
|||
public function userDataAcceptedForm(){
|
||||
$user = Auth::user();
|
||||
|
||||
if(Input::get('accepted_active') == "on"){
|
||||
if(Request::get('accepted_active') == "on"){
|
||||
$user->agreement = now();
|
||||
}else {
|
||||
$user->agreement = null;
|
||||
|
|
@ -189,7 +189,7 @@ class UserDataController extends Controller
|
|||
$data = [
|
||||
'user' => $user,
|
||||
];
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
|
||||
if ($validator->fails()) {
|
||||
// get the error messages from the validator
|
||||
|
|
@ -201,7 +201,7 @@ class UserDataController extends Controller
|
|||
$account->data_protection = now();
|
||||
$account->save();
|
||||
|
||||
if(Input::get('accepted_active') == "on"){
|
||||
if(Request::get('accepted_active') == "on"){
|
||||
$user->agreement = now();
|
||||
}else{
|
||||
$user->agreement = null;
|
||||
|
|
|
|||
|
|
@ -5,8 +5,7 @@ namespace App\Http\Controllers;
|
|||
|
||||
use Auth;
|
||||
use Validator;
|
||||
use Input;
|
||||
use Illuminate\Http\Request;
|
||||
use Request;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use App\Repositories\UserRepository;
|
||||
|
||||
|
|
@ -53,7 +52,7 @@ class UserDeleteController extends Controller
|
|||
|
||||
});
|
||||
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
|
||||
if ($validator->fails()) {
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ namespace App\Http\Controllers;
|
|||
use App\Models\Attribute;
|
||||
use App\Models\ProductAttribute;
|
||||
use App\Models\UserLevel;
|
||||
use Input;
|
||||
use Request;
|
||||
|
||||
|
||||
class UserLevelController extends Controller
|
||||
|
|
@ -30,7 +30,7 @@ class UserLevelController extends Controller
|
|||
public function store()
|
||||
{
|
||||
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
if($data['id'] == "new"){
|
||||
$model = UserLevel::create([
|
||||
'name' => $data['name'],
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ use App\Models\UserShopOnSite;
|
|||
use App\Repositories\UserRepository;
|
||||
use Auth;
|
||||
use Cviebrock\EloquentSluggable\Services\SlugService;
|
||||
use Input;
|
||||
use Request;
|
||||
use Response;
|
||||
use Validator;
|
||||
|
||||
|
|
@ -51,7 +51,7 @@ class UserShopController extends Controller
|
|||
public function store()
|
||||
{
|
||||
$user = Auth::user();
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
|
||||
if (!$user->shop) {
|
||||
abort(404);
|
||||
|
|
@ -182,7 +182,7 @@ class UserShopController extends Controller
|
|||
public function uploadOnSiteImage(){
|
||||
|
||||
$user = Auth::user();
|
||||
$user_shop_id = Input::get('user_shop_id');
|
||||
$user_shop_id = Request::get('user_shop_id');
|
||||
|
||||
if(!$user->shop || $user->shop->id != $user_shop_id){
|
||||
abort(404);
|
||||
|
|
@ -268,7 +268,7 @@ class UserShopController extends Controller
|
|||
public function userShopRegisterForm(){
|
||||
|
||||
|
||||
if(Input::get('shop_submit') == 'check'){
|
||||
if(Request::get('shop_submit') == 'check'){
|
||||
$rules = array(
|
||||
'user_shop_name' => ' required|alpha_dash|profanity|unique:user_shops,name|min:4|max:20|full_word_check',
|
||||
);
|
||||
|
|
@ -278,17 +278,17 @@ class UserShopController extends Controller
|
|||
}
|
||||
return true;
|
||||
});
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
|
||||
if ($validator->fails()) {
|
||||
\Session()->flash('shop-name-error', 'error');
|
||||
return redirect()->back()->withErrors($validator)->withInput();
|
||||
return redirect()->back()->withErrors($validator)->withRequest();
|
||||
}
|
||||
\Session()->flash('shop-name-error', 'check');
|
||||
return redirect(route('user_shop'))->withInput();
|
||||
return redirect(route('user_shop'))->withRequest();
|
||||
}
|
||||
|
||||
if(Input::get('shop_submit') == 'action') {
|
||||
if(Request::get('shop_submit') == 'action') {
|
||||
|
||||
$rules = array(
|
||||
'user_shop_name' => ' required|alpha_dash|profanity|unique:user_shops,name|min:4|max:20|full_word_check',
|
||||
|
|
@ -299,7 +299,7 @@ class UserShopController extends Controller
|
|||
}
|
||||
return true;
|
||||
});
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
|
||||
if ($validator->fails()) {
|
||||
\Session()->flash('shop-name-error', 'error');
|
||||
|
|
@ -311,14 +311,14 @@ class UserShopController extends Controller
|
|||
$rules = array(
|
||||
'user_shop_active' => 'accepted',
|
||||
);
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
return redirect()->back()->withErrors($validator)->withInput();
|
||||
return redirect()->back()->withErrors($validator)->withRequest();
|
||||
}
|
||||
|
||||
//all is right - save
|
||||
$user = Auth::user();
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
|
||||
$user_shop = UserShop::create([
|
||||
'user_id' => $user->id,
|
||||
|
|
@ -387,7 +387,7 @@ class UserShopController extends Controller
|
|||
return true;
|
||||
});
|
||||
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
|
||||
if ($validator->fails()) {
|
||||
//$messages = $validator->messages();
|
||||
|
|
@ -397,7 +397,7 @@ class UserShopController extends Controller
|
|||
|
||||
));
|
||||
}
|
||||
$slug = SlugService::createSlug(UserShop::class, 'slug', Input::get('user_shop_name'));
|
||||
$slug = SlugService::createSlug(UserShop::class, 'slug', Request::get('user_shop_name'));
|
||||
|
||||
return Response::json(array(
|
||||
'success' => true,
|
||||
|
|
|
|||
|
|
@ -6,11 +6,9 @@ namespace App\Http\Controllers;
|
|||
use App\User;
|
||||
use Auth;
|
||||
use Validator;
|
||||
use Input;
|
||||
use Request;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Connection;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Mail\MailActivateUser;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
|
||||
|
|
@ -52,7 +50,7 @@ class UserUpdateEmailController extends Controller
|
|||
return true;
|
||||
|
||||
});
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
// redirect our user back to the form with the errors from the validator
|
||||
$messages = $validator->messages();
|
||||
|
|
@ -61,8 +59,7 @@ class UserUpdateEmailController extends Controller
|
|||
|
||||
|
||||
}else{
|
||||
|
||||
$this->sendActivationMail($user, $request->all());
|
||||
$this->sendActivationMail($user, Request::all());
|
||||
\Session()->flash('alert-success', __('We sent you an activation code. Check your email!'));
|
||||
return redirect(route('user_update_email'));
|
||||
}
|
||||
|
|
@ -104,7 +101,7 @@ class UserUpdateEmailController extends Controller
|
|||
return true;
|
||||
|
||||
});
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
// redirect our user back to the form with the errors from the validator
|
||||
$messages = $validator->messages();
|
||||
|
|
@ -114,7 +111,7 @@ class UserUpdateEmailController extends Controller
|
|||
|
||||
}else{
|
||||
|
||||
$this->sendActivationMail($user, $request->all());
|
||||
$this->sendActivationMail($user, Request::all());
|
||||
\Session()->flash('alert-success', __('An activation code was sent to the account by e-mail!'));
|
||||
return redirect(route('admin_lead_edit', [$user->id]));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,8 +6,7 @@ namespace App\Http\Controllers;
|
|||
use Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Validator;
|
||||
use Input;
|
||||
use Illuminate\Http\Request;
|
||||
use Request;
|
||||
|
||||
|
||||
class UserUpdatePasswordController extends Controller
|
||||
|
|
@ -45,7 +44,7 @@ class UserUpdatePasswordController extends Controller
|
|||
|
||||
});
|
||||
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
|
||||
if ($validator->fails()) {
|
||||
|
||||
|
|
@ -87,7 +86,7 @@ class UserUpdatePasswordController extends Controller
|
|||
);
|
||||
|
||||
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
|
||||
if ($validator->fails()) {
|
||||
|
||||
|
|
|
|||
|
|
@ -6,10 +6,9 @@ namespace App\Http\Controllers\Web;
|
|||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Product;
|
||||
use App\Models\ShoppingInstance;
|
||||
use Validator;
|
||||
use App\Services\Util;
|
||||
use Yard;
|
||||
use Input;
|
||||
use Request;
|
||||
|
||||
class CardController extends Controller
|
||||
{
|
||||
|
|
@ -53,7 +52,7 @@ class CardController extends Controller
|
|||
if($product->images->count()){
|
||||
$image = $product->images->first()->slug;
|
||||
}
|
||||
$quantity = Input::get('quantity') ? Input::get('quantity') : 1;
|
||||
$quantity = Request::get('quantity') ? Request::get('quantity') : 1;
|
||||
Yard::instance('shopping')->add($product->id, $product->getLang('name'), $quantity, $product->price, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight]);
|
||||
Yard::instance('shopping')->reCalculateShippingPrice();
|
||||
|
||||
|
|
@ -66,8 +65,8 @@ class CardController extends Controller
|
|||
|
||||
public function showCard(){
|
||||
|
||||
if(Input::get('selected_country')){
|
||||
Yard::instance('shopping')->setShippingCountryWithPrice(Input::get('selected_country'));
|
||||
if(Request::get('selected_country')){
|
||||
Yard::instance('shopping')->setShippingCountryWithPrice(Request::get('selected_country'));
|
||||
}else{
|
||||
Yard::instance('shopping')->reCalculateShippingPrice();
|
||||
}
|
||||
|
|
@ -79,7 +78,7 @@ class CardController extends Controller
|
|||
|
||||
public function updateCard(){
|
||||
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
if(isset($data['quantity'])){
|
||||
foreach ($data['quantity'] as $rowId => $qty){
|
||||
Yard::instance('shopping')->update($rowId, $qty);
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use Illuminate\Support\Collection;
|
|||
use Validator;
|
||||
use App\Services\Util;
|
||||
use Yard;
|
||||
use Input;
|
||||
use Request;
|
||||
|
||||
class CheckoutController extends Controller
|
||||
{
|
||||
|
|
@ -39,8 +39,8 @@ class CheckoutController extends Controller
|
|||
|
||||
// $user_shop = Util::getUserShop();
|
||||
|
||||
if(Input::get('selected_country')){
|
||||
Yard::instance('shopping')->setShippingCountryWithPrice(Input::get('selected_country'));
|
||||
if(Request::get('selected_country')){
|
||||
Yard::instance('shopping')->setShippingCountryWithPrice(Request::get('selected_country'));
|
||||
}else{
|
||||
// $ShippingCountry = ShippingCountry::where('country_id', 1)->first();
|
||||
// $selected_country = $ShippingCountry->id;
|
||||
|
|
@ -107,7 +107,7 @@ class CheckoutController extends Controller
|
|||
'accepted_data_checkbox' => 'accepted',
|
||||
);
|
||||
|
||||
if(!Input::get('same_as_billing')){
|
||||
if(!Request::get('same_as_billing')){
|
||||
$rules = array_merge($rules, [
|
||||
'shipping_firstname'=>'required',
|
||||
'shipping_lastname'=>'required',
|
||||
|
|
@ -118,24 +118,26 @@ class CheckoutController extends Controller
|
|||
|
||||
]);
|
||||
}
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
return back()->withErrors($validator)->withErrors($validator)->withInput(Input::all());
|
||||
return back()->withErrors($validator)->withInput(Request::all());
|
||||
}
|
||||
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
//make User
|
||||
$shopping_user = $this->makeShoppingUser($data);
|
||||
//make Order and Items
|
||||
$shopping_order = $this->makeShoppingOrder($shopping_user);
|
||||
//CustomerPriority
|
||||
CustomerPriority::checkOne(ShoppingUser::find($shopping_user->id), true);
|
||||
Util::setUserHistoryValue(['status'=>2, 'shopping_order_id'=>$shopping_order->id]);
|
||||
|
||||
//check credit Card
|
||||
if(Input::get('payment_method')){
|
||||
if(Request::get('payment_method')){
|
||||
|
||||
$ret = [];
|
||||
//need precheck the card
|
||||
if(Input::get('payment_method') === 'cc'){
|
||||
if(Request::get('payment_method') === 'cc'){
|
||||
$pay = new PayoneController();
|
||||
$pay->init($shopping_user, $shopping_order);
|
||||
$ret['cc'] = $pay->checkCreditCard($data);
|
||||
|
|
@ -151,7 +153,7 @@ class CheckoutController extends Controller
|
|||
\Session::flash('cc-error', 1);
|
||||
\Session::flash('errormessage', $ret['cc']['errormessage']);
|
||||
\Session::flash('customermessage', $ret['cc']['customermessage']);
|
||||
return redirect(route('checkout.checkout_card'))->withInput(Input::all());
|
||||
return redirect(route('checkout.checkout_card'))->withInput(Request::all());
|
||||
}
|
||||
if($ret['cc']['status'] === 'VALID'){
|
||||
/*
|
||||
|
|
@ -163,10 +165,10 @@ class CheckoutController extends Controller
|
|||
}
|
||||
|
||||
//need precheck the card
|
||||
if(Input::get('payment_method') === 'elv' && is_null(Input::get('mandate_identification'))){
|
||||
if(Request::get('payment_method') === 'elv' && is_null(Request::get('mandate_identification'))){
|
||||
$pay = new PayoneController();
|
||||
$pay->init($shopping_user, $shopping_order);
|
||||
$amount = (int) (float) Yard::instance('shopping')->totalWithShipping(2, '.', ',') *100;
|
||||
$amount = (int) (float) Yard::instance('shopping')->totalWithShipping(2, '.', '') *100;
|
||||
$ret['elv'] = $pay->checkBankAccount($data, $amount, 'EUR', $shopping_user);
|
||||
|
||||
if($ret['elv']['status'] === 'ERROR' || $ret['elv']['status'] === 'INVALID'){
|
||||
|
|
@ -181,14 +183,14 @@ class CheckoutController extends Controller
|
|||
\Session::flash('elv-error', 1);
|
||||
\Session::flash('errormessage', $ret['elv']['errormessage']);
|
||||
\Session::flash('customermessage', $ret['elv']['customermessage']);
|
||||
return redirect(route('checkout.checkout_card'))->withInput(Input::all());
|
||||
return redirect(route('checkout.checkout_card'))->withInput(Request::all());
|
||||
}
|
||||
if($ret['elv']['status'] === 'APPROVED' && $ret['elv']['mandate_status'] !== "active"){
|
||||
\Session::flash('elv-managemandate', 1);
|
||||
\Session::flash('elv-mandate_identification', $ret['elv']['mandate_identification']);
|
||||
\Session::flash('elv-mandate_text', $ret['elv']['mandate_text']);
|
||||
\Session::flash('elv-creditor_identifier', $ret['elv']['creditor_identifier']);
|
||||
return redirect(route('checkout.checkout_card'))->withInput(Input::all());
|
||||
return redirect(route('checkout.checkout_card'))->withInput(Request::all());
|
||||
|
||||
/*
|
||||
* array(4) { ["status"]=> string(5) "VALID" ["pseudocardpan"]=> string(19) "9410010000169020567" ["cardtype"]=> string(1) "V" ["truncatedcardpan"]=> string(16) "411111XXXXXX1111" }
|
||||
|
|
@ -199,9 +201,9 @@ class CheckoutController extends Controller
|
|||
$ret['elv']['bankaccountholder'] = $data['elv_bankaccountholder'];
|
||||
|
||||
}
|
||||
if(Input::get('payment_method') === 'elv' && Input::get('mandate_identification')) {
|
||||
$ret['elv']['mandate_identification'] = Input::get('mandate_identification');
|
||||
$ret['elv']['creditor_identifier'] = Input::get('creditor_identifier');
|
||||
if(Request::get('payment_method') === 'elv' && Request::get('mandate_identification')) {
|
||||
$ret['elv']['mandate_identification'] = Request::get('mandate_identification');
|
||||
$ret['elv']['creditor_identifier'] = Request::get('creditor_identifier');
|
||||
$ret['elv']['iban'] = $data['elv_iban'];
|
||||
$ret['elv']['bic'] = $data['elv_bic'];
|
||||
$ret['elv']['bankaccountholder'] = $data['elv_bankaccountholder'];
|
||||
|
|
@ -212,8 +214,8 @@ class CheckoutController extends Controller
|
|||
//other
|
||||
$pay = new PayoneController();
|
||||
$pay->init($shopping_user, $shopping_order);
|
||||
$amount = (int) (float) Yard::instance('shopping')->totalWithShipping(2, '.', ',') *100;
|
||||
$reference = $pay->setPrePayment(Input::get('payment_method'), $amount, 'EUR', $ret);
|
||||
$amount = (int) (float) Yard::instance('shopping')->totalWithShipping(2, '.', '') * 100;
|
||||
$reference = $pay->setPrePayment(Request::get('payment_method'), $amount, 'EUR', $ret);
|
||||
$this->putPayments('payment_reference', $reference);
|
||||
$pay->setPersonalData();
|
||||
return $pay->ResponseData();
|
||||
|
|
@ -297,6 +299,8 @@ class CheckoutController extends Controller
|
|||
|
||||
private function makeShoppingUser($data){
|
||||
|
||||
$data['same_as_billing'] = isset($data['same_as_billing']) ? true : false;
|
||||
$data['same_as_billing'] = isset($data['same_as_billing']) ? true : false;
|
||||
$data['same_as_billing'] = isset($data['same_as_billing']) ? true : false;
|
||||
$data['accepted_data_checkbox'] = isset($data['accepted_data_checkbox']) ? true : false;
|
||||
|
||||
|
|
@ -311,8 +315,6 @@ class CheckoutController extends Controller
|
|||
if(!$shopping_user){
|
||||
$shopping_user = ShoppingUser::create($data);
|
||||
}
|
||||
//CustomerPriority
|
||||
CustomerPriority::checkOne($shopping_user, true);
|
||||
$this->putPayments('shopping_user_id', $shopping_user->id);
|
||||
|
||||
return $shopping_user;
|
||||
|
|
@ -328,12 +330,12 @@ class CheckoutController extends Controller
|
|||
'country_id' => Yard::instance('shopping')->getShippingCountryId(),
|
||||
'user_shop_id' => $user_shop->id,
|
||||
'payment_for' => Util::getUserPaymentFor(),
|
||||
'total' => Yard::instance('shopping')->total(2, '.', ','),
|
||||
'total' => Yard::instance('shopping')->total(2, '.', ''),
|
||||
'shipping' => Yard::instance('shopping')->shipping(2, '.', ','),
|
||||
'subtotal' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ','),
|
||||
'subtotal' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ''),
|
||||
'tax_rate' => Yard::getTaxRate(),
|
||||
'tax' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ','),
|
||||
'total_shipping' => Yard::instance('shopping')->totalWithShipping(2, '.', ','),
|
||||
'tax' => Yard::instance('shopping')->taxWithShipping(2, '.', ''),
|
||||
'total_shipping' => Yard::instance('shopping')->totalWithShipping(2, '.', ''),
|
||||
'weight' => Yard::instance('shopping')->weight(),
|
||||
'mode' => Util::getUserShoppingMode(),
|
||||
];
|
||||
|
|
@ -353,7 +355,6 @@ class CheckoutController extends Controller
|
|||
|
||||
$items = Yard::instance('shopping')->content();
|
||||
|
||||
|
||||
$shopping_order->shopping_order_items()->each(function($model) use ($items, $shopping_order) {
|
||||
foreach ($items as $item) {
|
||||
if ($model->row_id === $item->rowId) {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ namespace App\Http\Controllers\Web;
|
|||
use App\Http\Controllers\Controller;
|
||||
use App\Mail\MailContact;
|
||||
use GuzzleHttp\Client;
|
||||
use Input;
|
||||
use Request;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use App\Services\Util;
|
||||
use Validator;
|
||||
|
|
@ -54,19 +54,19 @@ class ContactController extends Controller
|
|||
return $this->reCaptcha_validate($attribute, $value, $parameters, $validator);
|
||||
});
|
||||
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
return back()->withErrors($validator)->withErrors($validator)->withInput(Input::all());
|
||||
return back()->withErrors($validator)->withInput(Request::all());
|
||||
}
|
||||
|
||||
|
||||
$contact = [];
|
||||
$contact['first_name'] = Input::get('first_name');
|
||||
$contact['last_name'] = Input::get('last_name');
|
||||
$contact['email'] = Input::get('email');
|
||||
$contact['phone'] = Input::get('phone');
|
||||
$contact['subject'] = Input::get('subject');
|
||||
$contact['message'] = Input::get('message');
|
||||
$contact['first_name'] = Request::get('first_name');
|
||||
$contact['last_name'] = Request::get('last_name');
|
||||
$contact['email'] = Request::get('email');
|
||||
$contact['phone'] = Request::get('phone');
|
||||
$contact['subject'] = Request::get('subject');
|
||||
$contact['message'] = Request::get('message');
|
||||
|
||||
$checkout_mail = config('app.checkout_mail');
|
||||
if($user_shop){
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ use App\Repositories\UserRepository;
|
|||
use App\Services\UserService;
|
||||
use App\User;
|
||||
use GuzzleHttp\Client;
|
||||
use Input;
|
||||
use Request;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use App\Services\Util;
|
||||
use Validator;
|
||||
|
|
@ -82,14 +82,14 @@ class RegisterController extends Controller
|
|||
return $this->reCaptcha_validate($attribute, $value, $parameters, $validator);
|
||||
});*/
|
||||
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
return back()->withErrors($validator)->withErrors($validator)->withInput(Input::all());
|
||||
return back()->withErrors($validator)->withInput(Request::all());
|
||||
}
|
||||
|
||||
$user_shop = Util::getUserShop();
|
||||
|
||||
$data = Input::all();
|
||||
$data = Request::all();
|
||||
$user = $this->userRepo->create($data);
|
||||
|
||||
$confirmation_code = UserService::createConfirmationCode();
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ use App\Http\Controllers\Controller;
|
|||
use App\Models\Category;
|
||||
use App\Models\IqSite;
|
||||
use App\Models\Product;
|
||||
use Input;
|
||||
use App\Services\Util;
|
||||
|
||||
class SiteController extends Controller
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ use App\User;
|
|||
use Auth;
|
||||
use Hash;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Input;
|
||||
use Request;
|
||||
use Validator;
|
||||
use Yard;
|
||||
|
|
@ -154,7 +153,7 @@ class WizardController extends Controller
|
|||
'accepted_active' => 'required',
|
||||
'accepted_contract' => 'required'
|
||||
);
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
$data = [
|
||||
'user' => Auth::user(),
|
||||
|
|
@ -196,7 +195,7 @@ class WizardController extends Controller
|
|||
'birthday' => 'required',
|
||||
);
|
||||
|
||||
if (!Input::get('same_as_billing')) {
|
||||
if (!Request::get('same_as_billing')) {
|
||||
$rules = array_merge($rules, [
|
||||
'shipping_firstname' => 'required',
|
||||
'shipping_lastname' => 'required',
|
||||
|
|
@ -207,14 +206,14 @@ class WizardController extends Controller
|
|||
'shipping_country_id' => 'required|integer|min:1',
|
||||
]);
|
||||
}
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
$user->wizard = 1;
|
||||
$user->save();
|
||||
return redirect(route('wizard_register', [1]))->withErrors($validator)->withInput(Input::all());
|
||||
return redirect(route('wizard_register', [1]))->withErrors($validator)->withInput(Request::all());
|
||||
}
|
||||
$data = Input::all();
|
||||
$data['same_as_billing'] = Input::get('same_as_billing') == NULL ? 0 : 1;
|
||||
$data = Request::all();
|
||||
$data['same_as_billing'] = Request::get('same_as_billing') == NULL ? 0 : 1;
|
||||
$user->account->fill($data)->save();
|
||||
$user->wizard = 2;
|
||||
$user->save();
|
||||
|
|
@ -222,13 +221,13 @@ class WizardController extends Controller
|
|||
}
|
||||
|
||||
if ($step == 2) {
|
||||
if(Input::get('submit') === 'do'){
|
||||
if(Request::get('submit') === 'do'){
|
||||
if(File::whereUserId($user->id)->whereIdentifier('id_card')->count() == 0){
|
||||
$validator = Validator::make(Input::all(), []);
|
||||
$validator = Validator::make(Request::all(), []);
|
||||
$validator->errors()->add('field', __('Kein Ausweis hinterlegt, bitte erst hochladen.'));
|
||||
$user->wizard = 2;
|
||||
$user->save();
|
||||
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Input::all());
|
||||
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Request::all());
|
||||
}
|
||||
$user->wizard = 3;
|
||||
$user->save();
|
||||
|
|
@ -238,20 +237,20 @@ class WizardController extends Controller
|
|||
$this->fileRepo->_set('dir', '/'.$user->id.'/verification/');
|
||||
$this->fileRepo->_set('user_id', $user->id);
|
||||
$this->fileRepo->_set('identifier', 'id_card');
|
||||
return $this->fileRepo->uploadFile(Input::all());
|
||||
return $this->fileRepo->uploadFile(Request::all());
|
||||
}
|
||||
|
||||
if ($step == 3) {
|
||||
if(Input::get('submit') === 'do'){
|
||||
if(Request::get('submit') === 'do'){
|
||||
$data = Request::all();
|
||||
|
||||
if($data['business_license_choose'] === "now"){
|
||||
if(File::whereUserId($user->id)->whereIdentifier('business_license')->count() == 0){
|
||||
$validator = Validator::make(Input::all(), []);
|
||||
$validator = Validator::make(Request::all(), []);
|
||||
$validator->errors()->add('field', __('Kein Gewerbeschein hinterlegt, bitte erst hochladen.'));
|
||||
$user->wizard = 3;
|
||||
$user->save();
|
||||
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Input::all());
|
||||
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Request::all());
|
||||
}
|
||||
}
|
||||
if($data['business_license_choose'] === "later"){
|
||||
|
|
@ -259,11 +258,11 @@ class WizardController extends Controller
|
|||
}
|
||||
if($data['business_license_choose'] === "non"){
|
||||
if(!$data['non_business_license_reason'] || $data['non_business_license_reason'] == ""){
|
||||
$validator = Validator::make(Input::all(), []);
|
||||
$validator = Validator::make(Request::all(), []);
|
||||
$validator->errors()->add('field', __('Bitte gib eine Begründung ein, warum Du keinen Gewerbeschein benötigst.'));
|
||||
$user->wizard = 3;
|
||||
$user->save();
|
||||
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Input::all());
|
||||
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Request::all());
|
||||
}else{
|
||||
$user->account->setNotice('business_license_reason', $data['non_business_license_reason']);
|
||||
}
|
||||
|
|
@ -279,7 +278,7 @@ class WizardController extends Controller
|
|||
$this->fileRepo->_set('dir', '/'.$user->id.'/verification/');
|
||||
$this->fileRepo->_set('user_id', $user->id);
|
||||
$this->fileRepo->_set('identifier', 'business_license');
|
||||
return $this->fileRepo->uploadFile(Input::all());
|
||||
return $this->fileRepo->uploadFile(Request::all());
|
||||
}
|
||||
|
||||
if ($step == 4) {
|
||||
|
|
@ -316,7 +315,7 @@ class WizardController extends Controller
|
|||
'accepted_data_protection' => 'required',
|
||||
'accepted_active' => 'required',
|
||||
);
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
$data = [
|
||||
'user' => Auth::user(),
|
||||
|
|
@ -355,7 +354,7 @@ class WizardController extends Controller
|
|||
$rules = array(
|
||||
'password' => 'required|string|min:6|confirmed',
|
||||
);
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
$data = [
|
||||
'user' => Auth::user(),
|
||||
|
|
@ -367,7 +366,7 @@ class WizardController extends Controller
|
|||
}
|
||||
|
||||
$user->fill([
|
||||
'password' => Hash::make(Input::get('password'))
|
||||
'password' => Hash::make(Request::get('password'))
|
||||
])->save();
|
||||
$user->wizard = 12;
|
||||
|
||||
|
|
@ -388,7 +387,7 @@ class WizardController extends Controller
|
|||
'birthday' => 'required',
|
||||
);
|
||||
|
||||
if(!Input::get('same_as_billing')){
|
||||
if(!Request::get('same_as_billing')){
|
||||
$rules = array_merge($rules, [
|
||||
'shipping_firstname'=>'required',
|
||||
'shipping_lastname'=>'required',
|
||||
|
|
@ -399,13 +398,13 @@ class WizardController extends Controller
|
|||
|
||||
]);
|
||||
}
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
return redirect(route('wizard_create', [12]))->withErrors($validator)->withInput(Input::all());
|
||||
return redirect(route('wizard_create', [12]))->withErrors($validator)->withInput(Request::all());
|
||||
}
|
||||
|
||||
$data = Input::all();
|
||||
$data['same_as_billing'] = Input::get('same_as_billing') == NULL ? 0 : 1;
|
||||
$data = Request::all();
|
||||
$data['same_as_billing'] = Request::get('same_as_billing') == NULL ? 0 : 1;
|
||||
$user->account->fill($data)->save();
|
||||
|
||||
$user->wizard = 13;
|
||||
|
|
@ -423,12 +422,12 @@ class WizardController extends Controller
|
|||
|
||||
public function storePayment($step = 0){
|
||||
|
||||
if(Input::get('switchers-package-wizard')){
|
||||
if(Request::get('switchers-package-wizard')){
|
||||
$user = User::find(Auth::user()->id);
|
||||
Yard::instance('shopping')->destroy();
|
||||
$product = Product::find(Input::get('switchers-package-wizard'));
|
||||
$product = Product::find(Request::get('switchers-package-wizard'));
|
||||
$showAboOptions = false;
|
||||
if(Input::get('abo_options')){
|
||||
if(Request::get('abo_options')){
|
||||
$showAboOptions = true;
|
||||
$user->abo_options = true;
|
||||
$user->save();
|
||||
|
|
@ -443,8 +442,8 @@ class WizardController extends Controller
|
|||
Yard::instance('shopping')->add($product->id, $product->getLang('name'), 1, $product->price, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight]);
|
||||
|
||||
//set onboarding products
|
||||
if(Input::get('products_on_board')){
|
||||
foreach (Input::get('products_on_board') as $product_on_board_id){
|
||||
if(Request::get('products_on_board')){
|
||||
foreach (Request::get('products_on_board') as $product_on_board_id){
|
||||
$product_on_board = Product::find($product_on_board_id);
|
||||
$image = "";
|
||||
if($product_on_board->images->count()){
|
||||
|
|
|
|||
21
app/Imports/ImportCollection.php
Normal file
21
app/Imports/ImportCollection.php
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
<?php
|
||||
|
||||
namespace App\Imports;
|
||||
|
||||
use App\Models\Shipping;
|
||||
use Maatwebsite\Excel\Concerns\ToModel;
|
||||
use Maatwebsite\Excel\Concerns\WithHeadingRow;
|
||||
use Illuminate\Support\Collection;
|
||||
use Maatwebsite\Excel\Concerns\ToCollection;
|
||||
|
||||
|
||||
class ImportCollection implements ToCollection, WithHeadingRow //ToModel
|
||||
{
|
||||
|
||||
|
||||
public function collection(Collection $rows)
|
||||
{
|
||||
return $rows;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -36,9 +36,9 @@ class MailCheckout extends Mailable
|
|||
$this->subject = __('email.checkout_subject')." ";
|
||||
}
|
||||
|
||||
if($shopping_order->user_shop){
|
||||
/*if($shopping_order->user_shop){
|
||||
$this->subject .= $shopping_order->user_shop->slug.".";
|
||||
}
|
||||
}*/
|
||||
$this->subject .= "mivita.care";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,19 +13,26 @@ class MailInfo extends Mailable
|
|||
|
||||
protected $user;
|
||||
protected $action;
|
||||
protected $data;
|
||||
|
||||
public $subject;
|
||||
|
||||
|
||||
public function __construct($user, $action)
|
||||
public function __construct($user, $action, $data = [])
|
||||
{
|
||||
$this->user = $user;
|
||||
$this->action = $action;
|
||||
$this->data = $data;
|
||||
|
||||
if($this->action === "delete_membership"){
|
||||
$this->subject = 'Mitgliedschaft beenden - beantragt';
|
||||
}
|
||||
if($this->action === "check_is_like_customer"){
|
||||
$this->subject = 'Kunden überprüfen - Kundenhoheit';
|
||||
}
|
||||
if($this->action === "change_is_like_customer"){
|
||||
$this->subject = 'Kunden erneut überprüfen - Kundenhoheit';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -61,7 +68,30 @@ class MailInfo extends Mailable
|
|||
$copy1line = "Hier geht es zum Kunden:"."\n";
|
||||
$button = "zum Kunden";
|
||||
$title = "Ein Kunden muss überprüfen werden und einem Berater zugeordnet werden, da die Adresse nicht eindeutig ist.";
|
||||
$url = route('admin_customer_edit', $this->user->id);
|
||||
$url = route('admin_customer_detail', $this->user->id);
|
||||
$content .= $this->user ? 'Firma: '.$this->user->billing_company."\n" : '';
|
||||
$content .= \App\Services\HTMLHelper::getSalutationLang($this->user->billing_salutation)." ";
|
||||
$content .= $this->user->billing_firstname." ";
|
||||
$content .= $this->user->billing_lastname."\n";
|
||||
$content .= $this->user->billing_address;
|
||||
$content .= $this->user->billing_address_2 ? '/ '.$this->user->billing_address_2."\n" : "\n";
|
||||
$content .= $this->user->billing_zipcode." ";
|
||||
$content .= $this->user->billing_city."\n";
|
||||
$content .= $this->user->billing_email."\n";
|
||||
$content .= $this->user->billing_phone."\n";
|
||||
$content .= $this->user->billing_country->getLocated();
|
||||
}
|
||||
|
||||
if($this->action === "change_is_like_customer"){
|
||||
$copy1line = "Hier geht es zum Kunden:"."\n";
|
||||
$button = "zum Kunden";
|
||||
$title = "Ein Kunden muss erneut überprüfen werden, da bei einer Änderung eine bestehende Kundenhoheit gefunden wurde.";
|
||||
$url = route('admin_customer_detail', $this->user->id);
|
||||
$content .= "Folgende Daten für die Kundenhoheit wurden geändert:"."\n";
|
||||
foreach ($this->data as $key=>$value){
|
||||
$content .= $this->user->{$key}." => ".$value."\n";
|
||||
}
|
||||
$content .= "\n"."\n"."Rechnungsadresse des Kunden vor der Änderung:"."\n";
|
||||
$content .= $this->user ? 'Firma: '.$this->user->billing_company."\n" : '';
|
||||
$content .= \App\Services\HTMLHelper::getSalutationLang($this->user->billing_salutation)." ";
|
||||
$content .= $this->user->billing_firstname." ";
|
||||
|
|
|
|||
|
|
@ -42,17 +42,46 @@ use PHPUnit\Framework\Constraint\Count;
|
|||
* @property array|null $attr
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereAttr($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereTransName($value)
|
||||
* @property bool|null $switch
|
||||
* @property bool|null $own_eur
|
||||
* @property bool|null $currency
|
||||
* @property string|null $currency_unit
|
||||
* @property bool|null $currency_calc
|
||||
* @property float|null $currency_faktor
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrency($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyCalc($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyFaktor($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyName($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereOwnEur($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereSwitch($value)
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\CountryPrice[] $country_prices
|
||||
* @property-read int|null $country_prices_count
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyUnit($value)
|
||||
*/
|
||||
class Country extends Model
|
||||
{
|
||||
protected $table = 'countries';
|
||||
|
||||
protected $casts = ['trans_name' => 'array', 'attr' => 'array'];
|
||||
protected $casts = [
|
||||
'switch' => 'bool',
|
||||
'own_eur' => 'bool',
|
||||
'currency' => 'bool',
|
||||
'currency_calc' => 'bool',
|
||||
'trans_name' => 'array',
|
||||
'attr' => 'array'
|
||||
];
|
||||
|
||||
protected $fillable = [
|
||||
'code', 'phone', 'en', 'de', 'es', 'fr', 'it', 'ru', 'active', 'trans_name', 'attr'
|
||||
'code', 'phone', 'en', 'de', 'es', 'fr', 'it', 'ru',
|
||||
'switch', 'own_eur', 'currency', 'currency_unit', 'currency_calc', 'currency_faktor',
|
||||
'active', 'trans_name', 'attr',
|
||||
];
|
||||
|
||||
public function country_prices()
|
||||
{
|
||||
return $this->hasMany(CountryPrice::class, 'country_id');
|
||||
}
|
||||
|
||||
public function getLocated($lang = false){
|
||||
|
||||
if(!$lang){
|
||||
|
|
@ -115,6 +144,17 @@ class Country extends Model
|
|||
return null;
|
||||
}
|
||||
|
||||
public static function getCountryIdByCodeOrOne($code){
|
||||
if($code == null){
|
||||
return 1;
|
||||
}
|
||||
$r = Country::where('code', '=', $code)->first();
|
||||
if($r){
|
||||
return $r->id;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
public static function getCountryIdByPhone($phone){
|
||||
if($phone == null){
|
||||
return null;
|
||||
|
|
|
|||
73
app/Models/CountryPrice.php
Normal file
73
app/Models/CountryPrice.php
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Created by Reliese Model.
|
||||
*/
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
/**
|
||||
* Class CountryPrice
|
||||
*
|
||||
* @property int $id
|
||||
* @property int $country_id
|
||||
* @property int $product_id
|
||||
* @property float $c_price
|
||||
* @property float $c_tax
|
||||
* @property float $c_price_old
|
||||
* @property float $c_currency
|
||||
* @property Carbon $created_at
|
||||
* @property Carbon $updated_at
|
||||
* @property Country $country
|
||||
* @property Product $product
|
||||
* @package App\Models
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice query()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCOwnEur($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCPrice($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCPriceOld($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCTax($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCountryId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCreatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereProductId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereUpdatedAt($value)
|
||||
* @mixin \Eloquent
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCCurrency($value)
|
||||
*/
|
||||
class CountryPrice extends Model
|
||||
{
|
||||
protected $table = 'country_prices';
|
||||
|
||||
protected $casts = [
|
||||
'country_id' => 'int',
|
||||
'product_id' => 'int',
|
||||
'c_price' => 'float',
|
||||
'c_tax' => 'float',
|
||||
'c_price_old' => 'float',
|
||||
'c_currency' => 'float'
|
||||
];
|
||||
|
||||
protected $fillable = [
|
||||
'country_id',
|
||||
'product_id',
|
||||
'c_price',
|
||||
'c_tax',
|
||||
'c_price_old',
|
||||
'c_currency'
|
||||
];
|
||||
|
||||
public function country()
|
||||
{
|
||||
return $this->belongsTo(Country::class);
|
||||
}
|
||||
|
||||
public function product()
|
||||
{
|
||||
return $this->belongsTo(Product::class);
|
||||
}
|
||||
}
|
||||
66
app/Models/Import.php
Normal file
66
app/Models/Import.php
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
|
||||
/**
|
||||
* App\Models\Import
|
||||
*
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Import newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Import newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Import query()
|
||||
* @mixin \Eloquent
|
||||
*/
|
||||
class Import extends Model
|
||||
{
|
||||
public static $start;
|
||||
public static $max_time;
|
||||
|
||||
|
||||
|
||||
public static $rules = [
|
||||
'file' => 'required|mimes:xls,xlsx'
|
||||
];
|
||||
|
||||
public static $messages = [
|
||||
'file.mimes' => 'Datei ist kein Excel Format',
|
||||
'file.required' => 'Excel is required'
|
||||
];
|
||||
|
||||
protected static $row = [];
|
||||
|
||||
public static function setRow($row){
|
||||
|
||||
// self::checkTime();
|
||||
self::$row[] = $row;
|
||||
}
|
||||
|
||||
|
||||
public static function checkTime(){
|
||||
|
||||
if(round((microtime(true) - self::$start), 2) > 29){
|
||||
echo 'Total execution time in seconds: ' . round((microtime(true) - self::$start), 2);
|
||||
die();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static function countRows(){
|
||||
return count(self::$row);
|
||||
}
|
||||
|
||||
|
||||
public static function break(){
|
||||
echo count(self::$row)."<br>";
|
||||
echo 'Total execution time in seconds: ' . round((microtime(true) - self::$start), 2);
|
||||
die();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -40,6 +40,8 @@ use Illuminate\Database\Eloquent\Model;
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereUpdatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereUserid($value)
|
||||
* @mixin \Eloquent
|
||||
* @property string|null $mode
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereMode($value)
|
||||
*/
|
||||
class PaymentTransaction extends Model
|
||||
{
|
||||
|
|
|
|||
|
|
@ -95,6 +95,14 @@ use Illuminate\Database\Eloquent\SoftDeletes;
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereIdentifier($value)
|
||||
* @property int|null $upgrade_to_id
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereUpgradeToId($value)
|
||||
* @property int|null $contents_total
|
||||
* @property int|null $unit
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereContentsTotal($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereUnit($value)
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\CountryPrice[] $country_prices
|
||||
* @property-read int|null $country_prices_count
|
||||
* @property int|null $wp_number
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereWpNumber($value)
|
||||
*/
|
||||
class Product extends Model
|
||||
{
|
||||
|
|
@ -115,7 +123,8 @@ class Product extends Model
|
|||
'trans_description' => 'array',
|
||||
'trans_usage' => 'array',
|
||||
'trans_ingredients' => 'array',
|
||||
'action' => 'array'
|
||||
'action' => 'array',
|
||||
'wp_number' => 'int'
|
||||
];
|
||||
use Sluggable;
|
||||
|
||||
|
|
@ -137,6 +146,7 @@ class Product extends Model
|
|||
'contents_total',
|
||||
'unit',
|
||||
'number',
|
||||
'wp_number',
|
||||
'icons',
|
||||
'description',
|
||||
'usage',
|
||||
|
|
@ -209,6 +219,10 @@ class Product extends Model
|
|||
return $this->hasMany('App\Models\ProductImage', 'product_id', 'id')->where('active', true)->orderBy('pos');
|
||||
}
|
||||
|
||||
public function country_prices()
|
||||
{
|
||||
return $this->hasMany(CountryPrice::class, 'product_id');
|
||||
}
|
||||
|
||||
public function getActionName($id = 0){
|
||||
if(isset($this->actions[$id])){
|
||||
|
|
@ -330,4 +344,30 @@ class Product extends Model
|
|||
}
|
||||
return rtrim($ret, ', ');
|
||||
}
|
||||
|
||||
public function getCountryPrice($country_id){
|
||||
return $this->country_prices->where('country_id', '=', $country_id)->first() ?: new CountryPrice();
|
||||
}
|
||||
|
||||
public function getCPrice($country_id){
|
||||
return $this->getCountryPrice($country_id)->c_price;
|
||||
}
|
||||
public function getCTax($country_id){
|
||||
return $this->getCountryPrice($country_id)->c_tax;
|
||||
}
|
||||
public function getCPriceOld($country_id){
|
||||
return $this->getCountryPrice($country_id)->c_price_old;
|
||||
}
|
||||
public function getCCurrency($country_id){
|
||||
return $this->getCountryPrice($country_id)->c_currency;
|
||||
}
|
||||
|
||||
public function getRealPrice(Country $country){
|
||||
if($country->own_eur && $this->getCPrice($country->id)){
|
||||
return $this->getCPrice($country->id);
|
||||
}
|
||||
return $this->price;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
|
||||
/**
|
||||
* App\Models\ShoppingOrder
|
||||
|
|
@ -53,11 +54,27 @@ use Illuminate\Database\Eloquent\Model;
|
|||
* @mixin \Eloquent
|
||||
* @property int|null $payment_for
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder wherePaymentFor($value)
|
||||
* @property int|null $member_id
|
||||
* @property string|null $mode
|
||||
* @property-read \App\User|null $member
|
||||
* @property-read \App\Models\UserHistory|null $user_history
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereMemberId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereMode($value)
|
||||
* @property \Illuminate\Support\Carbon|null $deleted_at
|
||||
* @property string|null $user_deleted_at
|
||||
* @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrder onlyTrashed()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereDeletedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereUserDeletedAt($value)
|
||||
* @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrder withTrashed()
|
||||
* @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrder withoutTrashed()
|
||||
*/
|
||||
class ShoppingOrder extends Model
|
||||
{
|
||||
protected $table = 'shopping_orders';
|
||||
|
||||
use SoftDeletes;
|
||||
protected $dates = ['deleted_at'];
|
||||
|
||||
protected $fillable = [
|
||||
'shopping_user_id',
|
||||
'auth_user_id',
|
||||
|
|
@ -71,6 +88,8 @@ class ShoppingOrder extends Model
|
|||
'tax',
|
||||
'total_shipping',
|
||||
'weight',
|
||||
'paid',
|
||||
'txaction',
|
||||
'mode',
|
||||
];
|
||||
|
||||
|
|
@ -82,7 +101,12 @@ class ShoppingOrder extends Model
|
|||
|
||||
public function country()
|
||||
{
|
||||
return $this->belongsTo('App\Models\Country','country_id');
|
||||
return $this->belongsTo('App\Models\Sh','country_id');
|
||||
}
|
||||
|
||||
public function shipping_country()
|
||||
{
|
||||
return $this->belongsTo('App\Models\ShippingCountry','country_id');
|
||||
}
|
||||
|
||||
public function user_shop()
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
|
||||
/**
|
||||
* App\Models\ShoppingOrderItem
|
||||
|
|
@ -36,6 +37,9 @@ class ShoppingOrderItem extends Model
|
|||
{
|
||||
protected $table = 'shopping_order_items';
|
||||
|
||||
use SoftDeletes;
|
||||
protected $dates = ['deleted_at'];
|
||||
|
||||
protected $fillable = [
|
||||
'shopping_order_id',
|
||||
'row_id',
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ use Illuminate\Database\Eloquent\Model;
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereUpdatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereWallettype($value)
|
||||
* @mixin \Eloquent
|
||||
* @property string|null $mode
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereMode($value)
|
||||
*/
|
||||
class ShoppingPayment extends Model
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
|
||||
/**
|
||||
* App\Models\ShoppingUser
|
||||
|
|
@ -75,11 +76,39 @@ use Illuminate\Database\Eloquent\Model;
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereOrders($value)
|
||||
* @property int|null $abo_options
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereAboOptions($value)
|
||||
* @property int|null $member_id
|
||||
* @property int|null $number
|
||||
* @property bool $is_like
|
||||
* @property array|null $notice
|
||||
* @property-read \App\User|null $auth_user
|
||||
* @property-read \App\User|null $member
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereIsLike($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereMemberId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereNotice($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereNumber($value)
|
||||
* @property bool|null $has_buyed
|
||||
* @property bool|null $subscribed
|
||||
* @property int|null $wp_order_number
|
||||
* @property string|null $wp_order_date
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereHasBuyed($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereSubscribed($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereWpOrderDate($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereWpOrderNumber($value)
|
||||
* @property \Illuminate\Support\Carbon|null $deleted_at
|
||||
* @property string|null $user_deleted_at
|
||||
* @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingUser onlyTrashed()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereDeletedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereUserDeletedAt($value)
|
||||
* @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingUser withTrashed()
|
||||
* @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingUser withoutTrashed()
|
||||
*/
|
||||
class ShoppingUser extends Model
|
||||
{
|
||||
protected $table = 'shopping_users';
|
||||
|
||||
use SoftDeletes;
|
||||
protected $dates = ['deleted_at'];
|
||||
|
||||
|
||||
|
||||
protected $fillable = [
|
||||
|
|
@ -110,7 +139,12 @@ class ShoppingUser extends Model
|
|||
'shipping_city',
|
||||
'shipping_country_id',
|
||||
'shipping_phone',
|
||||
'has_buyed',
|
||||
'subscribed',
|
||||
'notice',
|
||||
'mode',
|
||||
'wp_order_number',
|
||||
'wp_order_date',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
|
|
@ -118,6 +152,9 @@ class ShoppingUser extends Model
|
|||
'is_like' => 'bool',
|
||||
'accepted_data_checkbox' => 'bool',
|
||||
'same_as_billing' => 'bool',
|
||||
'has_buyed' => 'bool',
|
||||
'subscribed' => 'bool',
|
||||
'wp_order_number' => 'int',
|
||||
];
|
||||
|
||||
//can null
|
||||
|
|
@ -168,4 +205,23 @@ class ShoppingUser extends Model
|
|||
$this->notice = $notice;
|
||||
$this->save();
|
||||
}
|
||||
|
||||
public function firstEntryByNumber(){
|
||||
|
||||
if($this->number>0){
|
||||
if($shopping_user = ShoppingUser::where('number', $this->number)->orderBy('created_at', 'ASC')->first()){
|
||||
return $shopping_user;
|
||||
}
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
public function lastEntryByNumber(){
|
||||
|
||||
if($this->number>0){
|
||||
if($shopping_user = ShoppingUser::where('number', $this->number)->orderBy('created_at', 'DESC')->first()){
|
||||
return $shopping_user;
|
||||
}
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
|
|
@ -115,6 +115,10 @@ use Carbon\Carbon;
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereTaxableSales($value)
|
||||
* @property array|null $payment_data
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount wherePaymentData($value)
|
||||
* @property string|null $accepted_contract
|
||||
* @property array|null $notice
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereAcceptedContract($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereNotice($value)
|
||||
*/
|
||||
class UserAccount extends Model
|
||||
{
|
||||
|
|
|
|||
|
|
@ -41,6 +41,8 @@ use App\User;
|
|||
* @mixin \Eloquent
|
||||
* @property string|null $identifier
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereIdentifier($value)
|
||||
* @property int|null $abo_options
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereAboOptions($value)
|
||||
*/
|
||||
class UserHistory extends Model
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
namespace App\Models;
|
||||
|
||||
use App\User;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
|
|
@ -26,10 +27,26 @@ use Illuminate\Database\Eloquent\Model;
|
|||
* @property Carbon $delivered_at
|
||||
* @property Carbon $created_at
|
||||
* @property Carbon $updated_at
|
||||
*
|
||||
* @property User $user
|
||||
*
|
||||
* @package App\Models
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage query()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereCreatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereDeliveredAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereEmail($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereError($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereFail($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereMessage($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereScheduledAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSend($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSendUserId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSentAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSubject($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereUpdatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereUserId($value)
|
||||
* @mixin \Eloquent
|
||||
*/
|
||||
class UserMessage extends Model
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ namespace App\Providers;
|
|||
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
|
||||
use Laravel\Passport\Passport;
|
||||
|
||||
class AuthServiceProvider extends ServiceProvider
|
||||
{
|
||||
|
|
@ -24,6 +25,7 @@ class AuthServiceProvider extends ServiceProvider
|
|||
public function boot()
|
||||
{
|
||||
$this->registerPolicies();
|
||||
Passport::routes();
|
||||
|
||||
//
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,8 +23,6 @@ class RouteServiceProvider extends ServiceProvider
|
|||
*/
|
||||
public function boot()
|
||||
{
|
||||
//
|
||||
|
||||
parent::boot();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,12 +38,6 @@ class FileRepository extends BaseRepository {
|
|||
$this->{$name} = $value;
|
||||
}
|
||||
|
||||
/* public function load($id){
|
||||
$this->model = $id;
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
public function uploadFile( $form_data )
|
||||
{
|
||||
|
||||
|
|
@ -106,7 +100,7 @@ class FileRepository extends BaseRepository {
|
|||
'network_name' => 'required|max:255',
|
||||
'input_file_now' => 'required|mimes:png,pdf,jpg,jpeg|max:30000'
|
||||
);
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
|
||||
if ($validator->fails()) {
|
||||
// get the error messages from the validator
|
||||
|
|
|
|||
156
app/Repositories/ImportRepository.php
Normal file
156
app/Repositories/ImportRepository.php
Normal file
|
|
@ -0,0 +1,156 @@
|
|||
<?php
|
||||
|
||||
namespace App\Repositories;
|
||||
|
||||
use App\Models\Country;
|
||||
use App\Models\ShoppingUser;
|
||||
use Validator;
|
||||
use Response;
|
||||
use Excel;
|
||||
use Storage;
|
||||
use App\Models\Import;
|
||||
|
||||
|
||||
class ImportRepository extends BaseRepository {
|
||||
|
||||
|
||||
public function __construct(){
|
||||
}
|
||||
|
||||
public function upload( $form_data )
|
||||
{
|
||||
|
||||
$validator = Validator::make($form_data, Import::$rules, Import::$messages);
|
||||
|
||||
if ($validator->fails()) {
|
||||
|
||||
return Response::json([
|
||||
'error' => true,
|
||||
'message' => $validator->messages()->first(),
|
||||
'code' => 400
|
||||
], 400);
|
||||
|
||||
}
|
||||
$file = $form_data['file'];
|
||||
|
||||
$originalName = $file->getClientOriginalName();
|
||||
$extension = $file->getClientOriginalExtension();
|
||||
$originalNameWithoutExt = substr($originalName, 0, strlen($originalName) - strlen($extension) - 1);
|
||||
|
||||
$filename = $this->sanitize($originalNameWithoutExt);
|
||||
$allowed_filename = $filename.".".$extension;
|
||||
|
||||
Storage::disk('import')->put($allowed_filename, file_get_contents($file->getRealPath()));
|
||||
|
||||
|
||||
return Response::json([
|
||||
'error' => false,
|
||||
'filename' => $allowed_filename,
|
||||
'filedata' => 'xls',
|
||||
'redirect' => url(route('sysadmin_import_show', ['xls', $allowed_filename])),
|
||||
'code' => 200
|
||||
], 200);
|
||||
}
|
||||
|
||||
public function read($type, $file, $skip, $limit)
|
||||
{
|
||||
|
||||
if(!Storage::disk('import')->has($file)){
|
||||
return false;
|
||||
}
|
||||
return $this->import(storage_path("app/import/").$file, $file, $skip, $limit);
|
||||
|
||||
|
||||
}
|
||||
|
||||
protected function import($file_path, $file, $skip, $limit){
|
||||
|
||||
$salutation = array(1 => 'mr', 2 => 'ms', 3=>null);
|
||||
|
||||
$ret = [
|
||||
'count' => 0,
|
||||
'not' => 0,
|
||||
'imported' => [],
|
||||
'has_imported' => [],
|
||||
];
|
||||
/*
|
||||
* wp_order_number
|
||||
wp_order_date
|
||||
billing_company
|
||||
billing_salutation
|
||||
billing_firstname
|
||||
billing_lastname
|
||||
billing_address
|
||||
billing_address_2
|
||||
billing_zipcode
|
||||
billing_city
|
||||
billing_country_code
|
||||
billing_country
|
||||
billing_email
|
||||
billing_phone
|
||||
shipping_salutation
|
||||
shipping_company
|
||||
shipping_firstname
|
||||
shipping_lastname
|
||||
shipping_address
|
||||
shipping_address_2
|
||||
shipping_zipcode
|
||||
shipping_city
|
||||
shipping_country_code
|
||||
shipping_country
|
||||
*/
|
||||
|
||||
|
||||
$rows = Excel::toArray(new \App\Imports\ImportCollection(), $file_path);
|
||||
|
||||
foreach ($rows[0] as $row){
|
||||
$ret['count']++;
|
||||
if(isset($row['billing_email'])){
|
||||
if(ShoppingUser::where('billing_email', '=', $row['billing_email'])->count() > 0){
|
||||
$ssuser = ShoppingUser::where('billing_email', '=', $row['billing_email'])->first();
|
||||
if($ssuser->member_id){
|
||||
$ret['has_imported'][] = $row['billing_email']." - ".$ssuser->member->email;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
$row['billing_salutation'] = $salutation[$row['billing_salutation']];
|
||||
$row['billing_country_id'] = Country::getCountryIdByCodeOrOne($row['billing_country_code']);
|
||||
$row['billing_phone'] = strlen($row['billing_phone']) <= 3 ? '' : $row['billing_phone'];
|
||||
$row['same_as_billing'] = true;
|
||||
if(isset($row['shipping_salutation']) && $row['shipping_salutation'] > 0){
|
||||
$row['shipping_salutation'] = $salutation[$row['shipping_salutation']];
|
||||
$row['shipping_country_id'] = Country::getCountryIdByCodeOrOne($row['shipping_country_code']);
|
||||
$row['same_as_billing'] = false;
|
||||
}
|
||||
$row['member_id'] = 3;
|
||||
$row['number'] = ShoppingUser::max('number') + 1;
|
||||
$row['has_buyed'] = true;
|
||||
$row['subscribed'] = false;
|
||||
$ret['imported'][] = $row['billing_email'];
|
||||
|
||||
ShoppingUser::create($row);
|
||||
}else{
|
||||
$ret['not']++;
|
||||
}
|
||||
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
public function sanitize($string, $force_lowercase = true, $anal = false)
|
||||
{
|
||||
$strip = array("~", "`", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "=", "+", "[", "{", "]",
|
||||
"}", "\\", "|", ";", ":", "\"", "'", "‘", "’", "“", "”", "–", "—",
|
||||
"—", "–", ",", "<", ".", ">", "/", "?");
|
||||
$clean = trim(str_replace($strip, "", strip_tags($string)));
|
||||
$clean = preg_replace('/\s+/', "-", $clean);
|
||||
$clean = ($anal) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean ;
|
||||
|
||||
return ($force_lowercase) ?
|
||||
(function_exists('mb_strtolower')) ?
|
||||
mb_strtolower($clean, 'UTF-8') :
|
||||
strtolower($clean) :
|
||||
$clean;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -4,6 +4,7 @@ namespace App\Repositories;
|
|||
|
||||
|
||||
|
||||
use App\Models\CountryPrice;
|
||||
use App\Models\Product;
|
||||
use App\Models\ProductAttribute;
|
||||
use App\Models\ProductCategory;
|
||||
|
|
@ -38,6 +39,8 @@ class ProductRepository extends BaseRepository {
|
|||
|
||||
$this->updateCategories(isset($data['categories']) ? $data['categories'] : array());
|
||||
$this->updateAttributes(isset($data['attributes']) ? $data['attributes'] : array());
|
||||
$this->updateCountryPrices($data);
|
||||
|
||||
|
||||
return $this->model;
|
||||
}
|
||||
|
|
@ -84,6 +87,30 @@ class ProductRepository extends BaseRepository {
|
|||
return true;
|
||||
}
|
||||
|
||||
public function updateCountryPrices($data)
|
||||
{
|
||||
if(!isset($data['country_prices']) || !is_array($data['country_prices'])){
|
||||
return false;
|
||||
}
|
||||
foreach ($data['country_prices'] as $k => $country_id) {
|
||||
$cp = CountryPrice::updateOrCreate([
|
||||
'country_id' => $country_id,
|
||||
'product_id' => $this->model->id,
|
||||
],
|
||||
[
|
||||
'c_price' => isset($data['c_price'][$country_id]) ? reFormatNumber($data['c_price'][$country_id]) : null,
|
||||
'c_tax' => isset($data['c_tax'][$country_id]) ? reFormatNumber($data['c_tax'][$country_id]) : null,
|
||||
'c_price_old' => isset($data['c_price_old'][$country_id]) ? reFormatNumber($data['c_price_old'][$country_id]) : null,
|
||||
'c_currency' => isset($data['c_currency'][$country_id]) ? reFormatNumber($data['c_currency'][$country_id]) : null,
|
||||
]);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
public function copy($model)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ class CustomerPriority
|
|||
return $shopping_users;
|
||||
}
|
||||
|
||||
public static function checkOne($shopping_user, $mail=false){
|
||||
public static function checkOne($shopping_user, $mail=false, $newCustomer = true){
|
||||
//look for entry
|
||||
if(self::entryExists($shopping_user)){
|
||||
return 'exists';
|
||||
|
|
@ -40,16 +40,23 @@ class CustomerPriority
|
|||
}
|
||||
return 'like';
|
||||
}
|
||||
if($newCustomer){
|
||||
self::newCustomer($shopping_user);
|
||||
return 'update';
|
||||
}
|
||||
return 'new';
|
||||
|
||||
}
|
||||
|
||||
public static function setIsLike($shopping_user, $set_like_shopping_user, $send_member_mail)
|
||||
public static function setIsLike($shopping_user, $set_like_shopping_user, $send_member_mail, $change_shopping_user=false)
|
||||
{
|
||||
if ($shopping_user->id === $set_like_shopping_user->id) {
|
||||
//set new customer for shopping_user
|
||||
if($change_shopping_user){
|
||||
self::newCustomerNumber($shopping_user);
|
||||
$send_member_mail = false;
|
||||
}else{
|
||||
self::newCustomer($shopping_user);
|
||||
}
|
||||
} else {
|
||||
//set existing customer for shopping_user
|
||||
self::existingCustomer($shopping_user, $set_like_shopping_user);
|
||||
|
|
@ -104,6 +111,71 @@ class CustomerPriority
|
|||
}
|
||||
}
|
||||
|
||||
public static function checkChangeOne($shopping_user, $data, $mail=false){
|
||||
|
||||
$matches = [];
|
||||
$change = [];
|
||||
$ret = 'update';
|
||||
//email geändert
|
||||
if(isset($data['billing_email']) && $shopping_user->billing_email != $data['billing_email']){
|
||||
$found = ShoppingUser::where('auth_user_id', '=', NULL)
|
||||
->where('number', '!=', NULL) //has number
|
||||
->where('id', '!=', $shopping_user->id)
|
||||
->where('billing_email', '=', $data['billing_email'])
|
||||
->get()->pluck('number', 'id')->unique()->toArray();
|
||||
if($found && count($found)){
|
||||
foreach ($found as $key=>$val){
|
||||
$matches[$key] = $val;
|
||||
}
|
||||
$ret = 'exists';
|
||||
$change['billing_email'] = $data['billing_email'];
|
||||
}
|
||||
}
|
||||
//Anschrift geändert
|
||||
if(isset($data['billing_lastname']) && isset($data['billing_zipcode']) && ($shopping_user->billing_lastname != $data['billing_lastname'] || $shopping_user->billing_zipcode != $data['billing_zipcode'])){
|
||||
$found = ShoppingUser::select('*')
|
||||
->where('auth_user_id', '=', NULL)
|
||||
->where('number', '!=', NULL) //has number
|
||||
->where('id', '!=', $shopping_user->id)
|
||||
->where('billing_lastname', '=', $data['billing_lastname'])
|
||||
->where('billing_zipcode', '=', $data['billing_zipcode'])
|
||||
->get()->pluck('number', 'id')->unique()->toArray();
|
||||
if($found && count($found)){
|
||||
foreach ($found as $key=>$val){
|
||||
$matches[$key] = $val;
|
||||
}
|
||||
$ret = 'like';
|
||||
$change['billing_lastname'] = $data['billing_lastname'];
|
||||
$change['billing_zipcode'] = $data['billing_zipcode'];
|
||||
}
|
||||
}
|
||||
if($matches){
|
||||
$shopping_user->is_like = true;
|
||||
$shopping_user->setNotice(self::$user_notice_key, $matches);
|
||||
$shopping_user->save();
|
||||
}
|
||||
//look for entry
|
||||
if($matches && $mail){ //send mail
|
||||
Mail::to(config('app.info_mail'))->send(new MailInfo($shopping_user, 'change_is_like_customer', $change));
|
||||
}
|
||||
|
||||
return $ret;
|
||||
|
||||
}
|
||||
|
||||
public static function checkNewOne($shopping_user, $mail=false){
|
||||
|
||||
if(self::entryLike($shopping_user)){
|
||||
if($mail){ //send mail
|
||||
Mail::to(config('app.info_mail'))->send(new MailInfo($shopping_user, 'check_is_like_customer'));
|
||||
}
|
||||
//return 'like';
|
||||
}
|
||||
$shopping_user->number = self::nextNumber();
|
||||
$shopping_user->save();
|
||||
return true;
|
||||
}
|
||||
|
||||
private static function entryExists($shopping_user){
|
||||
//check same email
|
||||
$matches = ShoppingUser::where('auth_user_id', '=', NULL)
|
||||
|
|
@ -155,8 +227,16 @@ class CustomerPriority
|
|||
}
|
||||
}
|
||||
|
||||
private static function changeCustomer($shopping_user, $member_id, $number){
|
||||
private static function newCustomerNumber($shopping_user)
|
||||
{
|
||||
\App\Services\Shop::newUserOrder($shopping_user->number);
|
||||
$shopping_user->number = self::nextNumber();
|
||||
$shopping_user->save();
|
||||
\App\Services\Shop::newUserOrder($shopping_user->number);
|
||||
|
||||
}
|
||||
|
||||
private static function changeCustomer($shopping_user, $member_id, $number){
|
||||
$old_number = $shopping_user->number;
|
||||
$shopping_user->member_id = $member_id;
|
||||
$shopping_user->number = $number;
|
||||
|
|
@ -167,12 +247,10 @@ class CustomerPriority
|
|||
}
|
||||
\App\Services\Shop::newUserOrder($old_number);
|
||||
\App\Services\Shop::newUserOrder($number);
|
||||
|
||||
}
|
||||
|
||||
private static function existingCustomer($shopping_user, $set_like_shopping_user){
|
||||
$old_number = $shopping_user->number;
|
||||
|
||||
$shopping_user->member_id = $set_like_shopping_user->member_id;
|
||||
$shopping_user->number = $set_like_shopping_user->number;
|
||||
$shopping_user->save();
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ class Payment
|
|||
'paid' => "bezahlt",
|
||||
'appointed' => "offen",
|
||||
'failed' => "abbruch",
|
||||
'extern' => "extern",
|
||||
'NULL' => 'keine Zahlung',
|
||||
];
|
||||
|
||||
|
|
@ -20,6 +21,7 @@ class Payment
|
|||
'paid' => "success",
|
||||
'appointed' => "warning",
|
||||
'failed' => "danger",
|
||||
'extern' => "success",
|
||||
];
|
||||
|
||||
|
||||
|
|
@ -41,6 +43,9 @@ class Payment
|
|||
if($shopping_order->mode === 'test'){
|
||||
return '<span class="badge badge-pill badge-default">'.strtoupper($shopping_order->mode).' - '.self::getFormattedTxaction($shopping_order->txaction).'</span>';
|
||||
}
|
||||
if($shopping_order->mode === 'dev'){
|
||||
return '<span class="badge badge-pill badge-default">'.strtoupper($shopping_order->mode).' - '.self::getFormattedTxaction($shopping_order->txaction).'</span>';
|
||||
}
|
||||
return '<span class="badge badge-pill badge-'.self::getFormattedTxactionColor($shopping_order->txaction).'">'.self::getFormattedTxaction($shopping_order->txaction).'</span>';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ class Shop
|
|||
{
|
||||
public static function userOrders() {
|
||||
$shopping_users = ShoppingUser::whereHas('shopping_order', function($q) {
|
||||
$q->where('txaction', 'paid')->OrWhere('txaction', 'appointed');
|
||||
$q->where('txaction', 'paid')->OrWhere('txaction', 'appointed')->OrWhere('txaction', 'extern');
|
||||
})->where('orders', '=', NULL)->get();
|
||||
foreach ($shopping_users as $shopping_user) {
|
||||
if ($shopping_user->number) {
|
||||
|
|
@ -24,10 +24,11 @@ class Shop
|
|||
}
|
||||
|
||||
public static function newUserOrder($number){
|
||||
if($number > 0){
|
||||
$shopping_users = ShoppingUser::where('number', '=', $number)->get();
|
||||
$orders = 1;
|
||||
foreach ($shopping_users as $shopping_user) {
|
||||
if($shopping_user->shopping_order && ($shopping_user->shopping_order->txaction === 'paid' || $shopping_user->shopping_order->txaction === 'appointed')){
|
||||
if($shopping_user->shopping_order && ($shopping_user->shopping_order->txaction === 'paid' || $shopping_user->shopping_order->txaction === 'appointed' || $shopping_user->shopping_order->txaction === 'extern')){
|
||||
$shopping_user->orders = $orders++;
|
||||
|
||||
}else{
|
||||
|
|
@ -37,4 +38,5 @@ class Shop
|
|||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -37,11 +37,20 @@ class Util
|
|||
return 'd.m.Y - H:i';
|
||||
}
|
||||
|
||||
public static function formatNumber($value){
|
||||
if(\App::getLocale() === "en"){
|
||||
return number_format($value, 2, '.', ',');
|
||||
public static function _format_number($value){
|
||||
return preg_replace("/[^0-9,]/", "", $value);
|
||||
|
||||
}
|
||||
return number_format($value, 2, ',', '.');
|
||||
|
||||
public static function reFormatNumber($value){
|
||||
return (float) str_replace(',', '.', self::_format_number($value));
|
||||
}
|
||||
|
||||
public static function formatNumber($value, $dec=2){
|
||||
if(\App::getLocale() === "en"){
|
||||
return number_format($value, $dec, '.', ',');
|
||||
}
|
||||
return number_format($value, $dec, ',', '.');
|
||||
}
|
||||
|
||||
public static function utf8ize( $mixed ) {
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ class Yard extends Cart
|
|||
public function subtotalWithShipping($decimals = null, $decimalPoint = null, $thousandSeperator = null)
|
||||
{
|
||||
$taxRate =config('cart.tax');
|
||||
$total = floatval($this->total(2, '.', '')) + $this->shipping;
|
||||
$total = (float) ($this->total(2, '.', '')) + $this->shipping;
|
||||
$totalTax = $total/ (100 + $taxRate) * $taxRate;
|
||||
return $this->numberFormat(($total - $totalTax), $decimals, $decimalPoint, $thousandSeperator);
|
||||
}
|
||||
|
|
@ -192,7 +192,7 @@ class Yard extends Cart
|
|||
public function taxWithShipping($decimals = null, $decimalPoint = null, $thousandSeperator = null)
|
||||
{
|
||||
$taxRate =config('cart.tax');
|
||||
$total = floatval($this->total(2, '.', '')) + $this->shipping;
|
||||
$total = (float) ($this->total(2, '.', '')) + $this->shipping;
|
||||
$totalTax = $total/ (100 + $taxRate) * $taxRate;
|
||||
return $this->numberFormat($totalTax, $decimals, $decimalPoint, $thousandSeperator);
|
||||
}
|
||||
|
|
@ -200,7 +200,7 @@ class Yard extends Cart
|
|||
|
||||
public function totalWithShipping($decimals = null, $decimalPoint = null, $thousandSeperator = null)
|
||||
{
|
||||
$total = floatval($this->total(2, '.', '')) + $this->shipping;
|
||||
$total = (float) ($this->total(2, '.', '')) + $this->shipping;
|
||||
return $this->numberFormat($total, $decimals, $decimalPoint, $thousandSeperator);
|
||||
}
|
||||
|
||||
|
|
|
|||
28
app/User.php
28
app/User.php
|
|
@ -8,7 +8,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
|
|||
use Illuminate\Support\Facades\Mail;
|
||||
use App\Mail\MailResetPassword;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
|
||||
use Laravel\Passport\HasApiTokens;
|
||||
|
||||
/**
|
||||
* App\User
|
||||
|
|
@ -99,10 +99,23 @@ use Illuminate\Database\Eloquent\SoftDeletes;
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereReleaseAccount($value)
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\UserHistory[] $user_histories
|
||||
* @property-read int|null $user_histories_count
|
||||
* @property int|null $test_mode
|
||||
* @property array|null $settings
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrder[] $member_shopping_orders
|
||||
* @property-read int|null $member_shopping_orders_count
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingUser[] $member_shopping_users
|
||||
* @property-read int|null $member_shopping_users_count
|
||||
* @property-read \App\Models\Product|null $payment_order_product
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereSettings($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereTestMode($value)
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\Laravel\Passport\Client[] $clients
|
||||
* @property-read int|null $clients_count
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection|\Laravel\Passport\Token[] $tokens
|
||||
* @property-read int|null $tokens_count
|
||||
*/
|
||||
class User extends Authenticatable
|
||||
{
|
||||
use Notifiable;
|
||||
use Notifiable, HasApiTokens;
|
||||
|
||||
use SoftDeletes;
|
||||
protected $dates = ['deleted_at'];
|
||||
|
|
@ -242,6 +255,17 @@ class User extends Authenticatable
|
|||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
public function isApiUser()
|
||||
{
|
||||
if($this->admin >= 4){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -42,3 +42,30 @@ if (! function_exists('set_user_attr')) {
|
|||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
if (! function_exists('get_active_badge')) {
|
||||
function get_active_badge($active, $tooltip = false, $pos = "top")
|
||||
{
|
||||
if($tooltip){
|
||||
$tooltip = 'data-toggle="tooltip" data-placement="top" data-original-title="'.$tooltip.'"';
|
||||
}
|
||||
return $active ? '<span class="badge badge-pill badge-success" '.$tooltip.'><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger" '.$tooltip.'><i class="fa fa-times"></i></span>';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (! function_exists('formatNumber')) {
|
||||
function formatNumber($number, $dec=2)
|
||||
{
|
||||
return !$number ? $number : Util::formatNumber($number, $dec);
|
||||
}
|
||||
}
|
||||
|
||||
if (! function_exists('reFormatNumber')) {
|
||||
function reFormatNumber($number)
|
||||
{
|
||||
return !$number ? $number : Util::reFormatNumber($number);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
BIN
archiv.tar
Normal file
BIN
archiv.tar
Normal file
Binary file not shown.
58
bootstrap/cache/packages.php
vendored
Normal file → Executable file
58
bootstrap/cache/packages.php
vendored
Normal file → Executable file
|
|
@ -6,6 +6,28 @@
|
|||
0 => 'Askedio\\Laravel5ProfanityFilter\\Providers\\ProfanityFilterServiceProvider',
|
||||
),
|
||||
),
|
||||
'barryvdh/laravel-debugbar' =>
|
||||
array (
|
||||
'providers' =>
|
||||
array (
|
||||
0 => 'Barryvdh\\Debugbar\\ServiceProvider',
|
||||
),
|
||||
'aliases' =>
|
||||
array (
|
||||
'Debugbar' => 'Barryvdh\\Debugbar\\Facade',
|
||||
),
|
||||
),
|
||||
'barryvdh/laravel-dompdf' =>
|
||||
array (
|
||||
'providers' =>
|
||||
array (
|
||||
0 => 'Barryvdh\\DomPDF\\ServiceProvider',
|
||||
),
|
||||
'aliases' =>
|
||||
array (
|
||||
'PDF' => 'Barryvdh\\DomPDF\\Facade',
|
||||
),
|
||||
),
|
||||
'barryvdh/laravel-ide-helper' =>
|
||||
array (
|
||||
'providers' =>
|
||||
|
|
@ -27,17 +49,6 @@
|
|||
0 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
|
||||
),
|
||||
),
|
||||
'gloudemans/shoppingcart' =>
|
||||
array (
|
||||
'providers' =>
|
||||
array (
|
||||
0 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider',
|
||||
),
|
||||
'aliases' =>
|
||||
array (
|
||||
'Cart' => 'Gloudemans\\Shoppingcart\\Facades\\Cart',
|
||||
),
|
||||
),
|
||||
'intervention/image' =>
|
||||
array (
|
||||
'providers' =>
|
||||
|
|
@ -71,6 +82,13 @@
|
|||
'Flash' => 'Laracasts\\Flash\\Flash',
|
||||
),
|
||||
),
|
||||
'laravel/passport' =>
|
||||
array (
|
||||
'providers' =>
|
||||
array (
|
||||
0 => 'Laravel\\Passport\\PassportServiceProvider',
|
||||
),
|
||||
),
|
||||
'laravel/tinker' =>
|
||||
array (
|
||||
'providers' =>
|
||||
|
|
@ -101,6 +119,13 @@
|
|||
'Excel' => 'Maatwebsite\\Excel\\Facades\\Excel',
|
||||
),
|
||||
),
|
||||
'nesbot/carbon' =>
|
||||
array (
|
||||
'providers' =>
|
||||
array (
|
||||
0 => 'Carbon\\Laravel\\ServiceProvider',
|
||||
),
|
||||
),
|
||||
'nunomaduro/collision' =>
|
||||
array (
|
||||
'providers' =>
|
||||
|
|
@ -108,6 +133,17 @@
|
|||
0 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
|
||||
),
|
||||
),
|
||||
'olimortimer/laravelshoppingcart' =>
|
||||
array (
|
||||
'providers' =>
|
||||
array (
|
||||
0 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider',
|
||||
),
|
||||
'aliases' =>
|
||||
array (
|
||||
'Cart' => 'Gloudemans\\Shoppingcart\\Facades\\Cart',
|
||||
),
|
||||
),
|
||||
'reliese/laravel' =>
|
||||
array (
|
||||
'providers' =>
|
||||
|
|
|
|||
137
bootstrap/cache/services.php
vendored
Normal file → Executable file
137
bootstrap/cache/services.php
vendored
Normal file → Executable file
|
|
@ -24,32 +24,36 @@
|
|||
20 => 'Illuminate\\Validation\\ValidationServiceProvider',
|
||||
21 => 'Illuminate\\View\\ViewServiceProvider',
|
||||
22 => 'Askedio\\Laravel5ProfanityFilter\\Providers\\ProfanityFilterServiceProvider',
|
||||
23 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider',
|
||||
24 => 'Cviebrock\\EloquentSluggable\\ServiceProvider',
|
||||
25 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
|
||||
26 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider',
|
||||
27 => 'Intervention\\Image\\ImageServiceProvider',
|
||||
28 => 'Jenssegers\\Date\\DateServiceProvider',
|
||||
29 => 'Laracasts\\Flash\\FlashServiceProvider',
|
||||
30 => 'Laravel\\Tinker\\TinkerServiceProvider',
|
||||
31 => 'Collective\\Html\\HtmlServiceProvider',
|
||||
32 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
|
||||
33 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
|
||||
34 => 'Reliese\\Coders\\CodersServiceProvider',
|
||||
35 => 'Yajra\\DataTables\\DataTablesServiceProvider',
|
||||
36 => 'Reliese\\Coders\\CodersServiceProvider',
|
||||
37 => 'Laravel\\Tinker\\TinkerServiceProvider',
|
||||
38 => 'App\\Providers\\AppServiceProvider',
|
||||
39 => 'App\\Providers\\AuthServiceProvider',
|
||||
40 => 'App\\Providers\\EventServiceProvider',
|
||||
41 => 'App\\Providers\\RouteServiceProvider',
|
||||
42 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider',
|
||||
43 => 'Jenssegers\\Date\\DateServiceProvider',
|
||||
44 => 'Collective\\Html\\HtmlServiceProvider',
|
||||
45 => 'Intervention\\Image\\ImageServiceProvider',
|
||||
46 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
|
||||
47 => 'Yajra\\DataTables\\DataTablesServiceProvider',
|
||||
48 => 'App\\Providers\\YardServiceProvider',
|
||||
23 => 'Barryvdh\\Debugbar\\ServiceProvider',
|
||||
24 => 'Barryvdh\\DomPDF\\ServiceProvider',
|
||||
25 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider',
|
||||
26 => 'Cviebrock\\EloquentSluggable\\ServiceProvider',
|
||||
27 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
|
||||
28 => 'Intervention\\Image\\ImageServiceProvider',
|
||||
29 => 'Jenssegers\\Date\\DateServiceProvider',
|
||||
30 => 'Laracasts\\Flash\\FlashServiceProvider',
|
||||
31 => 'Laravel\\Passport\\PassportServiceProvider',
|
||||
32 => 'Laravel\\Tinker\\TinkerServiceProvider',
|
||||
33 => 'Collective\\Html\\HtmlServiceProvider',
|
||||
34 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
|
||||
35 => 'Carbon\\Laravel\\ServiceProvider',
|
||||
36 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
|
||||
37 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider',
|
||||
38 => 'Reliese\\Coders\\CodersServiceProvider',
|
||||
39 => 'Yajra\\DataTables\\DataTablesServiceProvider',
|
||||
40 => 'Reliese\\Coders\\CodersServiceProvider',
|
||||
41 => 'Laravel\\Tinker\\TinkerServiceProvider',
|
||||
42 => 'App\\Providers\\AppServiceProvider',
|
||||
43 => 'App\\Providers\\AuthServiceProvider',
|
||||
44 => 'App\\Providers\\EventServiceProvider',
|
||||
45 => 'App\\Providers\\RouteServiceProvider',
|
||||
46 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider',
|
||||
47 => 'Jenssegers\\Date\\DateServiceProvider',
|
||||
48 => 'Collective\\Html\\HtmlServiceProvider',
|
||||
49 => 'Intervention\\Image\\ImageServiceProvider',
|
||||
50 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
|
||||
51 => 'Yajra\\DataTables\\DataTablesServiceProvider',
|
||||
52 => 'App\\Providers\\YardServiceProvider',
|
||||
),
|
||||
'eager' =>
|
||||
array (
|
||||
|
|
@ -64,23 +68,32 @@
|
|||
8 => 'Illuminate\\Session\\SessionServiceProvider',
|
||||
9 => 'Illuminate\\View\\ViewServiceProvider',
|
||||
10 => 'Askedio\\Laravel5ProfanityFilter\\Providers\\ProfanityFilterServiceProvider',
|
||||
11 => 'Cviebrock\\EloquentSluggable\\ServiceProvider',
|
||||
12 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
|
||||
13 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider',
|
||||
14 => 'Intervention\\Image\\ImageServiceProvider',
|
||||
15 => 'Jenssegers\\Date\\DateServiceProvider',
|
||||
16 => 'Laracasts\\Flash\\FlashServiceProvider',
|
||||
17 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
|
||||
18 => 'Yajra\\DataTables\\DataTablesServiceProvider',
|
||||
19 => 'App\\Providers\\AppServiceProvider',
|
||||
20 => 'App\\Providers\\AuthServiceProvider',
|
||||
21 => 'App\\Providers\\EventServiceProvider',
|
||||
22 => 'App\\Providers\\RouteServiceProvider',
|
||||
23 => 'Jenssegers\\Date\\DateServiceProvider',
|
||||
24 => 'Intervention\\Image\\ImageServiceProvider',
|
||||
25 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
|
||||
26 => 'Yajra\\DataTables\\DataTablesServiceProvider',
|
||||
27 => 'App\\Providers\\YardServiceProvider',
|
||||
11 => 'Barryvdh\\Debugbar\\ServiceProvider',
|
||||
12 => 'Barryvdh\\DomPDF\\ServiceProvider',
|
||||
13 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider',
|
||||
14 => 'Cviebrock\\EloquentSluggable\\ServiceProvider',
|
||||
15 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
|
||||
16 => 'Intervention\\Image\\ImageServiceProvider',
|
||||
17 => 'Jenssegers\\Date\\DateServiceProvider',
|
||||
18 => 'Laracasts\\Flash\\FlashServiceProvider',
|
||||
19 => 'Laravel\\Passport\\PassportServiceProvider',
|
||||
20 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
|
||||
21 => 'Carbon\\Laravel\\ServiceProvider',
|
||||
22 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
|
||||
23 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider',
|
||||
24 => 'Reliese\\Coders\\CodersServiceProvider',
|
||||
25 => 'Yajra\\DataTables\\DataTablesServiceProvider',
|
||||
26 => 'Reliese\\Coders\\CodersServiceProvider',
|
||||
27 => 'App\\Providers\\AppServiceProvider',
|
||||
28 => 'App\\Providers\\AuthServiceProvider',
|
||||
29 => 'App\\Providers\\EventServiceProvider',
|
||||
30 => 'App\\Providers\\RouteServiceProvider',
|
||||
31 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider',
|
||||
32 => 'Jenssegers\\Date\\DateServiceProvider',
|
||||
33 => 'Intervention\\Image\\ImageServiceProvider',
|
||||
34 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
|
||||
35 => 'Yajra\\DataTables\\DataTablesServiceProvider',
|
||||
36 => 'App\\Providers\\YardServiceProvider',
|
||||
),
|
||||
'deferred' =>
|
||||
array (
|
||||
|
|
@ -92,6 +105,7 @@
|
|||
'Illuminate\\Contracts\\Bus\\QueueingDispatcher' => 'Illuminate\\Bus\\BusServiceProvider',
|
||||
'cache' => 'Illuminate\\Cache\\CacheServiceProvider',
|
||||
'cache.store' => 'Illuminate\\Cache\\CacheServiceProvider',
|
||||
'cache.psr6' => 'Illuminate\\Cache\\CacheServiceProvider',
|
||||
'memcached.connector' => 'Illuminate\\Cache\\CacheServiceProvider',
|
||||
'command.cache.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.cache.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
|
|
@ -99,16 +113,15 @@
|
|||
'command.auth.resets.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.config.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.config.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.db.wipe' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.down' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.environment' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.event.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.event.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.event.list' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.key.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.fresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.optimize' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.optimize.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.package.discover' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.preset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.queue.failed' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
|
|
@ -128,8 +141,6 @@
|
|||
'command.up' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.view.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.view.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.app.name' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.auth.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.cache.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.channel.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.console.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
|
|
@ -142,7 +153,6 @@
|
|||
'command.listener.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.mail.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.middleware.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.model.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.notification.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.notification.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
|
|
@ -162,6 +172,14 @@
|
|||
'migrator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'migration.repository' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'migration.creator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.fresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'composer' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
|
||||
'hash' => 'Illuminate\\Hashing\\HashServiceProvider',
|
||||
'hash.driver' => 'Illuminate\\Hashing\\HashServiceProvider',
|
||||
|
|
@ -183,15 +201,11 @@
|
|||
'translation.loader' => 'Illuminate\\Translation\\TranslationServiceProvider',
|
||||
'validator' => 'Illuminate\\Validation\\ValidationServiceProvider',
|
||||
'validation.presence' => 'Illuminate\\Validation\\ValidationServiceProvider',
|
||||
'command.ide-helper.generate' => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider',
|
||||
'command.ide-helper.models' => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider',
|
||||
'command.tinker' => 'Laravel\\Tinker\\TinkerServiceProvider',
|
||||
'html' => 'Collective\\Html\\HtmlServiceProvider',
|
||||
'form' => 'Collective\\Html\\HtmlServiceProvider',
|
||||
'Collective\\Html\\HtmlBuilder' => 'Collective\\Html\\HtmlServiceProvider',
|
||||
'Collective\\Html\\FormBuilder' => 'Collective\\Html\\HtmlServiceProvider',
|
||||
'NunoMaduro\\Collision\\Contracts\\Provider' => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
|
||||
'Reliese\\Coders\\Model\\Factory' => 'Reliese\\Coders\\CodersServiceProvider',
|
||||
),
|
||||
'when' =>
|
||||
array (
|
||||
|
|
@ -231,20 +245,11 @@
|
|||
'Illuminate\\Validation\\ValidationServiceProvider' =>
|
||||
array (
|
||||
),
|
||||
'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider' =>
|
||||
array (
|
||||
),
|
||||
'Laravel\\Tinker\\TinkerServiceProvider' =>
|
||||
array (
|
||||
),
|
||||
'Collective\\Html\\HtmlServiceProvider' =>
|
||||
array (
|
||||
),
|
||||
'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider' =>
|
||||
array (
|
||||
),
|
||||
'Reliese\\Coders\\CodersServiceProvider' =>
|
||||
array (
|
||||
),
|
||||
),
|
||||
);
|
||||
|
|
@ -5,32 +5,36 @@
|
|||
"license": "MIT",
|
||||
"type": "project",
|
||||
"require": {
|
||||
"php": "^7.1.3",
|
||||
"askedio/laravel5-profanity-filter": "^1.10",
|
||||
"cviebrock/eloquent-sluggable": "^4.5",
|
||||
"doctrine/dbal": "^2.8",
|
||||
"fideloper/proxy": "^4.0",
|
||||
"gloudemans/shoppingcart": "^2.5",
|
||||
"guzzlehttp/guzzle": "6.3.3",
|
||||
"intervention/image": "2.4.2",
|
||||
"jenssegers/date": "^3.4",
|
||||
"laracasts/flash": "3.0.2",
|
||||
"laravel/framework": "5.6.*",
|
||||
"laravel/tinker": "^1.0",
|
||||
"laravelcollective/html": "5.6.x-dev",
|
||||
"maatwebsite/excel": "2.1.30",
|
||||
"reliese/laravel": "^0.0.14",
|
||||
"setasign/fpdf": "^1.8",
|
||||
"php": "^7.2.5",
|
||||
"askedio/laravel5-profanity-filter": "*",
|
||||
"barryvdh/laravel-dompdf": "^0.8.5",
|
||||
"cviebrock/eloquent-sluggable": "^6.0",
|
||||
"doctrine/dbal": "*",
|
||||
"fideloper/proxy": "*",
|
||||
"guzzlehttp/guzzle": "*",
|
||||
"intervention/image": "*",
|
||||
"jenssegers/date": "*",
|
||||
"laracasts/flash": "*",
|
||||
"laravel/framework": "^6.0",
|
||||
"laravel/helpers": "^1.1",
|
||||
"laravel/passport": "*",
|
||||
"laravel/tinker": "*",
|
||||
"laravelcollective/html": "*",
|
||||
"maatwebsite/excel": "^3.1",
|
||||
"olimortimer/laravelshoppingcart": "*",
|
||||
"reliese/laravel": "*",
|
||||
"setasign/fpdf": "1.8.*",
|
||||
"setasign/fpdi": "^2.2",
|
||||
"yajra/laravel-datatables-oracle": "^8.8"
|
||||
"yajra/laravel-datatables-oracle": "*"
|
||||
},
|
||||
"require-dev": {
|
||||
"barryvdh/laravel-ide-helper": "^2.5",
|
||||
"filp/whoops": "^2.0",
|
||||
"fzaninotto/faker": "^1.4",
|
||||
"mockery/mockery": "^1.0",
|
||||
"nunomaduro/collision": "^2.0",
|
||||
"phpunit/phpunit": "^7.0"
|
||||
"barryvdh/laravel-debugbar": "^3.2",
|
||||
"barryvdh/laravel-ide-helper": "*",
|
||||
"filp/whoops": "*",
|
||||
"fzaninotto/faker": "*",
|
||||
"mockery/mockery": "*",
|
||||
"nunomaduro/collision": "*",
|
||||
"phpunit/phpunit": "*"
|
||||
},
|
||||
"autoload": {
|
||||
"files": [
|
||||
|
|
|
|||
4296
composer.lock
generated
4296
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -42,7 +42,7 @@ return [
|
|||
],
|
||||
|
||||
'api' => [
|
||||
'driver' => 'token',
|
||||
'driver' => 'passport',
|
||||
'provider' => 'users',
|
||||
],
|
||||
],
|
||||
|
|
@ -69,6 +69,10 @@ return [
|
|||
'driver' => 'eloquent',
|
||||
'model' => App\User::class,
|
||||
],
|
||||
/* 'api_users' => [
|
||||
'driver' => 'eloquent',
|
||||
'model' => App\ApiUser::class,
|
||||
],*/
|
||||
|
||||
// 'users' => [
|
||||
// 'driver' => 'database',
|
||||
|
|
@ -96,7 +100,7 @@ return [
|
|||
'provider' => 'users',
|
||||
'table' => 'password_resets',
|
||||
'expire' => 60,
|
||||
],
|
||||
]
|
||||
],
|
||||
|
||||
];
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ return [
|
|||
'charset' => 'utf8mb4',
|
||||
'collation' => 'utf8mb4_unicode_ci',
|
||||
'prefix' => '',
|
||||
'strict' => true,
|
||||
'strict' => false,
|
||||
'engine' => null,
|
||||
],
|
||||
|
||||
|
|
|
|||
704
config/excel.php
704
config/excel.php
|
|
@ -1,704 +0,0 @@
|
|||
<?php
|
||||
|
||||
return array(
|
||||
|
||||
'cache' => [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Enable/Disable cell caching
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'enable' => true,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Caching driver
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Set the caching driver
|
||||
|
|
||||
| Available methods:
|
||||
| memory|gzip|serialized|igbinary|discISAM|apc|memcache|temp|wincache|sqlite|sqlite3
|
||||
|
|
||||
*/
|
||||
'driver' => 'memory',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Cache settings
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'settings' => [
|
||||
|
||||
'memoryCacheSize' => '32MB',
|
||||
'cacheTime' => 600
|
||||
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Memcache settings
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'memcache' => [
|
||||
|
||||
'host' => 'localhost',
|
||||
'port' => 11211,
|
||||
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Cache dir (for discISAM)
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
'dir' => storage_path('cache')
|
||||
],
|
||||
|
||||
'properties' => [
|
||||
'creator' => 'Maatwebsite',
|
||||
'lastModifiedBy' => 'Maatwebsite',
|
||||
'title' => 'Spreadsheet',
|
||||
'description' => 'Default spreadsheet export',
|
||||
'subject' => 'Spreadsheet export',
|
||||
'keywords' => 'maatwebsite, excel, export',
|
||||
'category' => 'Excel',
|
||||
'manager' => 'Maatwebsite',
|
||||
'company' => 'Maatwebsite',
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Sheets settings
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'sheets' => [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Default page setup
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'pageSetup' => [
|
||||
'orientation' => 'portrait',
|
||||
'paperSize' => '9',
|
||||
'scale' => '100',
|
||||
'fitToPage' => false,
|
||||
'fitToHeight' => true,
|
||||
'fitToWidth' => true,
|
||||
'columnsToRepeatAtLeft' => ['', ''],
|
||||
'rowsToRepeatAtTop' => [0, 0],
|
||||
'horizontalCentered' => false,
|
||||
'verticalCentered' => false,
|
||||
'printArea' => null,
|
||||
'firstPageNumber' => null,
|
||||
],
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Creator
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The default creator of a new Excel file
|
||||
|
|
||||
*/
|
||||
|
||||
'creator' => 'Maatwebsite',
|
||||
|
||||
'csv' => [
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Delimiter
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The default delimiter which will be used to read out a CSV file
|
||||
|
|
||||
*/
|
||||
|
||||
'delimiter' => ',',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Enclosure
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
'enclosure' => '"',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Line endings
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
'line_ending' => "\r\n",
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| setUseBom
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
'use_bom' => false
|
||||
],
|
||||
|
||||
'export' => [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Autosize columns
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Disable/enable column autosize or set the autosizing for
|
||||
| an array of columns ( array('A', 'B') )
|
||||
|
|
||||
*/
|
||||
'autosize' => true,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Autosize method
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| --> PHPExcel_Shared_Font::AUTOSIZE_METHOD_APPROX
|
||||
| The default is based on an estimate, which does its calculation based
|
||||
| on the number of characters in the cell value (applying any calculation
|
||||
| and format mask, and allowing for wordwrap and rotation) and with an
|
||||
| "arbitrary" adjustment based on the font (Arial, Calibri or Verdana,
|
||||
| defaulting to Calibri if any other font is used) and a proportional
|
||||
| adjustment for the font size.
|
||||
|
|
||||
| --> PHPExcel_Shared_Font::AUTOSIZE_METHOD_EXACT
|
||||
| The second method is more accurate, based on actual style formatting as
|
||||
| well (bold, italic, etc), and is calculated by generating a gd2 imagettf
|
||||
| bounding box and using its dimensions to determine the size; but this
|
||||
| method is significantly slower, and its accuracy is still dependent on
|
||||
| having the appropriate fonts installed.
|
||||
|
|
||||
*/
|
||||
'autosize-method' => PHPExcel_Shared_Font::AUTOSIZE_METHOD_APPROX,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Auto generate table heading
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| If set to true, the array indices (or model attribute names)
|
||||
| will automatically be used as first row (table heading)
|
||||
|
|
||||
*/
|
||||
'generate_heading_by_indices' => true,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Auto set alignment on merged cells
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'merged_cell_alignment' => 'left',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Pre-calculate formulas during export
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'calculate' => false,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Include Charts during export
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'includeCharts' => false,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Default sheet settings
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'sheets' => [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Default page margin
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| 1) When set to false, default margins will be used
|
||||
| 2) It's possible to enter a single margin which will
|
||||
| be used for all margins.
|
||||
| 3) Alternatively you can pass an array with 4 margins
|
||||
| Default order: array(top, right, bottom, left)
|
||||
|
|
||||
*/
|
||||
'page_margin' => false,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Value in source array that stands for blank cell
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'nullValue' => null,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Insert array starting from this cell address as the top left coordinate
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'startCell' => 'A1',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Apply strict comparison when testing for null values in the array
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'strictNullComparison' => false
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Store settings
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
'store' => [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Path
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The path we want to save excel file to
|
||||
|
|
||||
*/
|
||||
'path' => storage_path('exports'),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Return info
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Whether we want to return information about the stored file or not
|
||||
|
|
||||
*/
|
||||
'returnInfo' => false
|
||||
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| PDF Settings
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'pdf' => [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| PDF Drivers
|
||||
|--------------------------------------------------------------------------
|
||||
| Supported: DomPDF, tcPDF, mPDF
|
||||
*/
|
||||
'driver' => 'DomPDF',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| PDF Driver settings
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'drivers' => [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| DomPDF settings
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'DomPDF' => [
|
||||
'path' => base_path('vendor/dompdf/dompdf/')
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| tcPDF settings
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'tcPDF' => [
|
||||
'path' => base_path('vendor/tecnick.com/tcpdf/')
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| mPDF settings
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'mPDF' => [
|
||||
'path' => base_path('vendor/mpdf/mpdf/')
|
||||
],
|
||||
]
|
||||
]
|
||||
],
|
||||
|
||||
'filters' => [
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Register read filters
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
'registered' => [
|
||||
'chunk' => 'Maatwebsite\Excel\Filters\ChunkReadFilter'
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Enable certain filters for every file read
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
'enabled' => []
|
||||
],
|
||||
|
||||
'import' => [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Has heading
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The sheet has a heading (first) row which we can use as attribute names
|
||||
|
|
||||
| Options: true|false|slugged|slugged_with_count|ascii|numeric|hashed|hashed_with_lower|trans|original
|
||||
|
|
||||
*/
|
||||
|
||||
'heading' => 'slugged',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| First Row with data or heading of data
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| If the heading row is not the first row, or the data doesn't start
|
||||
| on the first row, here you can change the start row.
|
||||
|
|
||||
*/
|
||||
|
||||
'startRow' => 1,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Cell name word separator
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The default separator which is used for the cell names
|
||||
| Note: only applies to 'heading' settings 'true' && 'slugged'
|
||||
|
|
||||
*/
|
||||
|
||||
'separator' => '_',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Slug whitelisting
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Here you can whitelist certain characters in the slug.
|
||||
| E.g. user.last_name will not remove . and _
|
||||
| Note: only applies to 'heading' settings 'true' && 'slugged'
|
||||
|
|
||||
*/
|
||||
|
||||
'slug_whitelist' => '._',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Include Charts during import
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
'includeCharts' => false,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Sheet heading conversion
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Convert headings to ASCII
|
||||
| Note: only applies to 'heading' settings 'true' && 'slugged'
|
||||
|
|
||||
*/
|
||||
|
||||
'to_ascii' => true,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Import encoding
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
'encoding' => [
|
||||
|
||||
'input' => 'UTF-8',
|
||||
'output' => 'UTF-8'
|
||||
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Calculate
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| By default cells with formulas will be calculated.
|
||||
|
|
||||
*/
|
||||
|
||||
'calculate' => true,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Ignore empty cells
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| By default empty cells are not ignored
|
||||
|
|
||||
*/
|
||||
|
||||
'ignoreEmpty' => false,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Force sheet collection
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| For a sheet collection even when there is only 1 sheets.
|
||||
| When set to false and only 1 sheet found, the parsed file will return
|
||||
| a row collection instead of a sheet collection.
|
||||
| When set to true, it will return a sheet collection instead.
|
||||
|
|
||||
*/
|
||||
'force_sheets_collection' => false,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Date format
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The format dates will be parsed to
|
||||
|
|
||||
*/
|
||||
|
||||
'dates' => [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Enable/disable date formatting
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'enabled' => true,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Default date format
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| If set to false, a carbon object will return
|
||||
|
|
||||
*/
|
||||
'format' => false,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Date columns
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'columns' => []
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Import sheets by config
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'sheets' => [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Example sheet
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Example sheet "test" will grab the firstname at cell A2
|
||||
|
|
||||
*/
|
||||
|
||||
'test' => [
|
||||
|
||||
'firstname' => 'A2'
|
||||
|
||||
]
|
||||
|
||||
]
|
||||
],
|
||||
|
||||
'views' => [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Styles
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The default styles which will be used when parsing a view
|
||||
|
|
||||
*/
|
||||
|
||||
'styles' => [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Table headings
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'th' => [
|
||||
'font' => [
|
||||
'bold' => true,
|
||||
'size' => 12,
|
||||
]
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Strong tags
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'strong' => [
|
||||
'font' => [
|
||||
'bold' => true,
|
||||
'size' => 12,
|
||||
]
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Bold tags
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'b' => [
|
||||
'font' => [
|
||||
'bold' => true,
|
||||
'size' => 12,
|
||||
]
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Italic tags
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'i' => [
|
||||
'font' => [
|
||||
'italic' => true,
|
||||
'size' => 12,
|
||||
]
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Heading 1
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'h1' => [
|
||||
'font' => [
|
||||
'bold' => true,
|
||||
'size' => 24,
|
||||
]
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Heading 2
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'h2' => [
|
||||
'font' => [
|
||||
'bold' => true,
|
||||
'size' => 18,
|
||||
]
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Heading 3
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'h3' => [
|
||||
'font' => [
|
||||
'bold' => true,
|
||||
'size' => 13.5,
|
||||
]
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Heading 4
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'h4' => [
|
||||
'font' => [
|
||||
'bold' => true,
|
||||
'size' => 12,
|
||||
]
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Heading 5
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'h5' => [
|
||||
'font' => [
|
||||
'bold' => true,
|
||||
'size' => 10,
|
||||
]
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Heading 6
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'h6' => [
|
||||
'font' => [
|
||||
'bold' => true,
|
||||
'size' => 7.5,
|
||||
]
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Hyperlinks
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'a' => [
|
||||
'font' => [
|
||||
'underline' => true,
|
||||
'color' => ['argb' => 'FF0000FF'],
|
||||
]
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Horizontal rules
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'hr' => [
|
||||
'borders' => [
|
||||
'bottom' => [
|
||||
'style' => 'thin',
|
||||
'color' => ['FF000000']
|
||||
],
|
||||
]
|
||||
]
|
||||
]
|
||||
|
||||
]
|
||||
|
||||
);
|
||||
|
|
@ -53,6 +53,12 @@ return [
|
|||
'url' => env('APP_URL').'/storage/users',
|
||||
'visibility' => 'public',
|
||||
],
|
||||
'import' => [
|
||||
'driver' => 'local',
|
||||
'root' => storage_path("app/import"),
|
||||
'url' => env('APP_URL').'/storage/app/import',
|
||||
|
||||
],
|
||||
'public' => [
|
||||
'driver' => 'local',
|
||||
'root' => storage_path('app/public'),
|
||||
|
|
|
|||
|
|
@ -24,6 +24,15 @@ class CreateCountriesTable extends Migration
|
|||
$table->string('it', 100);
|
||||
$table->string('ru', 100);
|
||||
|
||||
$table->boolean('active')->default(true);
|
||||
|
||||
$table->boolean('switch')->default(false);
|
||||
$table->boolean('own_eur')->default(false);
|
||||
$table->boolean('currency')->default(false);
|
||||
$table->string('currency_unit', 10)->nullable();
|
||||
$table->boolean('currency_calc')->default(false);
|
||||
$table->decimal('currency_faktor', 4, 2)->nullable();
|
||||
|
||||
$table->boolean('active')->default(true);
|
||||
$table->text('trans_name')->nullable();
|
||||
$table->text('attr')->nullable();
|
||||
|
|
|
|||
|
|
@ -40,6 +40,8 @@ class CreateProductsTable extends Migration
|
|||
$table->unsignedTinyInteger('unit')->nullable();
|
||||
|
||||
$table->string('number')->nullable();
|
||||
$table->unsignedInteger('wp_number')->nullable();
|
||||
|
||||
$table->string('icons')->nullable(); //as array cast
|
||||
|
||||
$table->text('description')->nullable();
|
||||
|
|
|
|||
|
|
@ -52,10 +52,20 @@ class CreateShoppingUsersTable extends Migration
|
|||
$table->string('shipping_phone')->nullable();
|
||||
|
||||
$table->boolean('abo_options')->default(false);
|
||||
$table->boolean('has_buyed')->default(false);
|
||||
$table->boolean('subscribed')->default(false);
|
||||
|
||||
$table->text('notice')->default(false);
|
||||
|
||||
$table->char('mode', 4)->nullable();
|
||||
|
||||
$table->unsignedInteger('wp_order_number')->nullable();
|
||||
$table->timestamp('wp_order_date')->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
$table->softDeletes();
|
||||
$table->timestamp('user_deleted_at')->nullable();
|
||||
|
||||
|
||||
$table->foreign('billing_country_id')
|
||||
->references('id')
|
||||
|
|
|
|||
|
|
@ -40,8 +40,9 @@ class CreateShoppingOrdersTable extends Migration
|
|||
|
||||
$table->char('mode', 4)->nullable();
|
||||
|
||||
|
||||
$table->timestamps();
|
||||
$table->softDeletes();
|
||||
$table->timestamp('user_deleted_at')->nullable();
|
||||
|
||||
$table->foreign('shopping_user_id')
|
||||
->references('id')
|
||||
|
|
@ -50,7 +51,7 @@ class CreateShoppingOrdersTable extends Migration
|
|||
|
||||
$table->foreign('country_id')
|
||||
->references('id')
|
||||
->on('countries');
|
||||
->on('shipping_countries');
|
||||
|
||||
$table->foreign('user_shop_id')
|
||||
->references('id')
|
||||
|
|
|
|||
|
|
@ -24,6 +24,9 @@ class CreateShoppingOrderItemsTable extends Migration
|
|||
$table->string('slug')->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
$table->softDeletes();
|
||||
$table->timestamp('user_deleted_at')->nullable();
|
||||
|
||||
|
||||
$table->foreign('shopping_order_id')
|
||||
->references('id')
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
class CreateCountryPricesTable extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function up()
|
||||
{
|
||||
Schema::create('country_prices', function (Blueprint $table) {
|
||||
$table->increments('id');
|
||||
|
||||
$table->unsignedInteger('country_id')->index();
|
||||
$table->unsignedInteger('product_id')->index();
|
||||
|
||||
$table->decimal('c_price', 8, 2)->nullable();
|
||||
$table->decimal('c_tax', 5, 2)->nullable();
|
||||
$table->decimal('c_price_old', 8, 2)->nullable();
|
||||
|
||||
$table->decimal('c_currency', 8, 2)->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
|
||||
$table->foreign('country_id')
|
||||
->references('id')
|
||||
->on('countries');
|
||||
|
||||
$table->foreign('product_id')
|
||||
->references('id')
|
||||
->on('products');
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function down()
|
||||
{
|
||||
Schema::dropIfExists('country_prices');
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
#php_value memory_limit 512MB
|
||||
<IfModule mod_rewrite.c>
|
||||
<IfModule mod_negotiation.c>
|
||||
Options -MultiViews -Indexes
|
||||
|
|
|
|||
|
|
@ -52,3 +52,25 @@ a[aria-expanded='true'] > .fa-caret-expand:before {
|
|||
.text-match{
|
||||
color:#295B28;
|
||||
}
|
||||
|
||||
.sidenav-vertical .sidenav-menu {
|
||||
padding-top: 0.225rem;
|
||||
padding-bottom: 0.225rem;
|
||||
}
|
||||
|
||||
.sidenav-vertical .sidenav-menu .sidenav-link {
|
||||
padding-top: 0.525rem;
|
||||
padding-bottom: 0.525rem;
|
||||
}
|
||||
|
||||
.form-control.has-error .form-control {
|
||||
border: 1px solid #ea8e49;
|
||||
}
|
||||
|
||||
.form-group.has-error .form-control {
|
||||
border: 1px solid #ea8e49;
|
||||
}
|
||||
|
||||
.has-error .help-block{
|
||||
color: #a94442;
|
||||
}
|
||||
4
public/phpinfo.php
Normal file
4
public/phpinfo.php
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<?php
|
||||
|
||||
phpinfo();
|
||||
?>
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -2,12 +2,17 @@
|
|||
|
||||
return [
|
||||
'home' => 'Home',
|
||||
'my_account' => 'Mein Konto',
|
||||
'my_data' => 'Meine Daten',
|
||||
'edit' => 'bearbeiten',
|
||||
'my_shop' => 'Mein Shop',
|
||||
'settings' => 'Einstellungen',
|
||||
'my_team' => 'Mein Team',
|
||||
'my_clients' => 'Meine Kunden',
|
||||
'member_register' => 'Berater registrieren',
|
||||
'member'=>'Berater',
|
||||
'membership' => 'Mitgliedschaft',
|
||||
'my_membership' => 'Meine Mitgliedschaft',
|
||||
'orders'=>'Bestellungen',
|
||||
'clients'=>'Kunden',
|
||||
'products'=>'Produkte',
|
||||
|
|
@ -17,6 +22,7 @@ return [
|
|||
'contents'=>'Inhalte',
|
||||
'start_site'=>'Startseite',
|
||||
'translate'=>'Übersetzungen',
|
||||
'add' => 'hinzufügen',
|
||||
'general'=>'Allgemein',
|
||||
'modules'=>'Module',
|
||||
'user_roles'=>'User Rechte',
|
||||
|
|
|
|||
|
|
@ -130,6 +130,7 @@ return [
|
|||
*/
|
||||
|
||||
'custom' => [
|
||||
'unique_email_client' => 'Ein Kunde mit der E-Mail-Adresse ist schon im mivita-Salescenter vorhanden',
|
||||
'attribute-name' => [
|
||||
'rule-name' => 'custom-message',
|
||||
],
|
||||
|
|
@ -201,6 +202,7 @@ return [
|
|||
'shipping_zipcode'=>'PLZ',
|
||||
'shipping_city' => 'Stadt',
|
||||
'm_account' => 'Account ID',
|
||||
|
||||
'has_customer_buyed' => 'Die Angabe',
|
||||
'billing_country_code' => 'Land Code',
|
||||
],
|
||||
];
|
||||
|
|
|
|||
|
|
@ -36,14 +36,14 @@
|
|||
{{ Form::text('ru', $country->ru, array('placeholder'=>__('Land RU'), 'class'=>'form-control', 'id'=>'ru')) }}
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<hr>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="form-label" for="code">{{ __('code') }}</label>
|
||||
<label class="form-label" for="code">Ländercode</label>
|
||||
{{ Form::text('code', $country->code, array('placeholder'=>__('code'), 'class'=>'form-control', 'id'=>'code')) }}
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="form-label" for="phone">{{ __('phone') }}</label>
|
||||
<label class="form-label" for="phone">Telefonvorwahl</label>
|
||||
{{ Form::text('phone', $country->phone, array('placeholder'=>__('phone'), 'class'=>'form-control', 'id'=>'phone')) }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -51,6 +51,66 @@
|
|||
</div>
|
||||
|
||||
|
||||
<div class="card mb-2">
|
||||
<h5 class="card-header">
|
||||
Anzeige und Währung
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-12">
|
||||
<label class="custom-control custom-checkbox">
|
||||
{!! Form::checkbox('switch', 1, $country->switch, ['class'=>'custom-control-input']) !!}
|
||||
<span class="custom-control-label">Land aus Auswahl auf der Webseite anzeigen (Länderwechsel)</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-group col-sm-12">
|
||||
<label class="custom-control custom-checkbox">
|
||||
{!! Form::checkbox('own_eur', 1, $country->own_eur, ['class'=>'custom-control-input']) !!}
|
||||
<span class="custom-control-label">Land hat eigenen EURO Preis</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<hr class="mt-0">
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="form-label">Eigene Währung</label>
|
||||
<label class="custom-control custom-checkbox">
|
||||
{!! Form::checkbox('currency', 1, $country->currency, ['class'=>'custom-control-input', 'id'=>'currency']) !!}
|
||||
<span class="custom-control-label">Land hat eigene Währung<br>(Währung wird nur zuzsätzlich zum EUR angezeigt, bezahlt wird in EUR)</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="form-label" for="currency_unit">Abkürzung der Währung</label>
|
||||
{{ Form::text('currency_unit', $country->currency_unit, array('placeholder'=>__('CHF'), 'class'=>'form-control', 'id'=>'currency_unit')) }}
|
||||
</div>
|
||||
</div>
|
||||
<div id="show_currency_calc" style="display: @if($country->currency) block @else none @endif">
|
||||
<div class="form-row">
|
||||
<div class="col-12">
|
||||
<hr class="mt-0" >
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="form-label">Umrechnungsfaktor zum EUR {{$country->currency_calc}}</label>
|
||||
<div class="custom-controls-stacked">
|
||||
<label class="custom-control custom-radio">
|
||||
{!! Form::radio('currency_calc', 0, !$country->currency_calc, ['class'=>'custom-control-input']) !!}
|
||||
<span class="custom-control-label">dient nur als Anzeigungshilfe, jeder Preis wird manuell angegeben</span>
|
||||
</label>
|
||||
<label class="custom-control custom-radio">
|
||||
{!! Form::radio('currency_calc', 1, $country->currency_calc, ['class'=>'custom-control-input']) !!}
|
||||
<span class="custom-control-label">berechnet den Preis automatisch</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="form-label" for="currency_faktor">Faktor Währungen zum Euro (z.B. 1 Euro zu 1,07 CHF)</label>
|
||||
{{ Form::text('currency_faktor', formatNumber($country->currency_faktor, 4), array('placeholder'=>__('1,07'), 'class'=>'form-control', 'id'=>'currency_faktor')) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card mb-2">
|
||||
<h5 class="card-header">
|
||||
|
|
@ -82,6 +142,7 @@
|
|||
|
||||
|
||||
|
||||
|
||||
<div class="card mb-2">
|
||||
<h5 class="card-header">
|
||||
{{ __('Übersetzungen') }}
|
||||
|
|
@ -100,3 +161,19 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<script type="application/javascript">
|
||||
$( document ).ready(function() {
|
||||
|
||||
$('input#currency').on('change', function () {
|
||||
if($(this).prop('checked')){
|
||||
$('input#show_currency_calc').prop('checked', true);
|
||||
$('#show_currency_calc').show('slow');
|
||||
}else{
|
||||
$('input#show_currency_calc').prop('checked', false);
|
||||
$('#show_currency_calc').hide('slow');
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
|
@ -15,6 +15,10 @@
|
|||
<th>{{__('Code')}}</th>
|
||||
<th>{{__('Phone')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Länderwechsel')}}</th>
|
||||
<th>{{__('e. Preis')}}</th>
|
||||
<th>{{__('e. Währung')}}</th>
|
||||
<th>{{__('Kalkulation')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -28,17 +32,29 @@
|
|||
<td>{{ $value->de }}</td>
|
||||
<td>{{ $value->code }}</td>
|
||||
<td>{{ $value->phone }}</td>
|
||||
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>@endif</td>
|
||||
<td data-sort="{{ $value->active }}">{!! get_active_badge($value->active) !!}</td>
|
||||
<td data-sort="{{ $value->switch }}">{!! get_active_badge($value->switch) !!}</td>
|
||||
<td data-sort="{{ $value->own_eur }}">{!! get_active_badge($value->own_eur) !!}</td>
|
||||
<td data-sort="{{ $value->currency }}">{!! get_active_badge($value->currency) !!} {{$value->currency_unit}}</td>
|
||||
<td data-sort="{{ $value->currency_calc }}">
|
||||
@if($value->currency)
|
||||
@if($value->currency_calc)
|
||||
<span class="badge badge-secondary"><i class="fa fa-cogs"></i> {{$value->currency_faktor}} </span>
|
||||
@else
|
||||
<span class="badge badge-info"><i class="fa fa-edit"></i> {{$value->currency_faktor}} </span>
|
||||
@endif
|
||||
@else - @endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="mt-4 ml-4">
|
||||
<!-- <a href="{{route('admin_product_category_edit', ['new'])}}" class="btn btn-sm btn-primary">
|
||||
{{--
|
||||
<a href="{{route('admin_product_category_edit', ['new'])}}" class="btn btn-sm btn-primary">
|
||||
{{__('Neue Kategorie erstellen')}}
|
||||
</a>
|
||||
|
||||
-->
|
||||
--}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -50,13 +66,7 @@
|
|||
"bLengthChange": false,
|
||||
"iDisplayLength": 50,
|
||||
"order": [[ 0, "asc" ]],
|
||||
"aoColumns": [
|
||||
{ "sWidth": "8%" },
|
||||
{ "sWidth": "20%" },
|
||||
{ "sWidth": "10%" },
|
||||
{ "sWidth": "10%" },
|
||||
{ "sWidth": "8%" },
|
||||
],
|
||||
|
||||
"language": {
|
||||
"url": "/js/German.json"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,37 +1,54 @@
|
|||
<div class="card">
|
||||
|
||||
|
||||
<!-- Info -->
|
||||
<div class="card-body pb-1">
|
||||
@if($isAdmin)
|
||||
<div class="row">
|
||||
<div class="col-md-4 mb-3">
|
||||
<div class="text-muted small">Datum</div>
|
||||
{{$shopping_user->created_at->format("d.m.Y H:i")}}
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">E-Mail</div>
|
||||
{{ $shopping_user->billing_email }}
|
||||
</div>
|
||||
<div class="col-md-4 mb-3">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Kundennummer</div>
|
||||
{{$shopping_user->number}}
|
||||
</div>
|
||||
<div class="col-md-4 mb-3">
|
||||
<div class="text-muted small">ist Berater</div>
|
||||
@if($shopping_user->auth_user)
|
||||
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>
|
||||
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_user->auth_user->id])}}"><i class="ion ion-ios-contacts"></i></a>
|
||||
{{$shopping_user->auth_user->getFullName()}} <span class="text-muted">#{{$shopping_user->auth_user->number}}</span>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Datum</div>
|
||||
{{$shopping_user->created_at->format("d.m.Y H:i")}}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<a class="btn btn-sm btn-secondary mt-2" href="{{route('admin_customer_edit', [$shopping_user->id])}}">Kundendaten bearbeiten</a>
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>
|
||||
<div class="row">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">E-Mail</div>
|
||||
{{ $shopping_user->billing_email }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Kundennummer</div>
|
||||
{{$shopping_user->number}}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Erstellt</div>
|
||||
{{$shopping_user->firstEntryByNumber()->created_at->format("d.m.Y H:i")}}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<a class="btn btn-sm btn-secondary mt-2" href="{{route('user_customer_edit', [$shopping_user->id])}}">Kundendaten bearbeiten</a>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr class="m-0">
|
||||
<!-- / Info -->
|
||||
|
||||
|
||||
@if($isAdmin)
|
||||
<!-- Member -->
|
||||
<div class="card-body pb-1">
|
||||
<div class="row">
|
||||
<div class="col-md-8 mb-3">
|
||||
<div class="col-md-6 mb-3">
|
||||
@if(isset($change_member_error) && $change_member_error)
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
|
|
@ -44,16 +61,14 @@
|
|||
</div>
|
||||
@endif
|
||||
<div class="text-muted small">Zugewiesener Berater</div>
|
||||
|
||||
@if($shopping_user->is_like)
|
||||
<button type="button" class="btn btn-xs btn-outline-info" data-toggle="modal" data-target="#modals-load-content"
|
||||
data-id="{{$shopping_user->id}}"
|
||||
data-action="shopping-user-is-like-member"
|
||||
data-back="{{route('admin_customer_edit', [$shopping_user->id])}}"
|
||||
data-back="{{route('admin_customer_detail', [$shopping_user->id])}}"
|
||||
data-modal="modal-xl"
|
||||
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> Berater zuordnen</button>
|
||||
@else
|
||||
|
||||
@if($shopping_user->member)
|
||||
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_user->member->id])}}"><i class="ion ion-ios-contacts"></i></a>
|
||||
{{$shopping_user->member->getFullName()}} <span class="text-muted">#{{$shopping_user->member->number}}</span>
|
||||
|
|
@ -64,10 +79,8 @@
|
|||
data-view="customer"
|
||||
data-route="{{ route('modal_load') }}"><span class="fa fa-edit"></span></button>
|
||||
@endif
|
||||
|
||||
|
||||
</div>
|
||||
<div class="col-md-4 mb-3">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Über Shop</div>
|
||||
@if($shopping_user->shopping_order)
|
||||
@if($shopping_user->shopping_order->user_shop->user->isActive() && $shopping_user->shopping_order->user_shop->user->isActiveShop())
|
||||
|
|
@ -77,6 +90,16 @@
|
|||
@endif
|
||||
@endif
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">ist Berater</div>
|
||||
@if($shopping_user->auth_user)
|
||||
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>
|
||||
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_user->auth_user->id])}}"><i class="ion ion-ios-contacts"></i></a>
|
||||
{{$shopping_user->auth_user->getFullName()}} <span class="text-muted">#{{$shopping_user->auth_user->number}}</span>
|
||||
@else
|
||||
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr class="m-0">
|
||||
|
|
@ -95,7 +118,6 @@
|
|||
{{ $shopping_user->billing_company }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Anrede</div>
|
||||
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->billing_salutation) }}
|
||||
|
|
@ -127,17 +149,13 @@
|
|||
{{ $shopping_user->billing_city }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">E-Mail</div>
|
||||
{{ $shopping_user->billing_email }}
|
||||
<div class="text-muted small">Land</div>
|
||||
{{ $shopping_user->billing_country->getLocated() }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Telefon</div>
|
||||
{{ $shopping_user->billing_phone }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Land</div>
|
||||
{{ $shopping_user->billing_country->getLocated() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr class="m-0">
|
||||
|
|
@ -158,7 +176,6 @@
|
|||
{{ $shopping_user->shipping_company }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Anrede</div>
|
||||
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->shipping_salutation) }}
|
||||
|
|
@ -190,23 +207,41 @@
|
|||
{{ $shopping_user->shipping_city }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">E-Mail</div>
|
||||
{{ $shopping_user->shipping_email }}
|
||||
<div class="text-muted small">Land</div>
|
||||
{{ $shopping_user->shipping_country->getLocated() }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Telefon</div>
|
||||
{{ $shopping_user->shipping_phone }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Land</div>
|
||||
{{ $shopping_user->shipping_country->getLocated() }}
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
<hr class="m-0">
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Kunde
|
||||
</h6>
|
||||
<div class="row">
|
||||
<div class="col-md-12 mb-3">
|
||||
@if($shopping_user->has_buyed)
|
||||
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> Kunde hat schon gekauft.
|
||||
@else
|
||||
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> Kunde hat noch nicht gekauft.
|
||||
@endif
|
||||
</div>
|
||||
<div class="col-md-12 mb-3">
|
||||
@if($shopping_user->subscribed)
|
||||
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> Kunde ist für Newsletter abonniert.
|
||||
@else
|
||||
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> Kunde ist nicht für Newsletter abonniert.
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr class="m-0">
|
||||
<!-- / Shipping -->
|
||||
|
||||
@if($isAdmin)
|
||||
<!-- Order -->
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
|
|
@ -323,4 +358,5 @@
|
|||
</table>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
388
resources/views/admin/customer/_edit.blade.php
Normal file
388
resources/views/admin/customer/_edit.blade.php
Normal file
|
|
@ -0,0 +1,388 @@
|
|||
<div class="card mb-4">
|
||||
<h5 class="card-header">
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
Rechnungsadresse
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
|
||||
<span class="d-none d-lg-inline">Lieferadresse</span>
|
||||
</div>
|
||||
</div>
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col-12 col-lg-6">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="billing_company" class="form-label">{{ __('Company name') }} (optional)</label>
|
||||
{{ Form::text('billing_company', $shopping_user->billing_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'billing_company', 'tabindex' => 1)) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6 {{ $errors->has('billing_salutation') ? 'has-error' : '' }}">
|
||||
<label class="form-label">{{ __('Salutation') }}*</label>
|
||||
<select class="selectpicker" data-style="btn-light" name="billing_salutation" id="billing_salutation" required tabindex="2">
|
||||
{!! HTMLHelper::getSalutation($shopping_user->billing_salutation) !!}
|
||||
</select>
|
||||
@if ($errors->has('billing_salutation'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('billing_salutation') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6 {{ $errors->has('billing_firstname') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="billing_firstname">{{ __('First name') }}*</label>
|
||||
{{ Form::text('billing_firstname', $shopping_user->billing_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'id'=>'billing_firstname', 'required'=>true, 'tabindex' => 4)) }}
|
||||
@if ($errors->has('billing_firstname'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('billing_firstname') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
<div class="form-group col-md-6 {{ $errors->has('billing_lastname') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="billing_lastname">{{ __('Last name') }}*</label>
|
||||
{{ Form::text('billing_lastname', $shopping_user->billing_lastname, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'id'=>'billing_lastname', 'required'=>true, 'tabindex' => 5)) }}
|
||||
@if ($errors->has('billing_lastname'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('billing_lastname') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12 {{ $errors->has('billing_address') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="billing_address">{{ __('Street') }} / {{ __('House number') }}*</label>
|
||||
{{ Form::text('billing_address', $shopping_user->billing_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'billing_address', 'tabindex' => 6)) }}
|
||||
@if ($errors->has('billing_address'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('billing_address') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12 {{ $errors->has('billing_address_2') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="billing_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
|
||||
{{ Form::text('billing_address_2', $shopping_user->billing_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'billing_address_2', 'tabindex' => 6)) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6 {{ $errors->has('billing_zipcode') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="billing_zipcode">{{ __('Postcode') }}*</label>
|
||||
{{ Form::text('billing_zipcode', $shopping_user->billing_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'billing_zipcode', 'tabindex' => 7)) }}
|
||||
@if ($errors->has('billing_zipcode'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('billing_zipcode') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
<div class="form-group col-md-6 {{ $errors->has('billing_city') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="billing_city">{{ __('City') }}*</label>
|
||||
{{ Form::text('billing_city', $shopping_user->billing_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'billing_city', 'tabindex' => 8)) }}
|
||||
@if ($errors->has('billing_city'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('billing_city') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12 {{ $errors->has('billing_country_id') ? 'has-error' : '' }}">
|
||||
<label class="form-label">{{ __('Country') }}*</label>
|
||||
<select class="selectpicker" name="billing_country_id" id="billing_country_id" data-style="btn-light" data-live-search="true" required tabindex="9">
|
||||
{!! HTMLHelper::getContriesWithMore($shopping_user->billing_country_id) !!}
|
||||
</select>
|
||||
@if ($errors->has('billing_country_id'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('billing_country_id') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12 {{ $errors->has('billing_phone') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="billing_phone">{{ __('Phone') }}</label>
|
||||
{{ Form::text('billing_phone', $shopping_user->billing_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'billing_phone', 'tabindex' => 11)) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-lg-6">
|
||||
<div class="d-md-block d-lg-none">
|
||||
<hr>
|
||||
<h5 class="mt-4">Lieferadresse</h5>
|
||||
</div>
|
||||
<div id="show_shipping_address" style="@if($shopping_user->same_as_billing) display:none @endif">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="shipping_company" class="form-label">{{ __('Company name') }} (optional)</label>
|
||||
{{ Form::text('shipping_company', $shopping_user->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'shipping_company', 'tabindex' => 16)) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12 {{ $errors->has('shipping_salutation') ? 'has-error' : '' }}">
|
||||
<label class="form-label">{{ __('Salutation') }}*</label>
|
||||
<select class="selectpicker" data-style="btn-light" name="shipping_salutation" id="shipping_salutation" required tabindex="17">
|
||||
{!! HTMLHelper::getSalutation($shopping_user->shipping_salutation) !!}
|
||||
</select>
|
||||
@if ($errors->has('shipping_salutation'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('shipping_salutation') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6 {{ $errors->has('shipping_firstname') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="shipping_firstname">{{ __('First name') }}*</label>
|
||||
{{ Form::text('shipping_firstname', $shopping_user->shipping_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_firstname', 'tabindex' => 18)) }}
|
||||
@if ($errors->has('shipping_firstname'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('shipping_firstname') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
<div class="form-group col-md-6 {{ $errors->has('shipping_lastname') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="shipping_lastname">{{ __('Last Name') }}*</label>
|
||||
{{ Form::text('shipping_lastname', $shopping_user->shipping_lastname, array('placeholder'=>__('Last Name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_lastname', 'tabindex' => 19)) }}
|
||||
@if ($errors->has('shipping_lastname'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('shipping_lastname') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12 {{ $errors->has('shipping_address') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="shipping_address">{{ __('Street') }} / {{ __('House number') }}*</label>
|
||||
{{ Form::text('shipping_address', $shopping_user->shipping_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_address', 'tabindex' => 20)) }}
|
||||
@if ($errors->has('shipping_address'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('shipping_address') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12 {{ $errors->has('shipping_address_2') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="shipping_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
|
||||
{{ Form::text('shipping_address_2', $shopping_user->shipping_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'shipping_address_2', 'tabindex' => 21)) }}
|
||||
@if ($errors->has('shipping_address_2'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('shipping_address_2') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6 {{ $errors->has('shipping_zipcode') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="shipping_zipcode">{{ __('Postcode') }}*</label>
|
||||
{{ Form::text('shipping_zipcode', $shopping_user->shipping_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_zipcode', 'tabindex' => 22)) }}
|
||||
@if ($errors->has('shipping_zipcode'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('shipping_zipcode') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
<div class="form-group col-md-6 {{ $errors->has('shipping_city') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="shipping_city">{{ __('City') }}*</label>
|
||||
{{ Form::text('shipping_city', $shopping_user->shipping_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_city', 'tabindex' => 23)) }}
|
||||
@if ($errors->has('shipping_city'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('shipping_city') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12 {{ $errors->has('shipping_country_id') ? 'has-error' : '' }}">
|
||||
<label class="form-label">{{ __('Country') }}*</label>
|
||||
<select class="selectpicker" name="shipping_country_id" id="shipping_country_id" data-style="btn-light" data-live-search="true" required tabindex="24">
|
||||
{!! HTMLHelper::getContriesWithMore($shopping_user->shipping_country_id) !!}
|
||||
</select>
|
||||
@if ($errors->has('shipping_country_id'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('shipping_country_id') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label class="form-label" for="shipping_phone">{{ __('Phone') }}</label>
|
||||
{{ Form::text('shipping_phone', $shopping_user->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'shipping_phone', 'tabindex' => 26)) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="form-group">
|
||||
<label class="custom-control custom-checkbox m-0">
|
||||
<input type="checkbox" class="custom-control-input" name="same_as_billing" id="same_as_billing" @if($shopping_user->same_as_billing) checked="checked" @endif>
|
||||
<span class="custom-control-label">{{__('Versand an die gleiche Adresse')}}</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@if($isView === 'customer')
|
||||
|
||||
|
||||
|
||||
@endif
|
||||
<div class="card mb-4">
|
||||
<div class="card-body">
|
||||
<div class="form-group">
|
||||
<label class="custom-control custom-checkbox m-0">
|
||||
<input type="checkbox" class="custom-control-input" name="has_buyed" id="has_buyed" @if($shopping_user->has_buyed) checked="checked" @endif>
|
||||
<span class="custom-control-label">Ich versichere, dass dieser Kunde bereits bei mir gekauft hat</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="alert alert-warning mt-3" id="show_has_buyed" style="display: @if($shopping_user->has_buyed) block @else none @endif;">
|
||||
<label class="custom-control custom-checkbox m-0">
|
||||
<input type="checkbox" class="custom-control-input" name="subscribed" id="subscribed" @if($shopping_user->subscribed) checked="checked" @endif >
|
||||
<span class="custom-control-label">Für Newsletter abonniert. Es ist Dir bzw. MIVITA erlaubt, Kunden einen Newsletter zu senden, sofern der Kunde schon mal aktiv gekauft hat.
|
||||
Sollte der Kunde explizit mitgeteilt haben, dass er keinen Newsletter möchte, dann bitte unbedingt das Häkchen entfernen.</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
@if($isView === 'customer-add')
|
||||
{{ Form::hidden('billing_email_1', $billing_email) }}
|
||||
{{ Form::hidden('billing_email-confirm_1', $billing_email) }}
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6">
|
||||
<label class="form-label" for="billing_email">{{ __('E-Mail Address') }}*</label>
|
||||
{{ Form::text('billing_email', $billing_email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'billing_email', 'readonly')) }}
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<label class="form-label" for="billing_email-confirm">{{ __('Confirm E-Mail') }}</label>
|
||||
{{ Form::text('billing_email-confirm', $billing_email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'billing_email-confirm', 'readonly')) }}
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6">
|
||||
<label class="form-label" for="billing_email">{{ __('E-Mail Address') }}*</label>
|
||||
{{ Form::text('billing_email', $shopping_user->billing_email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'billing_email')) }}
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<label class="form-label" for="billing_email-confirm">{{ __('Confirm E-Mail') }}</label>
|
||||
{{ Form::text('billing_email-confirm', $shopping_user->billing_email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'billing_email-confirm')) }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="application/javascript">
|
||||
$( document ).ready(function() {
|
||||
|
||||
$('input#has_buyed').on('change', function () {
|
||||
if($(this).prop('checked')){
|
||||
$('input#subscribed').prop('checked', true);
|
||||
$('#show_has_buyed').show('slow');
|
||||
}else{
|
||||
$('input#subscribed').prop('checked', false);
|
||||
$('#show_has_buyed').hide('slow');
|
||||
}
|
||||
});
|
||||
|
||||
// Shipping Address show|hide
|
||||
$("#same_as_billing").on("change", function () {
|
||||
$('#show_shipping_address').slideToggle(200, function () {
|
||||
|
||||
// scroll down to shipping area.
|
||||
if ($('#show_shipping_address').is(":visible")) {
|
||||
_scrollTo('#show_shipping_address', 20);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$.extend( $.validator.messages, {
|
||||
required: "Dieses Feld ist ein Pflichtfeld.",
|
||||
maxlength: $.validator.format( "Geben Sie bitte maximal {0} Zeichen ein." ),
|
||||
minlength: $.validator.format( "Geben Sie bitte mindestens {0} Zeichen ein." ),
|
||||
rangelength: $.validator.format( "Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein." ),
|
||||
email: "Geben Sie bitte eine gültige E-Mail Adresse ein.",
|
||||
url: "Geben Sie bitte eine gültige URL ein.",
|
||||
date: "Bitte geben Sie ein gültiges Datum ein.",
|
||||
number: "Geben Sie bitte eine Nummer ein.",
|
||||
digits: "Geben Sie bitte nur Ziffern ein.",
|
||||
equalTo: "Bitte denselben Wert wiederholen.",
|
||||
range: $.validator.format( "Geben Sie bitte einen Wert zwischen {0} und {1} ein." ),
|
||||
max: $.validator.format( "Geben Sie bitte einen Wert kleiner oder gleich {0} ein." ),
|
||||
min: $.validator.format( "Geben Sie bitte einen Wert größer oder gleich {0} ein." ),
|
||||
creditcard: "Geben Sie bitte eine gültige Kreditkarten-Nummer ein."
|
||||
});
|
||||
|
||||
// Set up validator
|
||||
$('#lead-form-validation').validate({
|
||||
rules: {
|
||||
'billing_email-confirm': {
|
||||
required: true,
|
||||
equalTo: "#billing_email"
|
||||
},
|
||||
},
|
||||
errorPlacement: function errorPlacement(error, element) {
|
||||
$(element).parents('.form-group').append(
|
||||
error.addClass('invalid-feedback small d-block')
|
||||
)
|
||||
},
|
||||
highlight: function (element) {
|
||||
if ($(element).hasClass('selectpicker')) {
|
||||
$(element).parent().addClass('is-invalid');
|
||||
}
|
||||
$(element).addClass('is-invalid');
|
||||
},
|
||||
unhighlight: function (element) {
|
||||
$(element).removeClass('is-invalid');
|
||||
$(element).parents('.form-group').find('.is-invalid').removeClass('is-invalid');
|
||||
},
|
||||
messages : {
|
||||
required: "{{__('This field is required.')}}",
|
||||
country_id : {
|
||||
required: "{{__('This field is required.')}}",
|
||||
},
|
||||
salutation : {
|
||||
required: "{{__('Bitte angeben.')}}",
|
||||
},
|
||||
first_name : {
|
||||
required: "{{__('This field is required.')}}",
|
||||
},
|
||||
last_name : {
|
||||
required: "{{__('This field is required.')}}",
|
||||
},
|
||||
zipcode : {
|
||||
required: "{{__('This field is required.')}}",
|
||||
},
|
||||
address : {
|
||||
required: "{{__('This field is required.')}}",
|
||||
},
|
||||
city : {
|
||||
required: "{{__('This field is required.')}}",
|
||||
},
|
||||
equalTo : "{{__('Please enter the same value again.')}}",
|
||||
'billing_email-confirm' : {
|
||||
equalTo : "{{__('Please enter the same value again.')}}",
|
||||
required: "{{__('This field is required.')}}",
|
||||
},
|
||||
billing_email: {
|
||||
required : "{{__('This field is required.')}}",
|
||||
email: "{{ __('Please enter a valid email address.') }}",
|
||||
remote : "{{ __('This E-mail is already in use.') }}"
|
||||
},
|
||||
},
|
||||
onkeyup: false
|
||||
});
|
||||
|
||||
});
|
||||
</script>
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default float-right">zurück</a>
|
||||
{{ __('Kunden Details') }} <span class="text-muted">#{{$shopping_user->id}}</span>
|
||||
{{ __('Kunden Details') }}
|
||||
</h4>
|
||||
@include('admin.customer._detail')
|
||||
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
|
||||
|
|
|
|||
15
resources/views/admin/customer/edit.blade.php
Normal file
15
resources/views/admin/customer/edit.blade.php
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
@extends('layouts.layout-2')
|
||||
|
||||
@section('content')
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
<a href="{{route('admin_customer_detail', [$shopping_user->id])}}" class="btn btn-sm btn-default float-right">zurück</a>
|
||||
{{ __('Kunden Details') }} bearbeiten
|
||||
</h4>
|
||||
{!! Form::open(['url' => route('admin_customer_edit', [$shopping_user->id]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
|
||||
@include('admin.customer._edit')
|
||||
<div class="text-left mt-3">
|
||||
<button type="submit" class="btn btn-secondary" name="action" value="shopping-user-store">{{ __('save changes') }}</button>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
<a href="{{route('admin_customer_detail', [$shopping_user->id])}}" class="btn btn-sm btn-default float-right">zurück</a>
|
||||
@endsection
|
||||
|
|
@ -41,7 +41,6 @@
|
|||
<!--<a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('Neuen Berater erstellen')}}</a> -->
|
||||
</div>
|
||||
<table class="datatables-customers table table-striped table-bordered" id="datatables-customers">
|
||||
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
|
|
@ -56,6 +55,7 @@
|
|||
<th>{{__('Stadt')}}</th>
|
||||
<th>{{__('Land')}}</th>
|
||||
<th>{{__('Käufe')}}</th>
|
||||
<th>{{__('Newsletter')}}</th>
|
||||
<th>{{__('zugewiesener Berater')}}</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
</tr>
|
||||
|
|
@ -98,6 +98,7 @@
|
|||
{ data: 'billing_city', name: 'billing_city' },
|
||||
{ data: 'billing_country_id', name: 'billing_country_id' },
|
||||
{ data: 'orders', name: 'orders' },
|
||||
{ data: 'subscribed', name: 'subscribed' },
|
||||
{ data: 'member_id', name: 'member_id', searchable: false, orderable: false },
|
||||
{ data: 'created_at', name: 'created_at' },
|
||||
],
|
||||
|
|
|
|||
|
|
@ -66,6 +66,32 @@
|
|||
</p>
|
||||
</div>
|
||||
<div class="col-sm-12">
|
||||
|
||||
@if($current->member_id)
|
||||
<input type="hidden" name="change_shopping_user" value="true">
|
||||
|
||||
<hr>
|
||||
<p class="font-weight-bold">Zugeordneter Berater:</p>
|
||||
<p>
|
||||
<span class="text-muted">#{{$current->member->number}}</span><br>
|
||||
{{$current->member->getFullName()}}<br>
|
||||
{{$current->member->account->zipcode}} {{$current->member->account->city}}<br>
|
||||
@if($current->member->shop)
|
||||
@if($current->member->isActive() && $current->member->isActiveShop())
|
||||
<a href="{{$current->member->shop->getSubdomain(false)}}" class="badge badge-success" target="_blank">{{$current->member->shop->getSubdomain(false)}}</a>
|
||||
@else
|
||||
<span class="badge badge-danger" target="_blank">{{$current->member->shop->getSubdomain(false)}}</span>
|
||||
@endif
|
||||
@else
|
||||
Keinen Shop eingerichtet
|
||||
@endif
|
||||
<label class="custom-control custom-radio mt-3">
|
||||
<input type="radio" class="custom-control-input" name="is_like_shopping_user_id" value="{{$current->id}}">
|
||||
<span class="custom-control-label">Nein, das ist ein neuer Kunde, Berater <span class="text-muted">#{{$current->member->number}}</span> zuordnen</span>
|
||||
</label>
|
||||
</p>
|
||||
@endif
|
||||
|
||||
<hr>
|
||||
<p class="font-weight-bold">Bestellt im Shop:</p>
|
||||
<p>
|
||||
|
|
@ -80,14 +106,17 @@
|
|||
<span class="badge badge-danger" target="_blank">{{$current->shopping_order->user_shop->getSubdomain(false)}}</span>
|
||||
@endif
|
||||
@endif
|
||||
@if(!$current->member_id)
|
||||
<label class="custom-control custom-radio mt-3">
|
||||
<input type="radio" class="custom-control-input" name="is_like_shopping_user_id" value="{{$current->id}}">
|
||||
<span class="custom-control-label">Nein, das ist ein neuer Kunde, Berater <span class="text-muted">#{{$current->shopping_order->user_shop->user->number}}</span> zuordnen</span>
|
||||
</label>
|
||||
@endif
|
||||
@else
|
||||
Keiner Bestellung / Shop zugeordnet
|
||||
@endif
|
||||
</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -99,7 +128,6 @@
|
|||
@if(isset($possible[0]))
|
||||
@php($possible = $possible[0])
|
||||
@endif
|
||||
|
||||
<div class="bg-light p-3 mb-3" style="border-radius: 6px">
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
|
|
|
|||
|
|
@ -22,11 +22,8 @@
|
|||
{{ Form::text('title', $product->title, array('placeholder'=>__('Title'), 'class'=>'form-control', 'id'=>'title')) }}
|
||||
</div>
|
||||
--}}
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-5">
|
||||
<label class="form-label" for="title">{{ __('Kategorie (Mehrfachauswahl)') }}</label>
|
||||
|
|
@ -53,28 +50,28 @@
|
|||
|
||||
<div class="card mb-2">
|
||||
<h5 class="card-header">
|
||||
{{ __('Preise') }}
|
||||
{{ __('Preise in EUR') }}
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-4 col-md-3">
|
||||
<label class="form-label" for="price">{{ __('Preis VK') }}</label>
|
||||
{{ Form::text('price', $product->getFormattedPrice(), array('placeholder'=>__('price'), 'class'=>'form-control', 'id'=>'price')) }}
|
||||
<label class="form-label" for="price">{{ __('Preis VK in EUR (Brutto)') }}</label>
|
||||
{{ Form::text('price', $product->getFormattedPrice(), array('placeholder'=>__('Preis VK in EUR (Brutto)'), 'class'=>'form-control', 'id'=>'price')) }}
|
||||
|
||||
</div>
|
||||
<div class="form-group col-sm-4 col-md-3">
|
||||
<label class="form-label" for="price_ek">{{ __('Preis EK') }}</label>
|
||||
{{ Form::text('price_ek', $product->getFormattedPriceEk(), array('placeholder'=>__('price_ek'), 'class'=>'form-control', 'id'=>'price_ek')) }}
|
||||
<label class="form-label" for="price_ek">{{ __('Preis EK in EUR') }}</label>
|
||||
{{ Form::text('price_ek', $product->getFormattedPriceEk(), array('placeholder'=>__('Preis EK in EUR'), 'class'=>'form-control', 'id'=>'price_ek')) }}
|
||||
|
||||
</div>
|
||||
<div class="form-group col-sm-4 col-md-3">
|
||||
<label class="form-label" for="tax">{{ __('MwSt') }}</label>
|
||||
{{ Form::text('tax', $product->getFormattedTax(), array('placeholder'=>__('tax'), 'class'=>'form-control', 'id'=>'tax')) }}
|
||||
<label class="form-label" for="tax">{{ __('MwSt in %') }}</label>
|
||||
{{ Form::text('tax', $product->getFormattedTax(), array('placeholder'=>__('MwSt in %'), 'class'=>'form-control', 'id'=>'tax')) }}
|
||||
|
||||
</div>
|
||||
<div class="form-group col-sm-4 col-md-3">
|
||||
<label class="form-label" for="price_old">{{ __('Streichpreis (wenn > 0)') }}</label>
|
||||
{{ Form::text('price_old', $product->getFormattedPriceOld(), array('placeholder'=>__('price_old'), 'class'=>'form-control', 'id'=>'price_old')) }}
|
||||
<label class="form-label" for="price_old">{{ __('Streichpreis in EUR (wenn > 0)') }}</label>
|
||||
{{ Form::text('price_old', $product->getFormattedPriceOld(), array('placeholder'=>__('Streichpreis'), 'class'=>'form-control', 'id'=>'price_old')) }}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -85,18 +82,108 @@
|
|||
{{ Form::text('weight', $product->weight, array('placeholder'=>__('Gewicht in g'), 'class'=>'form-control', 'id'=>'weight')) }}
|
||||
</div>
|
||||
<div class="form-group col-sm-4">
|
||||
<label class="form-label" for="points">{{ __('Points') }}</label>
|
||||
<label class="form-label" for="points">{{ __('Points pro Produkt') }}</label>
|
||||
{{ Form::text('points', $product->points, array('placeholder'=>__('Points pro Produkt'), 'class'=>'form-control', 'id'=>'points')) }}
|
||||
</div>
|
||||
<div class="form-group col-sm-4">
|
||||
<label class="form-label" for="amount">{{ __('Anzahl/Verfügbarkeit') }}</label>
|
||||
{{ Form::text('amount', $product->amount, array('placeholder'=>__('amount'), 'class'=>'form-control', 'id'=>'amount')) }}
|
||||
{{ Form::text('amount', $product->amount, array('placeholder'=>__('Anzahl/Verfügbarkeit'), 'class'=>'form-control', 'id'=>'amount')) }}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card mb-2">
|
||||
<h5 class="card-header">
|
||||
Landesspezifische Preise
|
||||
</h5>
|
||||
|
||||
<div class="card-body pt-0">
|
||||
@foreach($country_for_prices as $country)
|
||||
|
||||
{{ Form::hidden('country_prices[]', $country->id) }}
|
||||
<div class="card-header bg-light pb-0 mt-3">
|
||||
<h6>{{$country->de}}</h6>
|
||||
</div>
|
||||
<div class="bg-lighter p-2">
|
||||
@if($country->own_eur)
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-4 col-md-3">
|
||||
<label class="form-label">Land hat eigenen EURO Preis</label>
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="form-group col-sm-4 col-md-3">
|
||||
<label class="form-label" for="price">{{ __('Preis VK in EUR Brutto') }}</label>
|
||||
{{ Form::text('c_price['.$country->id.']', formatNumber($product->getCPrice($country->id)), array('placeholder'=>__('Preis VK in EUR Brutto'), 'class'=>'form-control', 'id'=>'c_price_'.$country->id)) }}
|
||||
|
||||
</div>
|
||||
<div class="form-group col-sm-4 col-md-3">
|
||||
<label class="form-label" for="tax">{{ __('MwSt in %') }}</label>
|
||||
{{ Form::text('c_tax['.$country->id.']', formatNumber($product->getCTax($country->id)), array('placeholder'=>__('MwSt in %'), 'class'=>'form-control', 'id'=>'c_tax'.$country->id)) }}
|
||||
|
||||
</div>
|
||||
<div class="form-group col-sm-4 col-md-3">
|
||||
<label class="form-label" for="price_old">{{ __('Streichpreis (wenn > 0)') }}</label>
|
||||
{{ Form::text('c_price_old['.$country->id.']', formatNumber($product->getCPriceOld($country->id)), array('placeholder'=>__('Streichpreis'), 'class'=>'form-control', 'id'=>'c_price_old'.$country->id)) }}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@if($country->currency)
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-4 col-md-3">
|
||||
<label class="form-label">Land hat eigene Währung</label>
|
||||
<p>@if($country->currency_calc) Preis Berechnung automatisch @else Preis manuell
|
||||
angegeben @endif</p>
|
||||
</div>
|
||||
|
||||
@if($country->currency_calc)
|
||||
{{--
|
||||
NUR Anzeige vom automatisch berechneten Preis currency_faktor
|
||||
Auf Basis vom price
|
||||
Wenn own_eur auf basis vom own_eur price
|
||||
--}}
|
||||
<div class="form-group col-sm-4 col-md-3">
|
||||
<label class="form-label">Preis VK in {{ $country->currency_unit }}</label>
|
||||
{{ Form::text('c_currency['.$country->id.']', formatNumber($product->getRealPrice($country) * $country->currency_faktor), array('class'=>'form-control', 'readonly')) }}
|
||||
|
||||
</div>
|
||||
@else
|
||||
{{--
|
||||
Eingabe
|
||||
Währungs Namen aus currency_name
|
||||
currency_faktor als Hinweis ausgeben
|
||||
Auf Basis vom price
|
||||
Wenn own_eur auf basis vom own_eur price
|
||||
--}}
|
||||
<div class="form-group col-sm-4 col-md-3">
|
||||
<label class="form-label">{{__('Preis VK in ')}} {{ $country->currency_unit }} ({{formatNumber($product->getRealPrice($country) * $country->currency_faktor)}})</label>
|
||||
{{ Form::text('c_currency['.$country->id.']', formatNumber($product->getCCurrency($country->id)), array('placeholder'=>__('Preis VK in ').$country->currency_unit, 'class'=>'form-control')) }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="form-group col-sm-4 col-md-2">
|
||||
<label class="form-label">{{ __('Währungs Faktor' ) }}</label>
|
||||
{{ Form::text('currency_faktor['.$country->id.']', formatNumber($country->currency_faktor, 4), array('class'=>'form-control', 'readonly')) }}
|
||||
</div>
|
||||
<div class="form-group col-sm-4 col-md-2">
|
||||
<label class="form-label">{{ __('Preis VK in EUR ') }}</label>
|
||||
{{ Form::text('preis_eur['.$country->id.']', formatNumber($product->getRealPrice($country)), array('class'=>'form-control', 'readonly')) }}
|
||||
</div>
|
||||
<div class="form-group col-sm-4 col-md-2">
|
||||
<label class="form-label">{{ __('Währung') }}</label>
|
||||
{{ Form::text('currency_unit['.$country->id.']', $country->currency_unit, array('class'=>'form-control', 'readonly')) }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endforeach
|
||||
<em class="float-right text-muted small">für die Einstellung von landesspezifischen Preisen müssen diese unter
|
||||
<a href="{{route('admin_countries')}}">Länder</a> -> Land aktiviert werden.</em>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card mb-2">
|
||||
|
|
@ -135,7 +222,8 @@
|
|||
</div>
|
||||
<div class="form-group col-sm-4">
|
||||
<label class="form-label" for="title">{{ __('Attribute') }}</label>
|
||||
<select class="selectpicker" name="attributes[]" id="attributes" data-style="btn-light" data-live-search="false" multiple>
|
||||
<select class="selectpicker" name="attributes[]" id="attributes" data-style="btn-light"
|
||||
data-live-search="false" multiple>
|
||||
{!! HTMLHelper::getAttributesOptions($product->attributes()->pluck('attribute_id')->toArray()) !!}
|
||||
</select>
|
||||
</div>
|
||||
|
|
@ -176,6 +264,12 @@
|
|||
{{ Form::text('upgrade_to_id', $product->upgrade_to_id, array('placeholder'=>__('Product ID when need an upgrade'), 'class'=>'form-control', 'id'=>'upgrade_to_id')) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-5">
|
||||
<label class="form-label" for="wp_number">WP Artikel Number (als Zahl ohne Leerreichen für die WP-API)</label>
|
||||
{{ Form::text('wp_number', $product->wp_number, array('placeholder'=>__('WP Number'), 'class'=>'form-control', 'id'=>'wp_number')) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -13,9 +13,21 @@
|
|||
</li>
|
||||
|
||||
@if(Auth::user()->showSideNav())
|
||||
|
||||
<li class="sidenav-item @if(Request::is('user/edit', 'user/membership')) open @endif">
|
||||
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
|
||||
<i class="sidenav-icon ion ion-ios-contact"></i>
|
||||
<div>{{ __('navigation.my_account') }}</div>
|
||||
</a>
|
||||
<ul class="sidenav-menu">
|
||||
<li class="sidenav-item{{ Request::is('user/edit') ? ' active' : '' }}">
|
||||
<a href="{{ route('user_edit') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-create"></i><div>{{ __('navigation.my_data') }}</div></a>
|
||||
</li>
|
||||
<li class="sidenav-item{{ Request::is('user/membership') ? ' active' : '' }}">
|
||||
<a href="{{ route('user_membership') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-people"></i><div>{{ __('navigation.membership') }}</div></a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
@if(Auth::user()->isActiveShop())
|
||||
<li class="sidenav-item @if(Request::is('user/shop', 'user/shop/*')) open @endif">
|
||||
|
|
@ -46,6 +58,22 @@
|
|||
</ul>
|
||||
</li>
|
||||
@endif
|
||||
@if(Auth::user()->isActiveAccount())
|
||||
<li class="sidenav-item @if(Request::is('user/customers', 'user/customer/*')) open @endif">
|
||||
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
|
||||
<i class="sidenav-icon ion ion-md-contacts"></i>
|
||||
<div>{{ __('navigation.my_clients') }}</div>
|
||||
</a>
|
||||
<ul class="sidenav-menu">
|
||||
<li class="sidenav-item{{ Request::is('user/customers', 'user/customer/detail/*') ? ' active' : '' }}">
|
||||
<a href="{{ route('user_customers') }}" class="sidenav-link"><i class="sidenav-icon ion ion ion-md-contacts"></i><div>{{ __('navigation.overview') }}</div></a>
|
||||
</li>
|
||||
<li class="sidenav-item{{ Request::is('user/customer/add/*') ? ' active' : '' }}">
|
||||
<a href="{{ route('user_customer_add', ['new']) }}" class="sidenav-link"><i class="sidenav-icon ion ion ion-md-person-add"></i><div>{{ __('navigation.add') }}</div></a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@if(Auth::user()->isAdmin())
|
||||
|
|
@ -56,10 +84,9 @@
|
|||
<a href="{{ route('admin_leads') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-contacts"></i><div>{{ __('navigation.member') }}</div></a>
|
||||
</li>
|
||||
|
||||
<li class="sidenav-item{{ Request::is('admin/customers') ? ' active' : '' }} {{ Request::is('admin/customer/edit/*') ? ' active' : '' }}">
|
||||
<li class="sidenav-item{{ Request::is('admin/customers') ? ' active' : '' }} {{ Request::is('admin/customer/*') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_customers') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-contacts"></i><div>{{ __('navigation.clients') }}</div></a>
|
||||
</li>
|
||||
|
||||
<li class="sidenav-item @if(Request::is('admin/sales/*')) open @endif">
|
||||
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
|
||||
<i class="sidenav-icon ion ion-ios-cart"></i>
|
||||
|
|
@ -162,7 +189,9 @@
|
|||
</li>
|
||||
<li class="sidenav-item{{ Request::is('sysadmin/tools/shopping_orders') ? ' active' : '' }}">
|
||||
<a href="{{ route('sysadmin_tools_shopping_orders') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-analytics"></i><div>Shopping Orders</div></a>
|
||||
|
||||
</li>
|
||||
<li class="sidenav-item{{ Request::is('sysadmin/import') ? ' active' : '' }}">
|
||||
<a href="{{ route('sysadmin_import') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-cloud-upload"></i><div>Import</div></a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue