diff --git a/.env b/.env index b72a686..294f0d2 100644 --- a/.env +++ b/.env @@ -2,7 +2,9 @@ APP_NAME="mivita.care" APP_ENV=local APP_DEBUG=true APP_KEY=base64:HrWQ9AV3Zt2TU0iq1OeUUpTUaXwNUdh8xHmx7RXTif4= -APP_URL=http://mivita.local/login +APP_URL=http://mivita.local/ +APP_DOMAIN=mivita.local +APP_PROTOCOL=http:// LOG_CHANNEL=stack diff --git a/.idea/mivita.care.iml b/.idea/mivita.care.iml index 7bdb327..2f0edf4 100644 --- a/.idea/mivita.care.iml +++ b/.idea/mivita.care.iml @@ -4,6 +4,7 @@ + @@ -64,6 +65,7 @@ + @@ -80,6 +82,7 @@ + diff --git a/.idea/php.xml b/.idea/php.xml index 2b86738..2c12eee 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -100,6 +100,9 @@ + + + diff --git a/.idea/symfony2.xml b/.idea/symfony2.xml index b5fbe71..e3f946c 100644 --- a/.idea/symfony2.xml +++ b/.idea/symfony2.xml @@ -3,5 +3,6 @@ \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d6821f0..6526dcb 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,39 +2,68 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - - - - - - + + + + + + + + + + + + + + + - + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + - - - - - + + - + - - - - - - - - - - - - - - + + - + - - + + @@ -264,14 +308,25 @@ cartIt form form> + date + birthdatepicker + data + tea + lea + lead + accepted_active + mail + speic + your Data + your + render + base_ + url + aktvie - - - - @@ -293,6 +348,10 @@ + + + + @@ -301,57 +360,57 @@ @@ -479,10 +538,14 @@ + + + - @@ -508,7 +571,7 @@ - + @@ -529,7 +592,13 @@ - + + + + + + + @@ -555,29 +624,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -595,24 +641,6 @@ - - - - - - - - - - - - - - - - - - @@ -639,6 +667,20 @@ + + + + + + + + + + + + + + @@ -651,32 +693,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -697,17 +715,17 @@ - - - - - - - + + + + + + + - - + + - + @@ -766,9 +788,9 @@ - - - + + + @@ -783,325 +805,300 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php index 581e86d..b374302 100644 --- a/.phpstorm.meta.php +++ b/.phpstorm.meta.php @@ -5,7 +5,7 @@ namespace PHPSTORM_META { /** * PhpStorm Meta file, to provide autocomplete information for PhpStorm - * Generated on 2018-11-22 15:17:36. + * Generated on 2019-01-03 18:54:53. * * @author Barry vd. Heuvel * @see https://github.com/barryvdh/laravel-ide-helper @@ -144,6 +144,7 @@ namespace PHPSTORM_META { '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, 'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class, @@ -298,6 +299,7 @@ namespace PHPSTORM_META { '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, 'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class, @@ -452,6 +454,7 @@ namespace PHPSTORM_META { '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, 'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class, @@ -606,6 +609,7 @@ namespace PHPSTORM_META { '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, 'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class, @@ -760,6 +764,7 @@ namespace PHPSTORM_META { '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, 'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class, @@ -914,6 +919,7 @@ namespace PHPSTORM_META { '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, 'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class, @@ -1068,6 +1074,7 @@ namespace PHPSTORM_META { '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, 'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class, diff --git a/_ide_helper.php b/_ide_helper.php index 27062b9..7e23839 100644 --- a/_ide_helper.php +++ b/_ide_helper.php @@ -3,7 +3,7 @@ /** * A helper file for Laravel 5, to provide autocomplete information to your IDE - * Generated for Laravel 5.6.39 on 2018-11-22 15:17:35. + * Generated for Laravel 5.6.39 on 2019-01-03 18:54:52. * * This file should not be included in your code, only analyzed by your IDE! * @@ -6034,12 +6034,12 @@ namespace Illuminate\Support\Facades { * * @param string $message The log message * @param array $context The log context - * @return Boolean Whether the record has been processed + * @return bool Whether the record has been processed * @static */ public static function debug($message, $context = array()) { - return \Monolog\Logger::debug($message, $context); + return \Monolog\Logger::addDebug($message, $context); } /** @@ -6047,12 +6047,12 @@ namespace Illuminate\Support\Facades { * * @param string $message The log message * @param array $context The log context - * @return Boolean Whether the record has been processed + * @return bool Whether the record has been processed * @static */ public static function info($message, $context = array()) { - return \Monolog\Logger::info($message, $context); + return \Monolog\Logger::addInfo($message, $context); } /** @@ -6060,12 +6060,12 @@ namespace Illuminate\Support\Facades { * * @param string $message The log message * @param array $context The log context - * @return Boolean Whether the record has been processed + * @return bool Whether the record has been processed * @static */ public static function notice($message, $context = array()) { - return \Monolog\Logger::notice($message, $context); + return \Monolog\Logger::addNotice($message, $context); } /** @@ -6073,12 +6073,12 @@ namespace Illuminate\Support\Facades { * * @param string $message The log message * @param array $context The log context - * @return Boolean Whether the record has been processed + * @return bool Whether the record has been processed * @static */ public static function warning($message, $context = array()) { - return \Monolog\Logger::warning($message, $context); + return \Monolog\Logger::addWarning($message, $context); } /** @@ -6086,12 +6086,12 @@ namespace Illuminate\Support\Facades { * * @param string $message The log message * @param array $context The log context - * @return Boolean Whether the record has been processed + * @return bool Whether the record has been processed * @static */ public static function error($message, $context = array()) { - return \Monolog\Logger::error($message, $context); + return \Monolog\Logger::addError($message, $context); } /** @@ -6099,12 +6099,12 @@ namespace Illuminate\Support\Facades { * * @param string $message The log message * @param array $context The log context - * @return Boolean Whether the record has been processed + * @return bool Whether the record has been processed * @static */ public static function critical($message, $context = array()) { - return \Monolog\Logger::critical($message, $context); + return \Monolog\Logger::addCritical($message, $context); } /** @@ -6112,12 +6112,12 @@ namespace Illuminate\Support\Facades { * * @param string $message The log message * @param array $context The log context - * @return Boolean Whether the record has been processed + * @return bool Whether the record has been processed * @static */ public static function alert($message, $context = array()) { - return \Monolog\Logger::alert($message, $context); + return \Monolog\Logger::addAlert($message, $context); } /** @@ -6125,12 +6125,12 @@ namespace Illuminate\Support\Facades { * * @param string $message The log message * @param array $context The log context - * @return Boolean Whether the record has been processed + * @return bool Whether the record has been processed * @static */ public static function emergency($message, $context = array()) { - return \Monolog\Logger::emergency($message, $context); + return \Monolog\Logger::addEmergency($message, $context); } /** @@ -8934,7 +8934,7 @@ namespace Illuminate\Support\Facades { * Checks whether the method is cacheable or not. * * @see https://tools.ietf.org/html/rfc7231#section-4.2.3 - * @return bool + * @return bool True for GET and HEAD, false otherwise * @static */ public static function isMethodCacheable() @@ -9566,7 +9566,7 @@ namespace Illuminate\Support\Facades { */ public static function validate($rules, $params = null) { - return \Illuminate\Http\Request::validate($rules, $params); + return \Illuminate\Http\Request::Illuminate\Foundation\Providers\{closure}($rules, $params); } /** @@ -9576,7 +9576,7 @@ namespace Illuminate\Support\Facades { */ public static function hasValidSignature() { - return \Illuminate\Http\Request::hasValidSignature(); + return \Illuminate\Http\Request::Illuminate\Foundation\Providers\{closure}(); } } @@ -14789,7 +14789,7 @@ namespace Illuminate\Support\Facades { * Checks whether the method is cacheable or not. * * @see https://tools.ietf.org/html/rfc7231#section-4.2.3 - * @return bool + * @return bool True for GET and HEAD, false otherwise * @static */ public static function isMethodCacheable() @@ -15421,7 +15421,7 @@ namespace Illuminate\Support\Facades { */ public static function validate($rules, $params = null) { - return \Illuminate\Http\Request::validate($rules, $params); + return \Illuminate\Http\Request::Illuminate\Foundation\Providers\{closure}($rules, $params); } /** @@ -15431,7 +15431,7 @@ namespace Illuminate\Support\Facades { */ public static function hasValidSignature() { - return \Illuminate\Http\Request::hasValidSignature(); + return \Illuminate\Http\Request::Illuminate\Foundation\Providers\{closure}(); } } @@ -17412,6 +17412,16 @@ namespace App\Services\Facade { */ class Yard { + /** + * + * + * @static + */ + public static function getTaxRate() + { + return \App\Services\Yard::getTaxRate(); + } + /** * * @@ -17437,6 +17447,26 @@ namespace App\Services\Facade { return \App\Services\Yard::shipping($decimals, $decimalPoint, $thousandSeperator); } + /** + * + * + * @static + */ + public static function subtotalWithShipping($decimals = null, $decimalPoint = null, $thousandSeperator = null) + { + return \App\Services\Yard::subtotalWithShipping($decimals, $decimalPoint, $thousandSeperator); + } + + /** + * + * + * @static + */ + public static function taxWithShipping($decimals = null, $decimalPoint = null, $thousandSeperator = null) + { + return \App\Services\Yard::taxWithShipping($decimals, $decimalPoint, $thousandSeperator); + } + /** * * @@ -17447,6 +17477,20 @@ namespace App\Services\Facade { return \App\Services\Yard::totalWithShipping($decimals, $decimalPoint, $thousandSeperator); } + /** + * Get the total price of the items in the cart. + * + * @param int $decimals + * @param string $decimalPoint + * @param string $thousandSeperator + * @return string + * @static + */ + public static function total($decimals = null, $decimalPoint = null, $thousandSeperator = null) + { + return \App\Services\Yard::total($decimals, $decimalPoint, $thousandSeperator); + } + /** * Get the total tax of the items in the cart. * @@ -17456,9 +17500,9 @@ namespace App\Services\Facade { * @return float * @static */ - public static function taxWithShipping($decimals = null, $decimalPoint = null, $thousandSeperator = null) + public static function tax($decimals = null, $decimalPoint = null, $thousandSeperator = null) { - return \App\Services\Yard::taxWithShipping($decimals, $decimalPoint, $thousandSeperator); + return \App\Services\Yard::tax($decimals, $decimalPoint, $thousandSeperator); } /** @@ -17470,19 +17514,9 @@ namespace App\Services\Facade { * @return float * @static */ - public static function subtotalWithShipping($decimals = null, $decimalPoint = null, $thousandSeperator = null) + public static function subtotal($decimals = null, $decimalPoint = null, $thousandSeperator = null) { - return \App\Services\Yard::subtotalWithShipping($decimals, $decimalPoint, $thousandSeperator); - } - - /** - * - * - * @static - */ - public static function cardCalcSubTotal($price) - { - return \App\Services\Yard::cardCalcSubTotal($price); + return \App\Services\Yard::subtotal($decimals, $decimalPoint, $thousandSeperator); } /** @@ -17603,51 +17637,6 @@ namespace App\Services\Facade { return \App\Services\Yard::count(); } - /** - * Get the total price of the items in the cart. - * - * @param int $decimals - * @param string $decimalPoint - * @param string $thousandSeperator - * @return string - * @static - */ - public static function total($decimals = null, $decimalPoint = null, $thousandSeperator = null) - { - //Method inherited from \Gloudemans\Shoppingcart\Cart - return \App\Services\Yard::total($decimals, $decimalPoint, $thousandSeperator); - } - - /** - * Get the total tax of the items in the cart. - * - * @param int $decimals - * @param string $decimalPoint - * @param string $thousandSeperator - * @return float - * @static - */ - public static function tax($decimals = null, $decimalPoint = null, $thousandSeperator = null) - { - //Method inherited from \Gloudemans\Shoppingcart\Cart - return \App\Services\Yard::tax($decimals, $decimalPoint, $thousandSeperator); - } - - /** - * Get the subtotal (total - tax) of the items in the cart. - * - * @param int $decimals - * @param string $decimalPoint - * @param string $thousandSeperator - * @return float - * @static - */ - public static function subtotal($decimals = null, $decimalPoint = null, $thousandSeperator = null) - { - //Method inherited from \Gloudemans\Shoppingcart\Cart - return \App\Services\Yard::subtotal($decimals, $decimalPoint, $thousandSeperator); - } - /** * Search the cart content for a cart item matching the given search closure. * diff --git a/_ide_helper_models.php b/_ide_helper_models.php index d40b842..5a270a5 100644 --- a/_ide_helper_models.php +++ b/_ide_helper_models.php @@ -65,6 +65,12 @@ namespace App{ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereNotes($value) * @method static \Illuminate\Database\Query\Builder|\App\User withTrashed() * @method static \Illuminate\Database\Query\Builder|\App\User withoutTrashed() + * @property int|null $account_id + * @method static \Illuminate\Database\Eloquent\Builder|\App\User newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\User newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\User query() + * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereAccountId($value) + * @property-read \App\Models\UserShop $user_shop */ class User extends \Eloquent {} } @@ -96,6 +102,9 @@ namespace App\Models{ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProductCategory[] $product_categories * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category findSimilarSlugs($attribute, $config, $slug) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category whereSlug($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category query() */ class Category extends \Eloquent {} } @@ -106,6 +115,17 @@ namespace App\Models{ * * @property-read \App\User $user * @mixin \Eloquent + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail query() + * @property int $user_id + * @property string $email + * @property string $token + * @property \Illuminate\Support\Carbon $created_at + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail whereEmail($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail whereToken($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail whereUserId($value) */ class UserUpdateEmail extends \Eloquent {} } @@ -179,6 +199,9 @@ namespace App\Models{ * @property string|null $slug * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product findSimilarSlugs($attribute, $config, $slug) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereSlug($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product query() */ class Product extends \Eloquent {} } @@ -206,6 +229,9 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country wherePhone($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereRu($value) * @mixin \Eloquent + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country query() */ class Country extends \Eloquent {} } @@ -239,92 +265,13 @@ namespace App\Models{ * @property string|null $slug * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage findSimilarSlugs($attribute, $config, $slug) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage whereSlug($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage query() */ class ProductImage extends \Eloquent {} } -namespace App\Models{ -/** - * App\Models\Account - * - * @property int $id - * @property int $user_id - * @property int $company - * @property string|null $company_name - * @property string|null $company_street - * @property string|null $company_postal_code - * @property string|null $company_city - * @property int|null $company_pre_phone_id - * @property string|null $company_phone - * @property string|null $company_homepage - * @property int|null $company_country_id - * @property string|null $salutation - * @property string|null $title - * @property string|null $first_name - * @property string|null $last_name - * @property string|null $street - * @property string|null $postal_code - * @property string|null $city - * @property int|null $country_id - * @property int|null $pre_phone_id - * @property string|null $phone - * @property int|null $pre_mobil_id - * @property string|null $mobil - * @property string|null $birthday - * @property string|null $website - * @property string|null $facebook - * @property string|null $facebook_fanpage - * @property string|null $instagram - * @property \Illuminate\Support\Carbon|null $created_at - * @property \Illuminate\Support\Carbon|null $updated_at - * @property \Illuminate\Support\Carbon|null $deleted_at - * @property-read \App\Models\Country|null $company_country - * @property-read \App\Models\Country|null $company_pre_phone - * @property-read \App\Models\Country|null $country - * @property-read \App\Models\Country|null $pre_mobil - * @property-read \App\Models\Country|null $pre_phone - * @property-read \App\User $user - * @method static bool|null forceDelete() - * @method static \Illuminate\Database\Query\Builder|\App\Models\Account onlyTrashed() - * @method static bool|null restore() - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereBirthday($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereCity($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereCompany($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereCompanyCity($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereCompanyCountryId($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereCompanyHomepage($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereCompanyName($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereCompanyPhone($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereCompanyPostalCode($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereCompanyPrePhoneId($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereCompanyStreet($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereCountryId($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereCreatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereDeletedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereFacebook($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereFacebookFanpage($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereFirstName($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereInstagram($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereLastName($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereMobil($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account wherePhone($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account wherePostalCode($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account wherePreMobilId($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account wherePrePhoneId($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereSalutation($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereStreet($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereTitle($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereUpdatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereUserId($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Account whereWebsite($value) - * @method static \Illuminate\Database\Query\Builder|\App\Models\Account withTrashed() - * @method static \Illuminate\Database\Query\Builder|\App\Models\Account withoutTrashed() - * @mixin \Eloquent - */ - class Account extends \Eloquent {} -} - namespace App\Models{ /** * App\Models\Attribute @@ -350,10 +297,98 @@ namespace App\Models{ * @mixin \Eloquent * @property string|null $slug * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute whereSlug($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute query() */ class Attribute extends \Eloquent {} } +namespace App\Models{ +/** + * App\Models\UserAccount + * + * @property-read \App\Models\Country $company_country + * @property-read \App\Models\Country $company_pre_phone + * @property-read \App\Models\Country $country + * @property mixed $birthday + * @property-read mixed $company + * @property-read \App\Models\Country $pre_mobil + * @property-read \App\Models\Country $pre_phone + * @property-read \App\User $user + * @method static bool|null forceDelete() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount newQuery() + * @method static \Illuminate\Database\Query\Builder|\App\Models\UserAccount onlyTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount query() + * @method static bool|null restore() + * @method static \Illuminate\Database\Query\Builder|\App\Models\UserAccount withTrashed() + * @method static \Illuminate\Database\Query\Builder|\App\Models\UserAccount withoutTrashed() + * @mixin \Eloquent + * @property int $id + * @property string|null $company_name + * @property string|null $company_street + * @property string|null $company_postal_code + * @property string|null $company_city + * @property int|null $company_pre_phone_id + * @property string|null $company_phone + * @property string|null $company_homepage + * @property int|null $company_country_id + * @property string|null $salutation + * @property string|null $title + * @property string|null $first_name + * @property string|null $last_name + * @property string|null $street + * @property string|null $postal_code + * @property string|null $city + * @property int|null $country_id + * @property int|null $pre_phone_id + * @property string|null $phone + * @property int|null $pre_mobil_id + * @property string|null $mobil + * @property string|null $website + * @property string|null $facebook + * @property string|null $facebook_fanpage + * @property string|null $instagram + * @property string|null $data_protection + * @property \Illuminate\Support\Carbon|null $created_at + * @property \Illuminate\Support\Carbon|null $updated_at + * @property \Illuminate\Support\Carbon|null $deleted_at + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereBirthday($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereCity($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereCompany($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereCompanyCity($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereCompanyCountryId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereCompanyHomepage($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereCompanyName($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereCompanyPhone($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereCompanyPostalCode($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereCompanyPrePhoneId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereCompanyStreet($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereCountryId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereDataProtection($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereDeletedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereFacebook($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereFacebookFanpage($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereFirstName($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereInstagram($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereLastName($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMobil($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount wherePhone($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount wherePostalCode($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount wherePreMobilId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount wherePrePhoneId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereSalutation($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereStreet($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereTitle($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereUpdatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereWebsite($value) + */ + class UserAccount extends \Eloquent {} +} + namespace App\Models{ /** * App\Models\ProductAttribute @@ -371,10 +406,73 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute whereProductId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute whereUpdatedAt($value) * @mixin \Eloquent + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute query() */ class ProductAttribute extends \Eloquent {} } +namespace App\Models{ +/** + * App\Models\UserShop + * + * @property int $id + * @property int $user_id + * @property string $name + * @property string $slug + * @property int $active + * @property string|null $active_date + * @property string $title + * @property array|null $trans_title + * @property string|null $copy + * @property array|null $trans_copy + * @property string|null $info + * @property array|null $trans_info + * @property array|null $featured + * @property string|null $filename + * @property string|null $originalname + * @property string|null $ext + * @property string|null $mine + * @property int|null $size + * @property \Illuminate\Support\Carbon|null $created_at + * @property \Illuminate\Support\Carbon|null $updated_at + * @property \Illuminate\Support\Carbon|null $deleted_at + * @property-read \App\User $user + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop findSimilarSlugs($attribute, $config, $slug) + * @method static bool|null forceDelete() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop newQuery() + * @method static \Illuminate\Database\Query\Builder|\App\Models\UserShop onlyTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop query() + * @method static bool|null restore() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereActive($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereActiveDate($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereCopy($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereDeletedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereExt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereFeatured($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereFilename($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereInfo($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereMine($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereName($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereOriginalname($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereSize($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereSlug($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereTitle($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereTransCopy($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereTransInfo($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereTransTitle($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereUpdatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereUserId($value) + * @method static \Illuminate\Database\Query\Builder|\App\Models\UserShop withTrashed() + * @method static \Illuminate\Database\Query\Builder|\App\Models\UserShop withoutTrashed() + */ + class UserShop extends \Eloquent {} +} + namespace App\Models{ /** * App\Models\ProductCategory @@ -392,6 +490,9 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory whereProductId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory whereUpdatedAt($value) * @mixin \Eloquent + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory query() */ class ProductCategory extends \Eloquent {} } diff --git a/app/Http/Controllers/AdminUserController.php b/app/Http/Controllers/AdminUserController.php index a330823..8fde26a 100755 --- a/app/Http/Controllers/AdminUserController.php +++ b/app/Http/Controllers/AdminUserController.php @@ -4,8 +4,7 @@ namespace App\Http\Controllers; -use App\Http\Controllers\Api\KasController; -use App\Models\Account; +use App\Models\UserAccount; use App\Repositories\UserRepository; use App\User; use Illuminate\Support\Facades\Mail; @@ -31,23 +30,6 @@ class AdminUserController extends Controller */ public function index() { - $kas = new KasController(); - $pra = array( - 'subdomain_name' => 'test', - 'domain_name' => 'mivita.care', - 'subdomain_path' => '/mein.mivita.care/public/', - //'php_version' => '7.1', - //'ssl_proxy' => 'Y', - //'redirect_status' => 0 - - - ); - //add_subdomain - $req = $kas->action('get_subdomains'); - //"is_active"]=> string(1) "Y" ["in_progress" - - var_dump($req); - die(); $data = [ //'values' => User::where('admin', 0)->get(), 'values' => User::where('confirmation_code_remider', '!=', 2)->get(), @@ -58,10 +40,10 @@ class AdminUserController extends Controller public function edit($user_id) { $user = User::findOrFail($user_id); - /*if(!$user->account){ - $user->account = new Account(); + if(!$user->account){ + $user->account = new UserAccount(); } - */ + $data = [ 'user' => $user, ]; diff --git a/app/Http/Controllers/DataTableController.php b/app/Http/Controllers/DataTableController.php index 30daaa2..f678a7e 100644 --- a/app/Http/Controllers/DataTableController.php +++ b/app/Http/Controllers/DataTableController.php @@ -13,7 +13,7 @@ class DataTableController extends Controller return view('datatable'); } - /*public function getLeads() + public function getLeads() { $query = User::where('deleted_at', '=', null); @@ -34,11 +34,15 @@ class DataTableController extends Controller ->addColumn('active', function (User $user) { return $user->active ? ' ' : ''; }) + ->addColumn('agreement', function (User $user) { + return $user->agreement ? '' : ''; + }) ->orderColumn('confirmed', 'confirmed $1') ->orderColumn('active', 'active $1') - ->rawColumns(['action', 'confirmed', 'active']) + ->orderColumn('agreement', 'agreement $1') + ->rawColumns(['action', 'confirmed', 'active', 'agreement']) ->make(true); - }*/ + } public function getUsers() { diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 79cb285..d7ebb9a 100755 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -60,6 +60,9 @@ class HomeController extends Controller if($data == "imprint"){ $response = view('legal.imprint_de')->render(); } + if($data == "shop_term_of_use"){ + $response = view('legal.shop_term_of_use_de')->render(); + } if(Request::ajax()) { return response()->json(['response' => $response, 'target'=>$target]); } @@ -117,4 +120,64 @@ class HomeController extends Controller { return view('legal.imprint'); } + public function verify($confirmation_code){ + if( ! $confirmation_code) + { + return redirect('/status/error'); + } + + $user = User::whereConfirmationCode($confirmation_code)->first(); + + if ( ! $user) + { + + return redirect('/status/not/found'); + } + + $user->confirmed = 1; + $user->confirmation_date = now(); + $user->confirmation_code = null; + $user->confirmation_code_to = null; + $user->confirmation_code_remider = 0; + $user->save(); + + //Login! + Auth::login($user); + + return redirect('/status/verify'); + } + + public function statusRegister(){ + return view('status.status_register'); + } + public function statusVerify(){ + return view('status.status_verify'); + } + public function statusError(){ + return view('status.status_error'); + } + public function notFound(){ + return view('status.not_found'); + } + + + /** + * @return string + */ + public function checkMail(){ + + $data = Input::all(); + if($data['user_id'] == "new"){ + if(User::where('email', $data['email'])->count()){ + return json_encode(false); + } + }else{ + if(User::where('email', $data['email'])->where('id', '!=', $data['user_id'])->count()){ + return json_encode(false); + } + } + return json_encode(true); + + + } } diff --git a/app/Http/Controllers/LeadController.php b/app/Http/Controllers/LeadController.php new file mode 100755 index 0000000..86e72cf --- /dev/null +++ b/app/Http/Controllers/LeadController.php @@ -0,0 +1,141 @@ +middleware('admin'); + $this->userRepo = $userRepo; + + } + + /** + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function index() + { + $data = [ + 'values' => User::where('admin', '=', 0)->where('confirmation_code_remider', '!=', 2)->get(), + ]; + return view('admin.leads', $data); + } + + + /** + * @param $id + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function edit($id) + { + if($id == "new"){ + $user = new User(); + $user->account = new UserAccount(); + }else{ + $user = User::findOrFail($id); + if(!$user->account){ + $user->account = new UserAccount(); + } + } + $data = [ + 'user' => $user, + 'can_change_mail' => true, + ]; + return view('admin.lead_edit', $data); + } + + /** + * @param Request $request + * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View + */ + public function store(Request $request) + { + $data = Input::all(); + + if ($data['user_id'] == "new") { + $user = new User(); + $user->id = "new"; + $user->account = new UserAccount(); + $user->account->company_country_id = isset($data['company_country_id']) ? $data['company_country_id'] : 0; + $user->account->salutation = isset($data['salutation']) ? $data['salutation'] : 0; + $rules = array( + 'salutation' => 'required', + 'last_name' => 'required|max:255', + 'country_id' => 'required|integer|min:1', + 'email' => 'required|string|email|max:255|unique:users', + 'email-confirm' => 'required|same:email', + ); + + } else { + $user = User::findOrFail($data['user_id']); + if(!$user->account){ + $user->account = new UserAccount(); + } + $rules = array( + 'salutation' => 'required', + 'last_name' => 'required|max:255', + 'country_id' => 'required|integer|min:1', + 'email' => 'required|string|email|max:255|exists:users,email', + 'email-confirm' => 'required|same:email', + ); + } + + if(Input::get('company') == 1){ + $rules['company_name'] = 'required|max:255'; + $rules['company_country_id'] = 'required|integer|min:1'; + } + + $data = [ + 'user' => $user, + ]; + $validator = Validator::make(Input::all(), $rules); + + if ($validator->fails()) { + return view('admin.lead_edit', $data)->withErrors($validator); + + } else { + $data = Input::all(); + $this->userRepo->update(Input::all()); + + if(isset($data['contact_verify'])){ + + $user = $this->userRepo->getModel(); + + $unique = false; + do{ + $confirmation_code = str_random(30); + if( User::where('confirmation_code', '=', $confirmation_code)->count() == 0){ + $unique = true; + } + } + while(!$unique); + + $user->lang = $user->getLandByCountry(); + $user->confirmation_code = $confirmation_code; + $user->save(); + + + Mail::to($user->email)->send(new MailVerifyContact($confirmation_code, $user)); + } + + \Session()->flash('alert-save', true); + return redirect('/admin/leads'); + } + } +} \ No newline at end of file diff --git a/app/Http/Controllers/UserDataController.php b/app/Http/Controllers/UserDataController.php index 5ffc7dd..e276727 100755 --- a/app/Http/Controllers/UserDataController.php +++ b/app/Http/Controllers/UserDataController.php @@ -64,9 +64,6 @@ class UserDataController extends Controller if ($validator->fails()) { - // get the error messages from the validator - $messages = $validator->messages(); - // redirect our user back to the form with the errors from the validator return view('user.edit', $data)->withErrors($validator); } else { @@ -76,13 +73,77 @@ class UserDataController extends Controller } } + /** + * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View + */ + public function userDataStore(){ + + $user = Auth::user(); + if(!$user->account){ + $user->account = new UserAccount(); + } + $rules = array( + 'salutation' => 'required', + 'last_name' => 'required|max:255', + 'country_id' => 'required|integer|min:1', + 'email' => 'required|string|email|max:255|exists:users,email', + 'email-confirm' => 'required|same:email', + ); + if($user->active == 0){ + $rules['accepted_data_protection'] = 'required'; + $rules['accepted_active'] = 'required'; + } + + if(Input::get('company') == 1){ + $rules['company_name'] = 'required|max:255'; + $rules['company_country_id'] = 'required|integer|min:1'; + } + + $data = [ + 'user' => $user, + ]; + + $validator = Validator::make(Input::all(), $rules); + + if ($validator->fails()) { + + // get the error messages from the validator + $messages = $validator->messages(); + // redirect our user back to the form with the errors from the validator + return view('user.edit', $data)->withErrors($validator); + + } else { + $this->userRepo->update(Input::all()); + + if($user->active == 0) { + $account = $user->account; + $account->data_protection = now(); + $account->save(); + + $user->active = 1; + $user->active_date = now(); + $user->save(); + } + + if(Input::get('accepted_active') == "on"){ + $user->agreement = now(); + }else{ + $user->agreement = null; + } + + + \Session()->flash('alert-save', true); + return redirect('/home'); + } + } + /** * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ public function userDataAcceptedForm(){ $user = Auth::user(); - if(Input::get('sender_accepted_infos') == "on"){ + if(Input::get('accepted_active') == "on"){ $user->agreement = now(); }else { $user->agreement = null; @@ -93,4 +154,59 @@ class UserDataController extends Controller return redirect('/home'); } + + /** + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function userDataFree(){ + $user = Auth::user(); + $user->active = 1; + $user->active_date = now(); + $user->save(); + return redirect('/home'); + + } + + /** + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function userDataFreeForm(){ + $user = Auth::user(); + + $rules = array( + 'accepted_data_protection' => 'required' + ); + + $data = [ + 'user' => $user, + ]; + $validator = Validator::make(Input::all(), $rules); + + if ($validator->fails()) { + // get the error messages from the validator + $messages = $validator->messages(); + // redirect our user back to the form with the errors from the validator + return view('home', $data)->withErrors($validator); + } else { + $account = $user->account; + $account->data_protection = now(); + $account->save(); + + if(Input::get('accepted_active') == "on"){ + $user->agreement = now(); + }else{ + $user->agreement = null; + } + + + + $user->active = 1; + $user->active_date = now(); + $user->save(); + + } + return redirect('/home'); + + } + } \ No newline at end of file diff --git a/app/Http/Controllers/UserShopController.php b/app/Http/Controllers/UserShopController.php new file mode 100755 index 0000000..c28764c --- /dev/null +++ b/app/Http/Controllers/UserShopController.php @@ -0,0 +1,273 @@ +middleware('auth'); + $this->userRepo = $userRepo; + } + + public function index() + { + $user = Auth::user(); + $data = [ + 'user' => $user, + ]; + return view('user.shop', $data); + + } + + public function store() + { + $user = Auth::user(); + $data = Input::all(); + + if(!$user->shop){ + abort(404); + } + + $user->shop->title = $data['title'];; + $user->shop->copy = $data['copy']; + $user->shop->info = $data['info']; + $user->shop->active = isset($data['active']) ? true : false; + $user->shop->save(); + \Session()->flash('alert-save', true); + + $data = [ + 'user' => $user, + ]; + return view('user.shop', $data); + + } + + + // Upload FILE ----------------------------------------------------------------------------------------------------------------------- + + public function uploadImage(){ + + $user = Auth::user(); + + if(!$user->shop){ + abort(404); + } + + try { + $image = \App\Services\Slim::getImages('images')[0]; + + if ( isset($image['output']['data']) ) + { + // Base64 of the image + $data = $image['output']['data']; + $file_ex = array( 'image/jpeg' => 'jpg', 'image/png' => 'png'); + + if (!isset($file_ex[$image['output']['type']])) { + \Session()->flash('alert-danger', 'File is not jpg or png!'); + return redirect(route('user_shop')); + } + + $ext = $file_ex[$image['output']['type']]; + // Original file name + $name = $image['output']['name']; + $name = \App\Services\Slim::sanitizeFileName($name); + $name = uniqid() . '_' . $name; + + $data = \Storage::disk('public')->put( + 'images/shop/'.$name, + $data + ); + + $user->shop->filename = $name; + $user->shop->originalname = $image['output']['name']; + $user->shop->ext = $ext; + $user->shop->mine = $image['output']['type']; + $user->shop->size = $image['input']['size']; + $user->shop->save(); + + + + \Session()->flash('alert-success', "Datei hochgeladen"); + return redirect(route('user_shop')); + } + \Session()->flash('alert-danger', "Datei leer"); + return redirect(route('user_shop')); + + } + catch (Exception $e) { + \Session()->flash('alert-danger', "Fehler".$e); + return redirect(route('user_shop')); + } + } + + public function deleteImage(){ + + $user = Auth::user(); + + if(!$user->shop){ + abort(404); + } + + if($user->shop->filename){ + $file = 'images/shop/'.$user->shop->filename; + \Storage::disk('public')->delete($file); + + $user->shop->filename = null; + $user->shop->originalname = null; + $user->shop->ext = null; + $user->shop->mine = null; + $user->shop->size = null; + $user->shop->save(); + + \Session()->flash('alert-success', "Datei gelöscht"); + return redirect(route('user_shop')); + + } + \Session()->flash('alert-danger', "Datei nicht gefunden"); + return redirect(route('user_shop')); + + } + + + + + /** + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function userShopRegisterForm(){ + + + if(Input::get('shop_submit') == 'check'){ + $rules = array( + 'user_shop_name' => ' required|alpha_dash|profanity|unique:user_shops,name|min:4|max:20|', + ); + $validator = Validator::make(Input::all(), $rules); + + if ($validator->fails()) { + \Session()->flash('shop-name-error', 'error'); + return redirect()->back()->withErrors($validator)->withInput(); + } + \Session()->flash('shop-name-error', 'check'); + return redirect(route('user_shop'))->withInput(); + } + + if(Input::get('shop_submit') == 'action') { + + $rules = array( + 'user_shop_name' => ' required|alpha_dash|profanity|unique:user_shops,name|min:4|max:20|', + ); + $validator = Validator::make(Input::all(), $rules); + + if ($validator->fails()) { + \Session()->flash('shop-name-error', 'error'); + }else{ + \Session()->flash('shop-name-error', 'check'); + + } + + $rules = array( + 'user_shop_active' => 'accepted', + ); + $validator = Validator::make(Input::all(), $rules); + if ($validator->fails()) { + return redirect()->back()->withErrors($validator)->withInput(); + } + + //all is right - save + $user = Auth::user(); + $data = Input::all(); + + $user_shop = UserShop::create([ + 'user_id' => $user->id, + 'name' => $data['user_shop_name'], + 'active' => true, + 'active_date' => now(), + ] + ); + + $ret = $this->userShopRegisterSubDomain($user_shop->slug); + if($ret['success'] === true){ + \Session()->flash('alert-save', true); + }else{ + $user_shop->forceDelete(); + \Session()->flash('alert-error', $ret['error']); + } + return redirect(route('user_shop')); + } + + } + + + public function userShopRegisterSubDomain($slug){ + + $kas = new KasController(); + $domain = 'mivita.care'; + //check if exisist + $subdomains = $kas->action('get_subdomains'); + foreach ($subdomains as $subdomain){ + $sub = str_replace(".".$domain, '', $subdomain['subdomain_name']); + if($sub == $slug){ + return ['success' => false, 'error' => 'Fehler: Subdomain existierts bereits, bitte einen neues Namen wählen']; + } + } + //add + $full_subdomain_name = $slug.".".$domain; + $pra = array( + 'subdomain_name' => $slug, + 'domain_name' => $domain, + 'subdomain_path' => '/mein.mivita.care/public/', + //'php_version' => '7.1', + //'ssl_proxy' => 'Y', + //'redirect_status' => 0 + ); + $add_subdomain = $kas->action('add_subdomain', $pra); + if($add_subdomain == $full_subdomain_name){ + return ['success' => true]; + } + return ['success' => false, 'error' => $add_subdomain]; + } + + + /** + * @return string to ajax + */ + public function checkUserShopName(){ + + $rules = array( + 'user_shop_name' => ' required|alpha_dash|profanity|unique:user_shops,name|min:4|max:20|', + ); + $validator = Validator::make(Input::all(), $rules); + + if ($validator->fails()) { + $messages = $validator->messages(); + + return Response::json(array( + 'success' => false, + 'errors' => $validator->getMessageBag()->toArray() + + )); + } + return Response::json(array( + 'success' => true, + )); + + } + + + + + +} \ No newline at end of file diff --git a/app/Http/Controllers/UserUpdateEmailController.php b/app/Http/Controllers/UserUpdateEmailController.php index e2316b3..fa829a0 100755 --- a/app/Http/Controllers/UserUpdateEmailController.php +++ b/app/Http/Controllers/UserUpdateEmailController.php @@ -70,9 +70,7 @@ class UserUpdateEmailController extends Controller } - /* - * - * public function adminChangeMail($user_id) + public function adminChangeMail($user_id) { if(!Auth::user()->isAdmin()){ abort(404); @@ -122,7 +120,7 @@ class UserUpdateEmailController extends Controller } } - */ + diff --git a/app/Http/Controllers/Web/SiteController.php b/app/Http/Controllers/Web/SiteController.php index 09e127f..3b52a03 100755 --- a/app/Http/Controllers/Web/SiteController.php +++ b/app/Http/Controllers/Web/SiteController.php @@ -74,9 +74,14 @@ class SiteController extends Controller } if($subsite){ + if(!view()->exists('web.templates.'.$subsite)){ + abort(404); + } return view('web.templates.'.$subsite); } - + if(!view()->exists('web.templates.'.$site)){ + abort(404); + } return view('web.templates.'.$site); } diff --git a/app/Mail/MailActivateUser.php b/app/Mail/MailActivateUser.php index 7835a62..aec60df 100644 --- a/app/Mail/MailActivateUser.php +++ b/app/Mail/MailActivateUser.php @@ -29,20 +29,23 @@ class MailActivateUser extends Mailable { $salutation = __('Dear customer').","; - /*if($this->user->account){ + if($this->user->account){ if($this->user->account->salutation == "mr"){ $salutation = __('Dear Sir')." ".$this->user->account->last_name.","; }else{ $salutation = __('Dear Mrs')." ".$this->user->account->last_name.","; } - }*/ + } return $this->view('emails.auth')->with([ 'url' => route('user_update_email_confirm', $this->token), 'salutation' => $salutation, 'button' => __('Change E-Mail'), 'copy1line' => __('Dear Customer you will receive this e-mail because we have received a request to change your E-Mail Address for your account.'), 'copy2line' => __('Or copy this link into the address bar of your browser.'), + 'copy3line' => __('For further questions we are happy to help you.'), 'greetings' => __('Best regards'), + 'sender' => __('your mivita.care team'), + ]); } } diff --git a/app/Mail/MailResetPassword.php b/app/Mail/MailResetPassword.php index 4e99adc..d62020a 100644 --- a/app/Mail/MailResetPassword.php +++ b/app/Mail/MailResetPassword.php @@ -28,20 +28,23 @@ class MailResetPassword extends Mailable public function build() { $salutation = __('Dear customer').","; - /*if($this->user->account){ + if($this->user->account){ if($this->user->account->salutation == "mr"){ $salutation = __('Dear Sir')." ".$this->user->account->last_name.","; }else{ $salutation = __('Dear Mrs')." ".$this->user->account->last_name.","; } - }*/ + } return $this->view('emails.auth')->with([ 'url' => route('password.reset', $this->token), 'salutation' => $salutation, 'button' => __('Reset Password'), 'copy1line' => __('Dear Customer you will receive this e-mail because we have received a request to reset the password for your account.'), 'copy2line' => __('Or copy this link into the address bar of your browser.'), + 'copy3line' => __('For further questions we are happy to help you.'), 'greetings' => __('Best regards'), + 'sender' => __('your mivita.care team'), + ]); } } diff --git a/app/Mail/MailVerifyAccount.php b/app/Mail/MailVerifyAccount.php index feae850..71f5c4f 100644 --- a/app/Mail/MailVerifyAccount.php +++ b/app/Mail/MailVerifyAccount.php @@ -28,13 +28,13 @@ class MailVerifyAccount extends Mailable public function build() { $salutation = __('Dear customer').","; - /*if($this->user->account){ + if($this->user->account){ if($this->user->account->salutation == "mr"){ $salutation = __('Dear Sir')." ".$this->user->account->last_name.","; }else{ $salutation = __('Dear Mrs')." ".$this->user->account->last_name.","; } - }*/ + } return $this->view('emails.auth')->with([ 'url' => route('register_verify', $this->confirmation_code), @@ -42,7 +42,10 @@ class MailVerifyAccount extends Mailable 'button' => __('Verify Your Email Address'), 'copy1line' => __('Thank you for creating an account with the JACKON Infomanager. Please follow the link below to confirm your email address.'), 'copy2line' => __('Or copy this link into the address bar of your browser.'), + 'copy3line' => __('For further questions we are happy to help you.'), 'greetings' => __('Best regards'), + 'sender' => __('your mivita.care team'), + ]); } } diff --git a/app/Mail/MailVerifyContact.php b/app/Mail/MailVerifyContact.php index 406d50a..4f94c16 100644 --- a/app/Mail/MailVerifyContact.php +++ b/app/Mail/MailVerifyContact.php @@ -28,13 +28,13 @@ class MailVerifyContact extends Mailable public function build() { $salutation = __('Dear customer').","; - /*if($this->user->account){ + if($this->user->account){ if($this->user->account->salutation == "mr"){ $salutation = __('Dear Sir')." ".$this->user->account->last_name.","; }else{ $salutation = __('Dear Mrs')." ".$this->user->account->last_name.","; } - }*/ + } return $this->view('emails.auth')->with([ 'url' => route('register_verify', $this->confirmation_code), @@ -42,7 +42,10 @@ class MailVerifyContact extends Mailable 'button' => __('Verify your Data and E-Mail Address'), 'copy1line' => __('We have data about you stored in our JACKON Infomanager. Please follow the link below to verify your email address.You can also change or delete your data.'), 'copy2line' => __('Or copy this link into the address bar of your browser.'), + 'copy3line' => __('For further questions we are happy to help you.'), 'greetings' => __('Best regards'), + 'sender' => __('your mivita.care team'), + ]); } diff --git a/app/Models/Account.php b/app/Models/Account.php deleted file mode 100644 index 8b4204f..0000000 --- a/app/Models/Account.php +++ /dev/null @@ -1,134 +0,0 @@ -belongsTo('App\User'); - } - - - public function company_country() - { - return $this->belongsTo('App\Models\Country', 'company_country_id'); - } - - public function country() - { - return $this->belongsTo('App\Models\Country', 'country_id'); - } - - public function company_pre_phone() - { - return $this->belongsTo('App\Models\Country', 'company_pre_phone_id'); - } - - public function pre_phone() - { - return $this->belongsTo('App\Models\Country', 'pre_phone_id'); - } - - public function pre_mobil() - { - return $this->belongsTo('App\Models\Country', 'pre_mobil_id'); - } - - public function getCompanyAttribute(){ - - if(empty($this->attributes['company']) && @$this->attributes['company'] !== 0){ - return 1; - } - return $this->attributes['company']; - } -} diff --git a/app/Models/Attribute.php b/app/Models/Attribute.php index e48b9ba..2bd31ba 100644 --- a/app/Models/Attribute.php +++ b/app/Models/Attribute.php @@ -28,6 +28,9 @@ use Illuminate\Database\Eloquent\Model; * @mixin \Eloquent * @property string|null $slug * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute whereSlug($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute query() */ class Attribute extends Model { diff --git a/app/Models/Category.php b/app/Models/Category.php index ee2a41a..5ca8985 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -31,6 +31,9 @@ use Cviebrock\EloquentSluggable\Sluggable; * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProductCategory[] $product_categories * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category findSimilarSlugs($attribute, $config, $slug) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category whereSlug($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category query() */ class Category extends Model { diff --git a/app/Models/Country.php b/app/Models/Country.php index 4be0374..6d23886 100644 --- a/app/Models/Country.php +++ b/app/Models/Country.php @@ -27,6 +27,9 @@ use PHPUnit\Framework\Constraint\Count; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country wherePhone($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereRu($value) * @mixin \Eloquent + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country query() */ class Country extends Model { diff --git a/app/Models/Product.php b/app/Models/Product.php index f09f046..e7f8606 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -74,6 +74,9 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property string|null $slug * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product findSimilarSlugs($attribute, $config, $slug) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereSlug($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product query() */ class Product extends Model { @@ -134,34 +137,6 @@ class Product extends Model return $this->hasMany('App\Models\ProductImage', 'product_id', 'id'); } - /* - public function isImageAfter(){ - if(empty($this->attributes['filename_after']) || @$this->attributes['filename_after'] == null || @$this->attributes['filename_after'] == ""){ - return false; - } - if(!\Storage::disk('public')->has('images/'.$this->id.'/'.$this->filename_after)){ - return false; - } - return true; - } - - - public function getImage($file){ - - if($file == "before" && $this->isImageBefore()){ - $link = 'images/'.$this->id.'/'.$this->filename_before; - return '/storage/'.$link.'?=lm='.\Storage::disk('public')->lastModified($link); - } - - if($file == "after" && $this->isImageAfter()){ - $link = 'images/'.$this->id.'/'.$this->filename_after; - return '/storage/'.$link.'?=lm='.\Storage::disk('public')->lastModified($link); - - } - return false; - } - */ - public function _format_number($value){ diff --git a/app/Models/ProductAttribute.php b/app/Models/ProductAttribute.php index 74926d0..a94b36c 100644 --- a/app/Models/ProductAttribute.php +++ b/app/Models/ProductAttribute.php @@ -20,6 +20,9 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute whereProductId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute whereUpdatedAt($value) * @mixin \Eloquent + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute query() */ class ProductAttribute extends Model { diff --git a/app/Models/ProductCategory.php b/app/Models/ProductCategory.php index 5ccf684..edeebeb 100644 --- a/app/Models/ProductCategory.php +++ b/app/Models/ProductCategory.php @@ -20,6 +20,9 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory whereProductId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory whereUpdatedAt($value) * @mixin \Eloquent + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory query() */ class ProductCategory extends Model { diff --git a/app/Models/ProductImage.php b/app/Models/ProductImage.php index d9cfa5b..19e9da8 100644 --- a/app/Models/ProductImage.php +++ b/app/Models/ProductImage.php @@ -33,6 +33,9 @@ use Illuminate\Database\Eloquent\Model; * @property string|null $slug * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage findSimilarSlugs($attribute, $config, $slug) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage whereSlug($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage query() */ class ProductImage extends Model { diff --git a/app/Models/UserAccount.php b/app/Models/UserAccount.php new file mode 100644 index 0000000..46b6015 --- /dev/null +++ b/app/Models/UserAccount.php @@ -0,0 +1,96 @@ +hasOne('App\User', 'account_id'); + } + + + public function company_country() + { + return $this->belongsTo('App\Models\Country', 'company_country_id'); + } + + public function country() + { + return $this->belongsTo('App\Models\Country', 'country_id'); + } + + public function company_pre_phone() + { + return $this->belongsTo('App\Models\Country', 'company_pre_phone_id'); + } + + public function pre_phone() + { + return $this->belongsTo('App\Models\Country', 'pre_phone_id'); + } + + public function pre_mobil() + { + return $this->belongsTo('App\Models\Country', 'pre_mobil_id'); + } + + public function getCompanyAttribute(){ + + if(empty($this->attributes['company']) && @$this->attributes['company'] !== 0){ + return 1; + } + return $this->attributes['company']; + } + + public function getBirthdayAttribute($value) + { + if(!$value){ + return ""; + } + return Carbon::parse($value)->format(\Util::formatDateDB()); + } + + + public function setBirthdayAttribute( $value ) { + $this->attributes['birthday'] = (new Carbon($value))->format('Y-m-d'); + } + + public function getDataProtectionFormat(){ + if(!$this->attributes['data_protection']){ return ""; } + return Carbon::parse($this->attributes['data_protection'])->format(\Util::formatDateTimeDB()); + } +} diff --git a/app/Models/UserShop.php b/app/Models/UserShop.php new file mode 100644 index 0000000..8086d4f --- /dev/null +++ b/app/Models/UserShop.php @@ -0,0 +1,98 @@ + 'array', + 'trans_copy' => 'array', + 'trans_info' => 'array', + 'featured' => 'array', + + ]; + + protected $fillable = [ + 'user_id', 'name', 'active', 'active_date', + ]; + + use SoftDeletes; + protected $dates = ['deleted_at']; + + use Sluggable; + public function sluggable() + { + return [ + 'slug' => [ + 'source' => 'name' + ] + ]; + } + public function user() + { + return $this->belongsTo('App\User', 'user_id'); + } + + public function getActiveDateFormat(){ + if(!$this->attributes['active_date']){ return ""; } + return Carbon::parse($this->attributes['active_date'])->format(\Util::formatDateTimeDB()); + } + + + public function getSubdomain() + { + return config('app.protocol').$this->attributes['slug'].".".config('app.domain'); + } + + public function getSubdomainStatus() + { + if($this->is_online != NULL){ + return $this->is_online; + } + + $kas = new KasController(); + $domain = 'mivita.care'; + $pra = array( + 'subdomain_name' => $this->attributes['slug'].".".$domain, + 'domain_name' => $this->attributes['slug'].".".$domain, + ); + + //check if exisist + $subdomain = $kas->action('get_subdomains', $pra); + if(!empty($subdomain[0]['is_active']) && $subdomain[0]['is_active'] == 'Y'){ + $this->is_online = true; + return true; + } + $this->is_online = false; + return false; + } + + + + public function isImage(){ + if(empty($this->attributes['filename']) || @$this->attributes['filename'] == null || @$this->attributes['filename'] == ""){ + return false; + } + if(!\Storage::disk('public')->has('images/shop/'.$this->filename)){ + return false; + } + return true; + } + + public function getImage(){ + if($this->isImage()){ + $link = 'images/shop/'.$this->filename; + return '/storage/'.$link.'?=lm='.\Storage::disk('public')->lastModified($link); + } + return false; + } +} \ No newline at end of file diff --git a/app/Models/UserUpdateEmail.php b/app/Models/UserUpdateEmail.php index 5fba6bf..ddb524a 100644 --- a/app/Models/UserUpdateEmail.php +++ b/app/Models/UserUpdateEmail.php @@ -9,10 +9,13 @@ use Illuminate\Database\Eloquent\Model; * * @property-read \App\User $user * @mixin \Eloquent + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail query() */ class UserUpdateEmail extends Model { - protected $table = 'users_update_email'; + protected $table = 'user_update_emails'; protected $fillable = [ 'user_id', 'email', 'token', diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php index cdd2c10..afe1fc0 100644 --- a/app/Repositories/UserRepository.php +++ b/app/Repositories/UserRepository.php @@ -2,6 +2,7 @@ namespace App\Repositories; +use App\Models\UserAccount; use App\User; @@ -14,10 +15,7 @@ class UserRepository extends BaseRepository { } - /** - * refresh. - */ - /*public function update($data) + public function update($data) { if($data['user_id'] == "new"){ @@ -40,17 +38,15 @@ class UserRepository extends BaseRepository { $account->company = $data['company']; $account->company_name = $data['company_name']; + $account->company_street = $data['company_street']; $account->company_postal_code = $data['company_postal_code']; $account->company_city = $data['company_city']; $account->company_country_id = isset($data['company_country_id']) ? $data['company_country_id'] : null; - $account->company_pre_phone_id = isset($data['company_pre_phone_id']) ? $data['company_pre_phone_id']: null; $account->company_phone = $data['company_phone']; $account->company_homepage = $data['company_homepage']; - - $account->position_text = $data['position_text']; $account->salutation = $data['salutation']; $account->title = $data['title']; $account->first_name = $data['first_name']; @@ -67,7 +63,11 @@ class UserRepository extends BaseRepository { $account->pre_mobil_id = isset($data['pre_mobil_id']) ? $data['pre_mobil_id']: null; $account->mobil = $data['mobil']; - $account->contactpartner = $data['contactpartner']; + $account->birthday = $data['birthday']; + $account->website = $data['website']; + $account->instagram = $data['instagram']; + $account->facebook = $data['facebook']; + $account->facebook_fanpage = $data['facebook_fanpage']; //data_protection //active_date @@ -79,14 +79,9 @@ class UserRepository extends BaseRepository { $this->model->save(); } - $this->updateInterests(isset($data['interests']) ? $data['interests'] : array()); - $this->updateIndustrySector(isset($data['industry_sectors']) ? $data['industry_sectors'] : array()); - return; } - */ - public function deleteUser(User $user) { if($user->account){ diff --git a/app/Services/HTMLHelper.php b/app/Services/HTMLHelper.php index 39d69c6..64e7f56 100644 --- a/app/Services/HTMLHelper.php +++ b/app/Services/HTMLHelper.php @@ -3,6 +3,7 @@ namespace App\Services; use App\Models\Attribute; use App\Models\Category; +use App\Models\Country; class HTMLHelper { @@ -134,7 +135,7 @@ class HTMLHelper } - /* public static function getCompanyOptions($company){ + public static function getCompanyOptions($company){ $options = array(1 => __('business'), 0 => __('private'), ); $ret = ""; foreach ($options as $id => $value){ @@ -143,21 +144,6 @@ class HTMLHelper } return $ret; } - public static function getIndustrySectorsWithoutParents($id = false, $sameId = false, $all = true){ - $values = IndustrySector::where('parent_id', null)->get(); - $ret = ""; - if($all){ - $ret .= '\n'; - } - foreach ($values as $value){ - if($sameId == $value->id){ - continue; - } - $attr = ($value->id == $id) ? 'selected="selected"' : ''; - $ret .= '\n'; - } - return $ret; - } public static function getContriesWithMore($id, $all=true){# $values = Country::all(); @@ -219,5 +205,27 @@ class HTMLHelper $values = array('mr' => __('MR'), 'ms' => __('MS')); return (!empty($values[$id]) ? $values[$id] : ''); } + + /*public static function getIndustrySectorsWithoutParents($id = false, $sameId = false, $all = true){ + $values = IndustrySector::where('parent_id', null)->get(); + $ret = ""; + if($all){ + $ret .= '\n'; + } + foreach ($values as $value){ + if($sameId == $value->id){ + continue; + } + $attr = ($value->id == $id) ? 'selected="selected"' : ''; + $ret .= '\n'; + } + return $ret; + } + + + + + + */ } \ No newline at end of file diff --git a/app/Services/Slim.php b/app/Services/Slim.php index 9cf5841..79b0faf 100644 --- a/app/Services/Slim.php +++ b/app/Services/Slim.php @@ -206,6 +206,9 @@ class Slim { $str = preg_replace('([^\w\s\d\-_~,;\[\]\(\).])', '', $str); // Remove any runs of periods $str = preg_replace('([\.]{2,})', '', $str); + + $str = (strlen($str) > 33) ? substr($str,-33) : $str; + return $str; } diff --git a/app/User.php b/app/User.php index c7f5ba7..4387f02 100755 --- a/app/User.php +++ b/app/User.php @@ -64,6 +64,11 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereNotes($value) * @method static \Illuminate\Database\Query\Builder|\App\User withTrashed() * @method static \Illuminate\Database\Query\Builder|\App\User withoutTrashed() + * @property int|null $account_id + * @method static \Illuminate\Database\Eloquent\Builder|\App\User newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\User newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\User query() + * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereAccountId($value) */ class User extends Authenticatable { @@ -94,11 +99,17 @@ class User extends Authenticatable ]; - public function account() + public function account() { - return $this->hasOne('App\Models\Account'); + return $this->belongsTo('App\Models\UserAccount', 'account_id'); } + public function shop() + { + return $this->hasOne('App\Models\UserShop', 'user_id', 'id'); + } + + /** * @return \Illuminate\Database\Eloquent\Relations\HasMany */ @@ -182,7 +193,7 @@ class User extends Authenticatable return 'de'; } } - return "en"; + return "de"; } /** diff --git a/bootstrap/cache/packages.php b/bootstrap/cache/packages.php index 659e107..d1b72a8 100644 --- a/bootstrap/cache/packages.php +++ b/bootstrap/cache/packages.php @@ -1,4 +1,11 @@ + array ( + 'providers' => + array ( + 0 => 'Askedio\\Laravel5ProfanityFilter\\Providers\\ProfanityFilterServiceProvider', + ), + ), 'barryvdh/laravel-ide-helper' => array ( 'providers' => diff --git a/bootstrap/cache/services.php b/bootstrap/cache/services.php index 0421810..3dfd5f6 100644 --- a/bootstrap/cache/services.php +++ b/bootstrap/cache/services.php @@ -23,31 +23,32 @@ 19 => 'Illuminate\\Translation\\TranslationServiceProvider', 20 => 'Illuminate\\Validation\\ValidationServiceProvider', 21 => 'Illuminate\\View\\ViewServiceProvider', - 22 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', - 23 => 'Cviebrock\\EloquentSluggable\\ServiceProvider', - 24 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider', - 25 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider', - 26 => 'Intervention\\Image\\ImageServiceProvider', - 27 => 'Jenssegers\\Date\\DateServiceProvider', - 28 => 'Laracasts\\Flash\\FlashServiceProvider', - 29 => 'Laravel\\Tinker\\TinkerServiceProvider', - 30 => 'Collective\\Html\\HtmlServiceProvider', - 31 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 32 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', - 33 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 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 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 35 => 'Laravel\\Tinker\\TinkerServiceProvider', - 36 => 'App\\Providers\\AppServiceProvider', - 37 => 'App\\Providers\\AuthServiceProvider', - 38 => 'App\\Providers\\EventServiceProvider', - 39 => 'App\\Providers\\RouteServiceProvider', - 40 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', - 41 => 'Jenssegers\\Date\\DateServiceProvider', - 42 => 'Collective\\Html\\HtmlServiceProvider', - 43 => 'Intervention\\Image\\ImageServiceProvider', - 44 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 45 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 46 => 'App\\Providers\\YardServiceProvider', + 35 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 36 => 'Laravel\\Tinker\\TinkerServiceProvider', + 37 => 'App\\Providers\\AppServiceProvider', + 38 => 'App\\Providers\\AuthServiceProvider', + 39 => 'App\\Providers\\EventServiceProvider', + 40 => 'App\\Providers\\RouteServiceProvider', + 41 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', + 42 => 'Jenssegers\\Date\\DateServiceProvider', + 43 => 'Collective\\Html\\HtmlServiceProvider', + 44 => 'Intervention\\Image\\ImageServiceProvider', + 45 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 46 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 47 => 'App\\Providers\\YardServiceProvider', ), 'eager' => array ( @@ -61,24 +62,25 @@ 7 => 'Illuminate\\Pagination\\PaginationServiceProvider', 8 => 'Illuminate\\Session\\SessionServiceProvider', 9 => 'Illuminate\\View\\ViewServiceProvider', - 10 => 'Cviebrock\\EloquentSluggable\\ServiceProvider', - 11 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider', - 12 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider', - 13 => 'Intervention\\Image\\ImageServiceProvider', - 14 => 'Jenssegers\\Date\\DateServiceProvider', - 15 => 'Laracasts\\Flash\\FlashServiceProvider', - 16 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 17 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 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', + 19 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 20 => 'App\\Providers\\AppServiceProvider', + 21 => 'App\\Providers\\AuthServiceProvider', + 22 => 'App\\Providers\\EventServiceProvider', + 23 => 'App\\Providers\\RouteServiceProvider', + 24 => 'Jenssegers\\Date\\DateServiceProvider', + 25 => 'Intervention\\Image\\ImageServiceProvider', + 26 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 27 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 28 => 'App\\Providers\\YardServiceProvider', ), 'deferred' => array ( diff --git a/composer.json b/composer.json index ac68f3f..efba721 100755 --- a/composer.json +++ b/composer.json @@ -6,6 +6,7 @@ "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", diff --git a/composer.lock b/composer.lock index 167d40f..399064e 100755 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,54 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "412db16529e0d589f01459505bfbbef2", + "content-hash": "6b338b3c21946c3ba6b8ac3ac7ff7c98", "packages": [ + { + "name": "askedio/laravel5-profanity-filter", + "version": "1.10", + "source": { + "type": "git", + "url": "https://github.com/Askedio/laravel-profanity-filter.git", + "reference": "34bec8cd92e998015e73a90d888ef981b0ed749a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Askedio/laravel-profanity-filter/zipball/34bec8cd92e998015e73a90d888ef981b0ed749a", + "reference": "34bec8cd92e998015e73a90d888ef981b0ed749a", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "require-dev": { + "laravel/laravel": "5.*", + "phpunit/phpunit": "~5.0", + "symfony/css-selector": "3.1.*", + "symfony/dom-crawler": "3.1.*" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Askedio\\Laravel5ProfanityFilter\\Providers\\ProfanityFilterServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Askedio\\Laravel5ProfanityFilter\\": "app/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "AGPL-3.0" + ], + "description": "A Vendor Package Example", + "keywords": [ + "laravel" + ], + "time": "2018-10-19T16:07:02+00:00" + }, { "name": "cocur/slugify", "version": "v3.1", @@ -244,16 +290,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.8.0", + "version": "v2.9.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "5140a64c08b4b607b9bedaae0cedd26f04a0e621" + "reference": "ec74d6e300d78fbc896669c3ca57ef9719adc9c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/5140a64c08b4b607b9bedaae0cedd26f04a0e621", - "reference": "5140a64c08b4b607b9bedaae0cedd26f04a0e621", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/ec74d6e300d78fbc896669c3ca57ef9719adc9c6", + "reference": "ec74d6e300d78fbc896669c3ca57ef9719adc9c6", "shasum": "" }, "require": { @@ -263,11 +309,10 @@ "php": "^7.1" }, "require-dev": { - "doctrine/coding-standard": "^4.0", + "doctrine/coding-standard": "^5.0", "jetbrains/phpstorm-stubs": "^2018.1.2", "phpstan/phpstan": "^0.10.1", - "phpunit/phpunit": "^7.1.2", - "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5", + "phpunit/phpunit": "^7.4", "symfony/console": "^2.0.5|^3.0|^4.0", "symfony/phpunit-bridge": "^3.4.5|^4.0.5" }, @@ -280,13 +325,13 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8.x-dev", + "dev-master": "2.9.x-dev", "dev-develop": "3.0.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\DBAL\\": "lib/" + "psr-4": { + "Doctrine\\DBAL\\": "lib/Doctrine/DBAL" } }, "notification-url": "https://packagist.org/downloads/", @@ -311,15 +356,19 @@ "email": "jonwage@gmail.com" } ], - "description": "Database Abstraction Layer", - "homepage": "http://www.doctrine-project.org", + "description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.", + "homepage": "https://www.doctrine-project.org/projects/dbal.html", "keywords": [ + "abstraction", "database", "dbal", + "mysql", "persistence", + "pgsql", + "php", "queryobject" ], - "time": "2018-07-13T03:16:35+00:00" + "time": "2018-12-14T04:51:13+00:00" }, { "name": "doctrine/event-manager", @@ -567,16 +616,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.6", + "version": "2.1.7", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "0578b32b30b22de3e8664f797cf846fc9246f786" + "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0578b32b30b22de3e8664f797cf846fc9246f786", - "reference": "0578b32b30b22de3e8664f797cf846fc9246f786", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/709f21f92707308cdf8f9bcfa1af4cb26586521e", + "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e", "shasum": "" }, "require": { @@ -620,7 +669,7 @@ "validation", "validator" ], - "time": "2018-09-25T20:47:26+00:00" + "time": "2018-12-04T22:38:24+00:00" }, { "name": "erusev/parsedown", @@ -900,32 +949,33 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.4.2", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" + "reference": "9f83dded91781a01c63574e387eaa769be769115" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115", + "reference": "9f83dded91781a01c63574e387eaa769be769115", "shasum": "" }, "require": { "php": ">=5.4.0", - "psr/http-message": "~1.0" + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5" }, "provide": { "psr/http-message-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -955,13 +1005,14 @@ "keywords": [ "http", "message", + "psr-7", "request", "response", "stream", "uri", "url" ], - "time": "2017-03-20T17:10:46+00:00" + "time": "2018-12-04T20:46:45+00:00" }, { "name": "intervention/image", @@ -1077,33 +1128,34 @@ }, { "name": "jakub-onderka/php-console-highlighter", - "version": "v0.3.2", + "version": "v0.4", "source": { "type": "git", "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git", - "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5" + "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5", - "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5", + "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547", + "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547", "shasum": "" }, "require": { - "jakub-onderka/php-console-color": "~0.1", - "php": ">=5.3.0" + "ext-tokenizer": "*", + "jakub-onderka/php-console-color": "~0.2", + "php": ">=5.4.0" }, "require-dev": { "jakub-onderka/php-code-style": "~1.0", - "jakub-onderka/php-parallel-lint": "~0.5", + "jakub-onderka/php-parallel-lint": "~1.0", "jakub-onderka/php-var-dump-check": "~0.1", "phpunit/phpunit": "~4.0", "squizlabs/php_codesniffer": "~1.5" }, "type": "library", "autoload": { - "psr-0": { - "JakubOnderka\\PhpConsoleHighlighter": "src/" + "psr-4": { + "JakubOnderka\\PhpConsoleHighlighter\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1117,7 +1169,8 @@ "homepage": "http://www.acci.cz/" } ], - "time": "2015-04-20T18:58:01+00:00" + "description": "Highlight PHP code in terminal", + "time": "2018-09-29T18:48:56+00:00" }, { "name": "jenssegers/date", @@ -1568,16 +1621,16 @@ }, { "name": "league/flysystem", - "version": "1.0.48", + "version": "1.0.49", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa" + "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a6ded5b2f6055e2db97b4b859fdfca2b952b78aa", - "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a63cc83d8a931b271be45148fa39ba7156782ffd", + "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd", "shasum": "" }, "require": { @@ -1648,7 +1701,7 @@ "sftp", "storage" ], - "time": "2018-10-15T13:53:10+00:00" + "time": "2018-11-23T23:41:29+00:00" }, { "name": "maatwebsite/excel", @@ -1730,16 +1783,16 @@ }, { "name": "monolog/monolog", - "version": "1.23.0", + "version": "1.24.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4" + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", "shasum": "" }, "require": { @@ -1804,7 +1857,7 @@ "logging", "psr-3" ], - "time": "2017-06-19T01:22:40+00:00" + "time": "2018-11-05T09:00:11+00:00" }, { "name": "nesbot/carbon", @@ -1957,22 +2010,26 @@ }, { "name": "phpoffice/phpexcel", - "version": "1.8.1", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/PHPOffice/PHPExcel.git", - "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32" + "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/372c7cbb695a6f6f1e62649381aeaa37e7e70b32", - "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32", + "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/1441011fb7ecdd8cc689878f54f8b58a6805f870", + "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870", "shasum": "" }, "require": { + "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "php": ">=5.2.0" + "php": "^5.2|^7.0" + }, + "require-dev": { + "squizlabs/php_codesniffer": "2.*" }, "type": "library", "autoload": { @@ -1982,7 +2039,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL" + "LGPL-2.1" ], "authors": [ { @@ -1990,18 +2047,19 @@ "homepage": "http://blog.maartenballiauw.be" }, { - "name": "Mark Baker" + "name": "Erik Tilt" }, { "name": "Franck Lefevre", - "homepage": "http://blog.rootslabs.net" + "homepage": "http://rootslabs.net" }, { - "name": "Erik Tilt" + "name": "Mark Baker", + "homepage": "http://markbakeruk.net" } ], "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine", - "homepage": "http://phpexcel.codeplex.com", + "homepage": "https://github.com/PHPOffice/PHPExcel", "keywords": [ "OpenXML", "excel", @@ -2011,7 +2069,7 @@ "xlsx" ], "abandoned": "phpoffice/phpspreadsheet", - "time": "2015-05-01T07:00:55+00:00" + "time": "2018-11-22T23:07:24+00:00" }, { "name": "psr/container", @@ -2114,16 +2172,16 @@ }, { "name": "psr/log", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "shasum": "" }, "require": { @@ -2157,7 +2215,7 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2018-11-20T15:27:04+00:00" }, { "name": "psr/simple-cache", @@ -2281,6 +2339,46 @@ ], "time": "2018-10-13T15:16:03+00:00" }, + { + "name": "ralouphie/getallheaders", + "version": "2.0.5", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa", + "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "require-dev": { + "phpunit/phpunit": "~3.7.0", + "satooshi/php-coveralls": ">=1.0" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "time": "2016-02-11T07:05:27+00:00" + }, { "name": "ramsey/uuid", "version": "3.8.0", @@ -2424,20 +2522,21 @@ }, { "name": "symfony/console", - "version": "v4.1.6", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b" + "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/dc7122fe5f6113cfaba3b3de575d31112c9aa60b", - "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b", + "url": "https://api.github.com/repos/symfony/console/zipball/4dff24e5d01e713818805c1862d2e3f901ee7dd0", + "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0", "shasum": "" }, "require": { "php": "^7.1.3", + "symfony/contracts": "^1.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -2461,7 +2560,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2488,20 +2587,88 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-10-03T08:15:46+00:00" + "time": "2018-11-27T07:40:44+00:00" }, { - "name": "symfony/css-selector", - "version": "v4.1.6", + "name": "symfony/contracts", + "version": "v1.0.2", "source": { "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a" + "url": "https://github.com/symfony/contracts.git", + "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/d67de79a70a27d93c92c47f37ece958bf8de4d8a", - "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a", + "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf", + "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "require-dev": { + "psr/cache": "^1.0", + "psr/container": "^1.0" + }, + "suggest": { + "psr/cache": "When using the Cache contracts", + "psr/container": "When using the Service contracts", + "symfony/cache-contracts-implementation": "", + "symfony/service-contracts-implementation": "", + "symfony/translation-contracts-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\": "" + }, + "exclude-from-classmap": [ + "**/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A set of abstractions extracted out of the Symfony components", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2018-12-05T08:06:11+00:00" + }, + { + "name": "symfony/css-selector", + "version": "v4.2.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/css-selector.git", + "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/aa9fa526ba1b2ec087ffdfb32753803d999fcfcd", + "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd", "shasum": "" }, "require": { @@ -2510,7 +2677,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2541,20 +2708,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-10-02T16:36:10+00:00" + "time": "2018-11-11T19:52:12+00:00" }, { "name": "symfony/debug", - "version": "v4.1.6", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "e3f76ce6198f81994e019bb2b4e533e9de1b9b90" + "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/e3f76ce6198f81994e019bb2b4e533e9de1b9b90", - "reference": "e3f76ce6198f81994e019bb2b4e533e9de1b9b90", + "url": "https://api.github.com/repos/symfony/debug/zipball/e0a2b92ee0b5b934f973d90c2f58e18af109d276", + "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276", "shasum": "" }, "require": { @@ -2570,7 +2737,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2597,24 +2764,25 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-10-02T16:36:10+00:00" + "time": "2018-11-28T18:24:18+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.1.6", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e" + "reference": "921f49c3158a276d27c0d770a5a347a3b718b328" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bfb30c2ad377615a463ebbc875eba64a99f6aa3e", - "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/921f49c3158a276d27c0d770a5a347a3b718b328", + "reference": "921f49c3158a276d27c0d770a5a347a3b718b328", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3", + "symfony/contracts": "^1.0" }, "conflict": { "symfony/dependency-injection": "<3.4" @@ -2633,7 +2801,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2660,20 +2828,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-07-26T09:10:45+00:00" + "time": "2018-12-01T08:52:38+00:00" }, { "name": "symfony/finder", - "version": "v4.1.6", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "1f17195b44543017a9c9b2d437c670627e96ad06" + "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/1f17195b44543017a9c9b2d437c670627e96ad06", - "reference": "1f17195b44543017a9c9b2d437c670627e96ad06", + "url": "https://api.github.com/repos/symfony/finder/zipball/e53d477d7b5c4982d0e1bfd2298dbee63d01441d", + "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d", "shasum": "" }, "require": { @@ -2682,7 +2850,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2709,20 +2877,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-10-03T08:47:56+00:00" + "time": "2018-11-11T19:52:12+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.1.6", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "d528136617ff24f530e70df9605acc1b788b08d4" + "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d528136617ff24f530e70df9605acc1b788b08d4", - "reference": "d528136617ff24f530e70df9605acc1b788b08d4", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1b31f3017fadd8cb05cf2c8aebdbf3b12a943851", + "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851", "shasum": "" }, "require": { @@ -2736,7 +2904,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2763,25 +2931,26 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-10-03T08:48:45+00:00" + "time": "2018-11-26T10:55:26+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.1.6", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "f5e7c15a5d010be0e16ce798594c5960451d4220" + "reference": "b39ceffc0388232c309cbde3a7c3685f2ec0a624" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f5e7c15a5d010be0e16ce798594c5960451d4220", - "reference": "f5e7c15a5d010be0e16ce798594c5960451d4220", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b39ceffc0388232c309cbde3a7c3685f2ec0a624", + "reference": "b39ceffc0388232c309cbde3a7c3685f2ec0a624", "shasum": "" }, "require": { "php": "^7.1.3", "psr/log": "~1.0", + "symfony/contracts": "^1.0.2", "symfony/debug": "~3.4|~4.0", "symfony/event-dispatcher": "~4.1", "symfony/http-foundation": "^4.1.1", @@ -2789,7 +2958,8 @@ }, "conflict": { "symfony/config": "<3.4", - "symfony/dependency-injection": "<4.1", + "symfony/dependency-injection": "<4.2", + "symfony/translation": "<4.2", "symfony/var-dumper": "<4.1.1", "twig/twig": "<1.34|<2.4,>=2" }, @@ -2802,7 +2972,7 @@ "symfony/config": "~3.4|~4.0", "symfony/console": "~3.4|~4.0", "symfony/css-selector": "~3.4|~4.0", - "symfony/dependency-injection": "^4.1", + "symfony/dependency-injection": "^4.2", "symfony/dom-crawler": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0", @@ -2810,7 +2980,7 @@ "symfony/routing": "~3.4|~4.0", "symfony/stopwatch": "~3.4|~4.0", "symfony/templating": "~3.4|~4.0", - "symfony/translation": "~3.4|~4.0", + "symfony/translation": "~4.2", "symfony/var-dumper": "^4.1.1" }, "suggest": { @@ -2823,7 +2993,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2850,11 +3020,11 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-10-03T12:53:38+00:00" + "time": "2018-12-06T17:39:52+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -2912,16 +3082,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" + "reference": "c79c051f5b3a46be09205c73b80b346e4153e494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494", + "reference": "c79c051f5b3a46be09205c73b80b346e4153e494", "shasum": "" }, "require": { @@ -2967,20 +3137,20 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-21T13:07:52+00:00" }, { "name": "symfony/polyfill-php56", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "7b4fc009172cc0196535b0328bd1226284a28000" + "reference": "ff208829fe1aa48ab9af356992bb7199fed551af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/7b4fc009172cc0196535b0328bd1226284a28000", - "reference": "7b4fc009172cc0196535b0328bd1226284a28000", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ff208829fe1aa48ab9af356992bb7199fed551af", + "reference": "ff208829fe1aa48ab9af356992bb7199fed551af", "shasum": "" }, "require": { @@ -3023,20 +3193,20 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-21T06:26:08+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae" + "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/95c50420b0baed23852452a7f0c7b527303ed5ae", - "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631", + "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631", "shasum": "" }, "require": { @@ -3078,20 +3248,20 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-21T13:07:52+00:00" }, { "name": "symfony/polyfill-util", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "8e15d04ba3440984d23e7964b2ee1d25c8de1581" + "reference": "3b58903eae668d348a7126f999b0da0f2f93611c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8e15d04ba3440984d23e7964b2ee1d25c8de1581", - "reference": "8e15d04ba3440984d23e7964b2ee1d25c8de1581", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/3b58903eae668d348a7126f999b0da0f2f93611c", + "reference": "3b58903eae668d348a7126f999b0da0f2f93611c", "shasum": "" }, "require": { @@ -3130,20 +3300,20 @@ "polyfill", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-30T16:36:12+00:00" }, { "name": "symfony/process", - "version": "v4.1.6", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "ee33c0322a8fee0855afcc11fff81e6b1011b529" + "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/ee33c0322a8fee0855afcc11fff81e6b1011b529", - "reference": "ee33c0322a8fee0855afcc11fff81e6b1011b529", + "url": "https://api.github.com/repos/symfony/process/zipball/2b341009ccec76837a7f46f59641b431e4d4c2b0", + "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0", "shasum": "" }, "require": { @@ -3152,7 +3322,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3179,34 +3349,34 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-10-02T12:40:59+00:00" + "time": "2018-11-20T16:22:05+00:00" }, { "name": "symfony/routing", - "version": "v4.1.6", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "537803f0bdfede36b9acef052d2e4d447d9fa0e9" + "reference": "649460207e77da6c545326c7f53618d23ad2c866" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/537803f0bdfede36b9acef052d2e4d447d9fa0e9", - "reference": "537803f0bdfede36b9acef052d2e4d447d9fa0e9", + "url": "https://api.github.com/repos/symfony/routing/zipball/649460207e77da6c545326c7f53618d23ad2c866", + "reference": "649460207e77da6c545326c7f53618d23ad2c866", "shasum": "" }, "require": { "php": "^7.1.3" }, "conflict": { - "symfony/config": "<3.4", + "symfony/config": "<4.2", "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, "require-dev": { "doctrine/annotations": "~1.0", "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", + "symfony/config": "~4.2", "symfony/dependency-injection": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", "symfony/http-foundation": "~3.4|~4.0", @@ -3223,7 +3393,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3256,24 +3426,25 @@ "uri", "url" ], - "time": "2018-10-02T12:40:59+00:00" + "time": "2018-12-03T22:08:12+00:00" }, { "name": "symfony/translation", - "version": "v4.1.6", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "9f0b61e339160a466ebcde167a6c5521c810e304" + "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/9f0b61e339160a466ebcde167a6c5521c810e304", - "reference": "9f0b61e339160a466ebcde167a6c5521c810e304", + "url": "https://api.github.com/repos/symfony/translation/zipball/c0e2191e9bed845946ab3d99767513b56ca7dcd6", + "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6", "shasum": "" }, "require": { "php": "^7.1.3", + "symfony/contracts": "^1.0.2", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -3281,6 +3452,9 @@ "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, + "provide": { + "symfony/translation-contracts-implementation": "1.0" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.4|~4.0", @@ -3298,7 +3472,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3325,20 +3499,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-10-02T16:36:10+00:00" + "time": "2018-12-06T10:45:32+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.1.6", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "60319b45653580b0cdacca499344577d87732f16" + "reference": "db61258540350725f4beb6b84006e32398acd120" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/60319b45653580b0cdacca499344577d87732f16", - "reference": "60319b45653580b0cdacca499344577d87732f16", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/db61258540350725f4beb6b84006e32398acd120", + "reference": "db61258540350725f4beb6b84006e32398acd120", "shasum": "" }, "require": { @@ -3366,7 +3540,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3400,7 +3574,7 @@ "debug", "dump" ], - "time": "2018-10-02T16:36:10+00:00" + "time": "2018-11-25T12:50:42+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -3572,16 +3746,16 @@ }, { "name": "yajra/laravel-datatables-oracle", - "version": "v8.9.1", + "version": "v8.13.1", "source": { "type": "git", "url": "https://github.com/yajra/laravel-datatables.git", - "reference": "851c4d4d307a66a4f8ab5c12444c1eb0104ecc80" + "reference": "3d7f05687069d90ca5dc3e75bf269e13eecccc76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/851c4d4d307a66a4f8ab5c12444c1eb0104ecc80", - "reference": "851c4d4d307a66a4f8ab5c12444c1eb0104ecc80", + "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/3d7f05687069d90ca5dc3e75bf269e13eecccc76", + "reference": "3d7f05687069d90ca5dc3e75bf269e13eecccc76", "shasum": "" }, "require": { @@ -3639,22 +3813,22 @@ "jquery", "laravel" ], - "time": "2018-10-05T06:10:33+00:00" + "time": "2018-11-23T08:05:22+00:00" } ], "packages-dev": [ { "name": "barryvdh/laravel-ide-helper", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "7db1843473e1562d8e0490b51db847d3a1415140" + "reference": "981ff45b43e0cf808af0a5a5f40f6369e0e29499" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/7db1843473e1562d8e0490b51db847d3a1415140", - "reference": "7db1843473e1562d8e0490b51db847d3a1415140", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/981ff45b43e0cf808af0a5a5f40f6369e0e29499", + "reference": "981ff45b43e0cf808af0a5a5f40f6369e0e29499", "shasum": "" }, "require": { @@ -3715,20 +3889,20 @@ "phpstorm", "sublime" ], - "time": "2018-09-06T18:41:09+00:00" + "time": "2018-10-06T09:35:51+00:00" }, { "name": "barryvdh/reflection-docblock", - "version": "v2.0.4", + "version": "v2.0.5", "source": { "type": "git", "url": "https://github.com/barryvdh/ReflectionDocBlock.git", - "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c" + "reference": "64165bd4ba9a550d11ea57569463b7c722dc6b0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/3dcbd98b5d9384a5357266efba8fd29884458e5c", - "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c", + "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/64165bd4ba9a550d11ea57569463b7c722dc6b0a", + "reference": "64165bd4ba9a550d11ea57569463b7c722dc6b0a", "shasum": "" }, "require": { @@ -3764,7 +3938,7 @@ "email": "mike.vanriel@naenius.com" } ], - "time": "2016-06-13T19:28:20+00:00" + "time": "2018-10-25T19:09:52+00:00" }, { "name": "composer/ca-bundle", @@ -3824,16 +3998,16 @@ }, { "name": "composer/composer", - "version": "1.7.2", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2" + "reference": "d8aef3af866b28786ce9b8647e52c42496436669" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/576aab9b5abb2ed11a1c52353a759363216a4ad2", - "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2", + "url": "https://api.github.com/repos/composer/composer/zipball/d8aef3af866b28786ce9b8647e52c42496436669", + "reference": "d8aef3af866b28786ce9b8647e52c42496436669", "shasum": "" }, "require": { @@ -3869,7 +4043,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -3900,7 +4074,7 @@ "dependency", "package" ], - "time": "2018-08-16T14:57:12+00:00" + "time": "2018-12-03T09:31:16+00:00" }, { "name": "composer/semver", @@ -3966,16 +4140,16 @@ }, { "name": "composer/spdx-licenses", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b" + "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/cb17687e9f936acd7e7245ad3890f953770dec1b", - "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7a9556b22bd9d4df7cad89876b00af58ef20d3a2", + "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2", "shasum": "" }, "require": { @@ -4023,20 +4197,20 @@ "spdx", "validator" ], - "time": "2018-04-30T10:33:04+00:00" + "time": "2018-11-01T09:45:54+00:00" }, { "name": "composer/xdebug-handler", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c" + "reference": "dc523135366eb68f22268d069ea7749486458562" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/b8e9745fb9b06ea6664d8872c4505fb16df4611c", - "reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/dc523135366eb68f22268d069ea7749486458562", + "reference": "dc523135366eb68f22268d069ea7749486458562", "shasum": "" }, "require": { @@ -4067,7 +4241,7 @@ "Xdebug", "performance" ], - "time": "2018-08-31T19:07:57+00:00" + "time": "2018-11-29T10:59:02+00:00" }, { "name": "doctrine/instantiator", @@ -4125,16 +4299,16 @@ }, { "name": "filp/whoops", - "version": "2.3.0", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "a9f129b99df316f847584d482c89c14a9f796e2b" + "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/a9f129b99df316f847584d482c89c14a9f796e2b", - "reference": "a9f129b99df316f847584d482c89c14a9f796e2b", + "url": "https://api.github.com/repos/filp/whoops/zipball/bc0fd11bc455cc20ee4b5edabc63ebbf859324c7", + "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7", "shasum": "" }, "require": { @@ -4182,7 +4356,7 @@ "throwable", "whoops" ], - "time": "2018-10-20T09:00:00+00:00" + "time": "2018-10-23T09:00:00+00:00" }, { "name": "fzaninotto/faker", @@ -4463,26 +4637,27 @@ }, { "name": "nunomaduro/collision", - "version": "v2.1.0", + "version": "v2.1.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "1149ad9f36f61b121ae61f5f6de820fc77b51e6b" + "reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/1149ad9f36f61b121ae61f5f6de820fc77b51e6b", - "reference": "1149ad9f36f61b121ae61f5f6de820fc77b51e6b", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/b5feb0c0d92978ec7169232ce5d70d6da6b29f63", + "reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63", "shasum": "" }, "require": { "filp/whoops": "^2.1.4", - "jakub-onderka/php-console-highlighter": "0.3.*", + "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*", "php": "^7.1", "symfony/console": "~2.8|~3.3|~4.0" }, "require-dev": { "laravel/framework": "5.7.*", + "nunomaduro/larastan": "^0.3.0", "phpstan/phpstan": "^0.10", "phpunit/phpunit": "~7.3" }, @@ -4522,7 +4697,7 @@ "php", "symfony" ], - "time": "2018-10-03T20:01:54+00:00" + "time": "2018-11-21T21:40:54+00:00" }, { "name": "phar-io/manifest", @@ -4843,16 +5018,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "6.1.1", + "version": "6.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "b097681a19a48e52706f57e47a09594bac4f7cab" + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b097681a19a48e52706f57e47a09594bac4f7cab", - "reference": "b097681a19a48e52706f57e47a09594bac4f7cab", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", "shasum": "" }, "require": { @@ -4902,7 +5077,7 @@ "testing", "xunit" ], - "time": "2018-10-18T09:01:38+00:00" + "time": "2018-10-31T16:06:48+00:00" }, { "name": "phpunit/php-file-iterator", @@ -5046,16 +5221,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace" + "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/21ad88bbba7c3d93530d93994e0a33cd45f02ace", - "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18", + "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18", "shasum": "" }, "require": { @@ -5091,20 +5266,20 @@ "keywords": [ "tokenizer" ], - "time": "2018-02-01T13:16:43+00:00" + "time": "2018-10-30T05:52:18+00:00" }, { "name": "phpunit/phpunit", - "version": "7.4.1", + "version": "7.5.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c5a120ade60992bd671a912188ee9ee9f8083bbd" + "reference": "c23d78776ad415d5506e0679723cb461d71f488f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c5a120ade60992bd671a912188ee9ee9f8083bbd", - "reference": "c5a120ade60992bd671a912188ee9ee9f8083bbd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c23d78776ad415d5506e0679723cb461d71f488f", + "reference": "c23d78776ad415d5506e0679723cb461d71f488f", "shasum": "" }, "require": { @@ -5125,7 +5300,7 @@ "phpunit/php-timer": "^2.0", "sebastian/comparator": "^3.0", "sebastian/diff": "^3.0", - "sebastian/environment": "^3.1 || ^4.0", + "sebastian/environment": "^4.0", "sebastian/exporter": "^3.1", "sebastian/global-state": "^2.0", "sebastian/object-enumerator": "^3.0.3", @@ -5149,7 +5324,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.4-dev" + "dev-master": "7.5-dev" } }, "autoload": { @@ -5175,7 +5350,7 @@ "testing", "xunit" ], - "time": "2018-10-18T09:02:52+00:00" + "time": "2018-12-12T07:20:32+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -5344,28 +5519,28 @@ }, { "name": "sebastian/environment", - "version": "3.1.0", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" + "reference": "febd209a219cea7b56ad799b30ebbea34b71eb8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", - "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/febd209a219cea7b56ad799b30ebbea34b71eb8f", + "reference": "febd209a219cea7b56ad799b30ebbea34b71eb8f", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^6.1" + "phpunit/phpunit": "^7.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -5390,7 +5565,7 @@ "environment", "hhvm" ], - "time": "2017-07-01T08:51:00+00:00" + "time": "2018-11-25T09:31:21+00:00" }, { "name": "sebastian/exporter", @@ -5835,16 +6010,16 @@ }, { "name": "symfony/filesystem", - "version": "v4.1.6", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "596d12b40624055c300c8b619755b748ca5cf0b5" + "reference": "2f4c8b999b3b7cadb2a69390b01af70886753710" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/596d12b40624055c300c8b619755b748ca5cf0b5", - "reference": "596d12b40624055c300c8b619755b748ca5cf0b5", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/2f4c8b999b3b7cadb2a69390b01af70886753710", + "reference": "2f4c8b999b3b7cadb2a69390b01af70886753710", "shasum": "" }, "require": { @@ -5854,7 +6029,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -5881,7 +6056,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-10-02T12:40:59+00:00" + "time": "2018-11-11T19:52:12+00:00" }, { "name": "theseer/tokenizer", diff --git a/config/app.php b/config/app.php index 3f6d45e..acdd307 100755 --- a/config/app.php +++ b/config/app.php @@ -52,7 +52,11 @@ return [ | */ - 'url' => env('APP_URL', 'http://mivita.local/login'), + 'url' => env('APP_URL', 'http://mivita.local/'), + 'domain' => env('APP_DOMAIN', 'mivita.local'), + 'protocol' => env('APP_PROTOCOL', 'http://'), + + /* |-------------------------------------------------------------------------- | Application Timezone diff --git a/config/profanity.php b/config/profanity.php new file mode 100644 index 0000000..1f390ff --- /dev/null +++ b/config/profanity.php @@ -0,0 +1,125 @@ + true, + + /* Replace bad words with this, based on length of word */ + 'replaceWith' => '*', + + /* Replace related letters */ + 'strReplace' => [ + 'a' => '(a|a\.|a\-|4|@|Á|á|À|Â|à|Â|â|Ä|ä|Ã|ã|Å|å|α|Δ|Λ|λ)', + 'b' => '(b|b\.|b\-|8|\|3|ß|Β|β)', + 'c' => '(c|c\.|c\-|Ç|ç|¢|€|<|\(|{|©)', + 'd' => '(d|d\.|d\-|∂|\|\)|Þ|þ|Ð|ð)', + 'e' => '(e|e\.|e\-|3|€|È|è|É|é|Ê|ê|∑)', + 'f' => '(f|f\.|f\-|ƒ)', + 'g' => '(g|g\.|g\-|6|9)', + 'h' => '(h|h\.|h\-|Η)', + 'i' => '(i|i\.|i\-|!|\||\]\[|]|1|∫|Ì|Í|Î|Ï|ì|í|î|ï)', + 'j' => '(j|j\.|j\-)', + 'k' => '(k|k\.|k\-|Κ|κ)', + 'l' => '(l|1\.|l\-|!|\||\]\[|]|£|∫|Ì|Í|Î|Ï)', + 'm' => '(m|m\.|m\-)', + 'n' => '(n|n\.|n\-|η|Ν|Π)', + 'o' => '(o|o\.|o\-|0|Ο|ο|Φ|¤|°|ø)', + 'p' => '(p|p\.|p\-|ρ|Ρ|¶|þ)', + 'q' => '(q|q\.|q\-)', + 'r' => '(r|r\.|r\-|®)', + 's' => '(s|s\.|s\-|5|\$|§)', + 't' => '(t|t\.|t\-|Τ|τ)', + 'u' => '(u|u\.|u\-|υ|µ)', + 'v' => '(v|v\.|v\-|υ|ν)', + 'w' => '(w|w\.|w\-|ω|ψ|Ψ)', + 'x' => '(x|x\.|x\-|Χ|χ)', + 'y' => '(y|y\.|y\-|¥|γ|ÿ|ý|Ÿ|Ý)', + 'z' => '(z|z\.|z\-|Ζ)', + ], + + /* Replace these words no matter what language. */ + 'defaults' => [ + 'fuck', + 'shit', + 'anal', + 'anus', + 'arse', + 'ass', + 'ballsack', + 'balls', + 'bastard', + 'bitch', + 'biatch', + 'bloody', + 'blowjob', + 'bollock', + 'bollok', + 'boner', + 'boob', + 'bugger', + 'bum', + 'butt', + 'buttplug', + 'clitoris', + 'cock', + 'coon', + 'crap', + 'cunt', + 'damn', + 'dick', + 'dildo', + 'dyke', + 'fag', + 'feck', + 'fellate', + 'fellatio', + 'felching', + 'fuck', + 'fudgepacker', + 'flange', + 'goddamn', + 'hell', + 'homo', + 'jizz', + 'knobend', + 'labia', + 'muff', + 'nigger', + 'nigga', + 'penis', + 'piss', + 'poop', + 'prick', + 'pube', + 'pussy', + 'queer', + 'scrotum', + 'sex', + 'shit', + 'sh1t', + 'slut', + 'smegma', + 'spunk', + 'suck', + 'tit', + 'tosser', + 'turd', + 'twat', + 'vagina', + 'wank', + 'whore', + 'wtf', + 'mivita', + 'aloe', + 'vera', + ], +]; diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 28cb393..66d1d30 100755 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -15,10 +15,11 @@ class CreateUsersTable extends Migration { Schema::create('users', function (Blueprint $table) { $table->increments('id'); - $table->string('name'); $table->string('email')->unique(); $table->string('password'); + $table->unsignedInteger('account_id')->nullable(); + $table->boolean('confirmed')->default(false); $table->string('confirmation_code', 30)->index()->nullable(); $table->timestamp('confirmation_date')->nullable(); @@ -27,21 +28,16 @@ class CreateUsersTable extends Migration $table->boolean('active')->default(false); $table->timestamp('active_date')->nullable(); - $table->dateTime('agreement')->nullable(); $table->boolean('admin')->default(false); - $table->char('lang', 2)->index(); - $table->text('notes')->nullable(); $table->rememberToken(); $table->timestamp('last_login')->nullable(); - $table->timestamps(); - $table->softDeletes(); }); diff --git a/database/migrations/2018_09_29_170559_create_accounts_table.php b/database/migrations/2018_09_29_170559_create_user_accounts_table.php similarity index 92% rename from database/migrations/2018_09_29_170559_create_accounts_table.php rename to database/migrations/2018_09_29_170559_create_user_accounts_table.php index a55bd4e..c726f4b 100644 --- a/database/migrations/2018_09_29_170559_create_accounts_table.php +++ b/database/migrations/2018_09_29_170559_create_user_accounts_table.php @@ -16,8 +16,6 @@ class CreateAccountsTable extends Migration Schema::create('accounts', function (Blueprint $table) { $table->increments('id'); - $table->unsignedInteger('user_id')->index(); - $table->boolean('company')->default(true); $table->string('company_name')->nullable()->index(); @@ -50,14 +48,10 @@ class CreateAccountsTable extends Migration $table->string('facebook')->nullable(); $table->string('facebook_fanpage')->nullable(); $table->string('instagram')->nullable(); - + $table->timestamp('data_protection')->nullable(); $table->timestamps(); - $table->softDeletes(); - $table->foreign('user_id') - ->references('id') - ->on('users'); }); } diff --git a/database/migrations/2019_01_03_162833_create_user_shops_table.php b/database/migrations/2019_01_03_162833_create_user_shops_table.php new file mode 100644 index 0000000..0110f5e --- /dev/null +++ b/database/migrations/2019_01_03_162833_create_user_shops_table.php @@ -0,0 +1,63 @@ +increments('id'); + $table->unsignedInteger('user_id'); + + $table->string('name', 20)->unique()->index(); + $table->string('slug', 40)->unique()->index(); + + $table->boolean('active')->default(false); + $table->timestamp('active_date')->nullable(); + + $table->string('title')->nullable(); + $table->text('trans_title')->nullable(); + + $table->text('copy')->nullable(); + $table->mediumText('trans_copy')->nullable(); + + $table->text('info')->nullable(); + $table->mediumText('trans_info')->nullable(); + + $table->string('featured')->nullable(); + + $table->string('filename')->nullable(); + $table->string('originalname')->nullable(); + $table->string('ext')->nullable(); + $table->string('mine')->nullable(); + $table->unsignedInteger('size')->nullable(); + + $table->timestamps(); + $table->softDeletes(); + + $table->foreign('user_id') + ->references('id') + ->on('users') + ->onDelete('cascade'); + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('user_shops'); + } +} diff --git a/public/js/bootstrap-datepicker.de.min.js b/public/js/bootstrap-datepicker.de.min.js new file mode 100755 index 0000000..c63bcf0 --- /dev/null +++ b/public/js/bootstrap-datepicker.de.min.js @@ -0,0 +1 @@ +!function(a){a.fn.datepicker.dates.de={days:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],daysShort:["Son","Mon","Die","Mit","Don","Fre","Sam"],daysMin:["So","Mo","Di","Mi","Do","Fr","Sa"],months:["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],monthsShort:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],today:"Heute",clear:"Löschen",weekStart:1,format:"dd.mm.yyyy"}}(jQuery); \ No newline at end of file diff --git a/resources/lang/de.json b/resources/lang/de.json index 57c34a4..4fd219c 100755 --- a/resources/lang/de.json +++ b/resources/lang/de.json @@ -1 +1,198 @@ -{"MR":"Herr","MS":"Frau","please select":"Bitte w\u00e4hlen","further countries":"weitere L\u00e4nder","no":"Keine","Company data":"Firmendaten","Company name":"Firmenname","Street":"Stra\u00dfe","House number":"Hausnummer","City":"Ort","Postcode":"PLZ","Country":"Land","Phone":"Telefon","Homepage":"Homepage","Industry":"Branche","Industries":"Branchen","Main Industry":"Hauptbranche","Personal Data":"Ihre Daten","Function":"Funktion","Salutation":"Anrede","Title":"Titel","First name":"Vorname","Last Name":"Nachname","Mobile Phone":"Mobiltelefon","Your interests":"Ihre Interessen","Your contact person":"Ihr Ansprechpartner","Name":"Name","Consent & Privacy":"Einwilligung & Datenschutz","New Password":"Neues Passwort","Old Password":"Altes Passwort","Change Password":"Passwort \u00e4ndern","Confirm new Password":"Neues Passwort wiederholen","Confirm Password":"Passwort best\u00e4tigen","Confirm E-Mail":"E-Mail wiederholen","E-Mail Address":"E-Mail Adresse","Forgot your Password?":"Passwort vergessen?","Login":"Einloggen","Logout":"Ausloggen","Password":" Passwort ","Register":"Registrieren","Remember Me":"Angemeldet bleiben","Reset Password":"Passwort zur\u00fccksetzen","Send Password Reset Link":"Link zum Zur\u00fccksetzen des Passworts senden","save":"speichern","save changes":"\u00c4nderungen speichern","abort":"abbrechen","This field is required.":"Dieses Feld ist ein Pflichtfeld.","Please enter a valid email address.":"Bitte geben Sie eine g\u00fcltige E-Mail-Adresse ein.","This E-mail is already in use.":"Diese E-Mail wird bereits verwendet.","Please enter the same value again.":"Die E-Mail Adressen sind nicht gleich.","a valid e-mail address":"Geben Sie bitte eine g\u00fcltige E-Mail-Adresse ein.","Already have an account?":"Sie haben schon einen Account?","Login to your account":"Melden Sie sich in Ihrem Account an","Dont have an account yet?":"Sie haben noch keinen Account?","We keep you up to date on product news":"Gerne informieren wir Sie \u00fcber Produktneuheiten, Relevantes aus der Branche und Beispiele zu unseren Anwendungen:","Registration":"Registrierung","that\u2019s how it\u2019s done":"so geht\u2019s","Just register":"Einfach registrieren","Just fill out the fields":"F\u00fcllen Sie einfach die Felder in der Eingabemaske aus. Danach erhalten Sie von uns per E-Mail einen Link. Mit einen Klick auf den Link best\u00e4tigen Sie die Registrierung.","Changeable at any time":"Jederzeit \u00e4nderbar","With your e-mail address and password":"Mit Ihrer E-Mailadresse und Ihrem Passwort k\u00f6nnen Sie jederzeit Ihre Daten einsehen oder \u00e4ndern.","Absolutely safe":"Absolut sicher","Your data will be stored on":"Ihre Daten werden auf deutschen Servern unter Ber\u00fccksichtigung aktueller Sicherheitsstandards gespeichert.","now register data":"jetzt Daten registieren","Required fields":"Pflichtfelder","You will receive an e-mail for confirmation":"Sie erhalten eine E-Mail zur Best\u00e4tigung, \u00fcber den Link in der E-Mail schalten Sie Ihren Daten frei.","Industry sectors":"Branchen","Interests":"Interessen","Leads":"Kontakte","Your Data":"Ihre Daten","Change password":"Passwort \u00e4ndern","Edit your data":"Ihre Daten bearbeiten","I have read the :link and accept it.*":"Ich habe die :link gelesen und akzeptiere diese.*","data protection":"Datenschutzerkl\u00e4rung","Yes, I agree that will send me more information.":"Ja, ich bin damit einverstanden, dass mir weitere Informationen zusendet werden. Die Einwilligung ist jederzeit \u00fcber diese Webseite widerrufbar.","saved":"Gespeichert","The changes have been saved.":"Die \u00c4nderungen wurden gespeichert.","error":"Fehler","Delete Account":"Account l\u00f6schen","account deleted":"Account gel\u00f6schen","Here you can adjust your data.":"Hier k\u00f6nnen Sie Ihre Daten anpassen.","Overview":"\u00dcbersicht","Adjust data":"Daten anpassen","Login & Security":"Anmeldung & Sicherheit","Sign in with your e-mail:":"Anmeldung mit Ihrer E-Mail:","Change your password here to access your account.":"\u00c4ndern Sie hier Ihr Passwort f\u00fcr den Zugriff auf Ihren Account.","Activities":"Aktivit\u00e4ten","Delete":"l\u00f6schen","If you no longer want to use our offer, you can delete your account here.":"Wenn Sie unser Angebot nicht mehr nutzen m\u00f6chten, k\u00f6nnen Sie hier Ihren Account l\u00f6schen.","Confirm your identity with your password before proceeding.":"Best\u00e4tigen Sie mit Ihrem Passwort Ihre Identit\u00e4t, bevor Sie fortfahren.","Dear Mrs":"Sehr geehrte Frau","Dear Sir":"Sehr geehrter Herr","Dear customer":"Sehr geehrter Kunde","Dear Customer you will receive this e-mail because we have received a request to reset the password for your account.":"Sie erhalten diese E-Mail, weil wir eine Anfrage zum Zur\u00fccksetzen des Passworts f\u00fcr Ihren Account erhalten haben.","Or copy this link into the address bar of your browser.":"Oder kopieren Sie diesen Link in die Adressleiste Ihres Browsers.","Best regards":"Mit freundlichen Gr\u00fc\u00dfen","imprint":"Impressum","data protections":"Datenschutz","E-Mail address can not be changed!":"E-Mail Adresse ist nicht \u00e4nderbar!","E-Mail address can not be changed here!":"E-Mail Adresse kann hier nicht ge\u00e4ndert werden!","Thank you for your registration!":"Vielen Dank f\u00fcr Ihre Registrierung!","We have sent you an e-mail with a link to activate your data.":"Wir haben Ihnen eine E-Mail mit einem Link zur Freischaltung Ihrer Daten geschickt.","back to the homepage":"zur\u00fcck zur Startseite","Verify Your Email Address":"Best\u00e4tigen Sie Ihre E-Mail-Adresse","Thank you for creating an account. Please follow the link below to confirm your email address.":"Vielen Dank f\u00fcr die Erstellung eines Accounts. Bitte folgen Sie dem unten stehenden Link, um Ihre E-Mail-Adresse zu best\u00e4tigen.","You have successfully verified your account!":"Sie haben Ihr Konto erfolgreich verifiziert!","Now check your data and release the data.":"\u00dcberpr\u00fcfen Sie jetzt Ihre Daten und geben Sie die Daten frei.","Check and release data":"Daten \u00fcberpr\u00fcfen und freigeben","Check data":"Daten \u00fcberpr\u00fcfen","Page not available":"Seite nicht verf\u00fcgbar","Data released":"Daten freigeben","Data released now":"Daten jetzt freigeben","E-Mail verified":"E-Mail verifiziert","Privacy policy approved":"Datenschutzerkl\u00e4rung zugestimmt","Consent for further information":"Einwilligung f\u00fcr weitere Informationen","at":"am","Assign a password for your account.":"Vergeben Sie ein Passwort f\u00fcr Ihren Account.","Create Password":"Passwort erstellen","back":"zur\u00fcck","If you have checked your data, share your data here!":"Wenn Sie Ihre Daten \u00fcberpr\u00fcft haben, geben Sie Ihre Daten hier frei!","Contacts all":"gesamte Kontakte","Contacts verify":"Kontakte verifiziert","Contacts active":"Kontakte freigeschaltet","We have data about you stored in our System. Please follow the link below to verify your email address.You can also change or delete your data.":"Wir haben Daten \u00fcber Sie in unserem System gespeichert. Bitte folgen Sie dem unten stehenden Link um Ihre E-Mail-Adresse zu best\u00e4tigen. Weitherhin k\u00f6nnen Sie Ihre Daten \u00e4ndern oder auch l\u00f6schen.","Verify your Data and E-Mail Address":"Best\u00e4tigen Sie Ihre Daten und E-Mail-Adresse","This website uses cookies in order to guarantee the best possible service. With your visit to this site you agree to our use of cookies.":"Diese Webseite verwendet Cookies, um Ihnen den bestm\u00f6glichen Service zu gew\u00e4hrleisten. Mit Ihrem Besuch auf dieser Seite stimmen Sie der Verwendung von Cookies zu.","OK":"OK","Contacts":"Kontake","active":"aktiviert","verified":"verifiziert","'E-Mail":"'E-Mail","create new Contact":"Neuen Kontakt erstellen","Create\/Edit Contact":"Kontakt bearbeiten\/erstellen","Pos":"Pos","Description":"Bezeichnung","Translate":"\u00dcbersetzung","Status":"Status","create\/edit":"erstellen\/bearbeiten","when active, the interest in the selection is displayed":"wenn aktiv, wird das Interesse in der Aushwahl angezeigt","close":"schlie\u00dfen","Number to move the position if necessary":"Zahl um ggf. die Postion zu verschieben","Create new interest":"Neues Interesse erstellen","Really delete entry?":"Eintrag wirklich l\u00f6schen?","Create a new industry":"Neue Branche erstellen","Your e-mail has been changed.":"Ihre E-Mail wurde ge\u00e4ndert.","We sent you an activation code. Check your email!":"Wir haben Ihnen einen Aktivierungscode gesendet. \u00dcberpr\u00fcfen Sie Ihre E-Mails!","An activation code was sent to the account by e-mail!":"An den Kontkat wurde per E-Mail ein Aktivierungscode gesendet!","New E-Mail Address":"Neue E-Mail Adresse","Confirm new E-Mail":"Neue E-Mail Adresse wiederholen","Change E-Mail":"E-Mail Adresse \u00e4ndern","Change your e-mail address here. We will send you a new activation link to your new e-mail address to verify it.":"\u00c4ndern Sie hier Ihre E-Mail-Adresse. Wir senden Ihnen einen neuen Aktivierungslink an Ihre neue E-Mail-Adresse, um diese zu verifizieren.","Change the e-mail address of the contact here. We will send the contact a new activation link to the new e-mail address to verify it.":"\u00c4ndern Sie hier die E-Mail-Adresse des Kontakts. Wir senden dem Kontakt einen neuen Aktivierungslink an die neue E-Mail-Adresse, um diese zu verifizieren.","Dear Customer you will receive this e-mail because we have received a request to change your E-Mail Address for your account.":"Sie erhalten diese E-Mail, weil wir eine Anfrage zur \u00c4nderung Ihrer E-Mail-Adresse f\u00fcr Ihr Konto erhalten haben.","business":"gesch\u00e4ftlich","private":"privat","business or private":"gesch\u00e4ftlich oder privat","use":"Nutzung","Country code":"L\u00e4ndervorwahl","Contact":"Kontakt","waiting for activation since":"wartet auf Aktivierung seit","edit":"bearbeiten","delete":"l\u00f6schen"} \ No newline at end of file +{ + "MR": "Herr", + "MS": "Frau", + "please select": "Bitte w\u00e4hlen", + "further countries": "weitere L\u00e4nder", + "no": "Keine", + "Company data": "Firmendaten", + "Company name": "Firmenname", + "Street": "Stra\u00dfe", + "House number": "Hausnummer", + "City": "Ort", + "Postcode": "PLZ", + "Country": "Land", + "Phone": "Telefon", + "Homepage": "Homepage", + "Industry": "Branche", + "Industries": "Branchen", + "Main Industry": "Hauptbranche", + "Personal Data": "Persönliche Daten", + "Function": "Funktion", + "Salutation": "Anrede", + "Title": "Titel", + "First name": "Vorname", + "Last Name": "Nachname", + "Mobile Phone": "Mobiltelefon", + "Your interests": "Ihre Interessen", + "Your contact person": "Ihr Ansprechpartner", + "Name": "Name", + "Consent & Privacy": "Einwilligung & Datenschutz", + "New Password": "Neues Passwort", + "Old Password": "Altes Passwort", + "Change Password": "Passwort \u00e4ndern", + "Confirm new Password": "Neues Passwort wiederholen", + "Confirm Password": "Passwort best\u00e4tigen", + "Confirm E-Mail": "E-Mail wiederholen", + "E-Mail Address": "E-Mail Adresse", + "Forgot your Password?": "Passwort vergessen?", + "Login": "Einloggen", + "Logout": "Ausloggen", + "Password": " Passwort ", + "Register": "Registrieren", + "Remember Me": "Angemeldet bleiben", + "Reset Password": "Passwort zur\u00fccksetzen", + "Send Password Reset Link": "Link zum Zur\u00fccksetzen des Passworts senden", + "save": "speichern", + "save changes": "\u00c4nderungen speichern", + "abort": "abbrechen", + "This field is required.": "Dieses Feld ist ein Pflichtfeld.", + "Please enter a valid email address.": "Bitte geben Sie eine g\u00fcltige E-Mail-Adresse ein.", + "This E-mail is already in use.": "Diese E-Mail wird bereits verwendet.", + "Please enter the same value again.": "Die E-Mail Adressen sind nicht gleich.", + "a valid e-mail address": "Geben Sie bitte eine g\u00fcltige E-Mail-Adresse ein.", + "Already have an account?": "Sie haben schon einen Account?", + "Login to your account": "Melde Dich in Deinem Account an", + "Dont have an account yet?": "Sie haben noch keinen Account?", + "We keep you up to date on product news": "Gerne informieren wir Sie \u00fcber Produktneuheiten, Relevantes aus der Branche und Beispiele zu unseren Anwendungen:", + "Registration": "Registrierung", + "that\u2019s how it\u2019s done": "so geht\u2019s", + "Just register": "Einfach registrieren", + "Just fill out the fields": "F\u00fcllen Sie einfach die Felder in der Eingabemaske aus. Danach erhalten Sie von uns per E-Mail einen Link. Mit einen Klick auf den Link best\u00e4tigen Sie die Registrierung.", + "Changeable at any time": "Jederzeit \u00e4nderbar", + "With your e-mail address and password": "Mit Ihrer E-Mailadresse und Ihrem Passwort k\u00f6nnen Sie jederzeit Ihre Daten einsehen oder \u00e4ndern.", + "Absolutely safe": "Absolut sicher", + "Your data will be stored on": "Deine Daten werden auf deutschen Servern unter Ber\u00fccksichtigung aktueller Sicherheitsstandards gespeichert.", + "now register data": "jetzt Daten registieren", + "Required fields": "Pflichtfelder", + "You will receive an e-mail for confirmation": "Sie erhalten eine E-Mail zur Best\u00e4tigung, \u00fcber den Link in der E-Mail schalten Sie Ihren Daten frei.", + "Industry sectors": "Branchen", + "Interests": "Interessen", + "Leads": "Kontakte", + "Your Data": "Deine Daten", + "Change password": "Passwort \u00e4ndern", + "Edit your data": "Deine Daten bearbeiten", + "I have read the :link and accept it.*": "Ich habe die :link gelesen und akzeptiere diese.*", + "data protection": "Datenschutzerkl\u00e4rung", + "Yes, I agree that will send me more information.": "Ja, ich bin damit einverstanden, dass mir weitere Informationen zusendet werden. Die Einwilligung ist jederzeit \u00fcber diese Webseite widerrufbar.", + "saved": "Gespeichert", + "The changes have been saved.": "Die \u00c4nderungen wurden gespeichert.", + "error": "Fehler", + "Delete Account": "Account l\u00f6schen", + "account deleted": "Account gel\u00f6schen", + "Here you can adjust your data.": "Hier k\u00f6nnen Sie Ihre Daten anpassen.", + "Overview": "\u00dcbersicht", + "Adjust data": "Daten anpassen", + "Login & Security": "Anmeldung & Sicherheit", + "Sign in with your e-mail:": "Anmeldung mit Ihrer E-Mail:", + "Change your password here to access your account.": "\u00c4ndern Sie hier Ihr Passwort f\u00fcr den Zugriff auf Ihren Account.", + "Activities": "Aktivit\u00e4ten", + "Delete": "L\u00f6schen", + "If you no longer want to use our offer, you can delete your account here.": "Wenn Sie unser Angebot nicht mehr nutzen m\u00f6chten, k\u00f6nnen Sie hier Ihren Account l\u00f6schen.", + "Confirm your identity with your password before proceeding.": "Best\u00e4tigen Sie mit Ihrem Passwort Ihre Identit\u00e4t, bevor Sie fortfahren.", + "Dear Mrs": "Sehr geehrte Frau", + "Dear Sir": "Sehr geehrter Herr", + "Dear customer": "Sehr geehrter Kunde", + "Dear Customer you will receive this e-mail because we have received a request to reset the password for your account.": "Sie erhalten diese E-Mail, weil wir eine Anfrage zum Zur\u00fccksetzen des Passworts f\u00fcr Ihren Account erhalten haben.", + "Or copy this link into the address bar of your browser.": "Oder kopieren Sie diesen Link in die Adressleiste Ihres Browsers.", + "Best regards": "Mit freundlichen Gr\u00fc\u00dfen", + "imprint": "Impressum", + "data protections": "Datenschutz", + "E-Mail address can not be changed!": "E-Mail Adresse ist nicht \u00e4nderbar!", + "E-Mail address can not be changed here!": "E-Mail Adresse kann hier nicht ge\u00e4ndert werden!", + "Thank you for your registration!": "Vielen Dank f\u00fcr Ihre Registrierung!", + "We have sent you an e-mail with a link to activate your data.": "Wir haben Ihnen eine E-Mail mit einem Link zur Freischaltung Ihrer Daten geschickt.", + "back to the homepage": "zur\u00fcck zur Startseite", + "Verify Your Email Address": "Best\u00e4tigen Sie Ihre E-Mail-Adresse", + "Thank you for creating an account. Please follow the link below to confirm your email address.": "Vielen Dank f\u00fcr die Erstellung eines Accounts. Bitte folgen Sie dem unten stehenden Link, um Ihre E-Mail-Adresse zu best\u00e4tigen.", + "You have successfully verified your account!": "Sie haben Ihr Konto erfolgreich verifiziert!", + "Now check your data and release the data.": "\u00dcberpr\u00fcfen Sie jetzt Ihre Daten und geben Sie die Daten frei.", + "Check and release data": "Daten \u00fcberpr\u00fcfen und freigeben", + "Check data": "Daten \u00fcberpr\u00fcfen", + "Page not available": "Seite nicht verf\u00fcgbar", + "Data released": "Daten freigeben", + "Data released now": "Daten jetzt freigeben", + "E-Mail verified": "E-Mail verifiziert", + "Privacy policy approved": "Datenschutzerkl\u00e4rung zugestimmt", + "Consent for further information": "Einwilligung f\u00fcr weitere Informationen", + "at": "am", + "Assign a password for your account.": "Vergeben Sie ein Passwort f\u00fcr Ihren Account.", + "Create Password": "Passwort erstellen", + "back": "zur\u00fcck", + "If you have checked your data, share your data here!": "Wenn Sie Ihre Daten \u00fcberpr\u00fcft haben, geben Sie Ihre Daten hier frei!", + "Contacts all": "gesamte Kontakte", + "Contacts verify": "Kontakte verifiziert", + "Contacts active": "Kontakte freigeschaltet", + "We have data about you stored in our System. Please follow the link below to verify your email address.You can also change or delete your data.": "Wir haben Daten \u00fcber Sie in unserem System gespeichert. Bitte folgen Sie dem unten stehenden Link um Ihre E-Mail-Adresse zu best\u00e4tigen. Weitherhin k\u00f6nnen Sie Ihre Daten \u00e4ndern oder auch l\u00f6schen.", + "Verify your Data and E-Mail Address": "Best\u00e4tigen Sie Ihre Daten und E-Mail-Adresse", + "This website uses cookies in order to guarantee the best possible service. With your visit to this site you agree to our use of cookies.": "Diese Webseite verwendet Cookies, um Ihnen den bestm\u00f6glichen Service zu gew\u00e4hrleisten. Mit Ihrem Besuch auf dieser Seite stimmen Sie der Verwendung von Cookies zu.", + "OK": "OK", + "Contacts": "Kontake", + "active": "aktiviert", + "verified": "verifiziert", + "'E-Mail": "'E-Mail", + "create new Contact": "Neuen Kontakt erstellen", + "Create\/Edit Contact": "Kontakt bearbeiten\/erstellen", + "Pos": "Pos", + "Description": "Bezeichnung", + "Translate": "\u00dcbersetzung", + "Status": "Status", + "create\/edit": "erstellen\/bearbeiten", + "when active, the interest in the selection is displayed": "wenn aktiv, wird das Interesse in der Aushwahl angezeigt", + "close": "schlie\u00dfen", + "Number to move the position if necessary": "Zahl um ggf. die Postion zu verschieben", + "Create new interest": "Neues Interesse erstellen", + "Really delete entry?": "Eintrag wirklich l\u00f6schen?", + "Create a new industry": "Neue Branche erstellen", + "Your e-mail has been changed.": "Ihre E-Mail wurde ge\u00e4ndert.", + "We sent you an activation code. Check your email!": "Wir haben Ihnen einen Aktivierungscode gesendet. \u00dcberpr\u00fcfen Sie Ihre E-Mails!", + "An activation code was sent to the account by e-mail!": "An den Kontkat wurde per E-Mail ein Aktivierungscode gesendet!", + "New E-Mail Address": "Neue E-Mail Adresse", + "Confirm new E-Mail": "Neue E-Mail Adresse wiederholen", + "Change E-Mail": "E-Mail Adresse \u00e4ndern", + "Change your e-mail address here. We will send you a new activation link to your new e-mail address to verify it.": "\u00c4ndern Sie hier Ihre E-Mail-Adresse. Wir senden Ihnen einen neuen Aktivierungslink an Ihre neue E-Mail-Adresse, um diese zu verifizieren.", + "Change the e-mail address of the contact here. We will send the contact a new activation link to the new e-mail address to verify it.": "\u00c4ndern Sie hier die E-Mail-Adresse des Kontakts. Wir senden dem Kontakt einen neuen Aktivierungslink an die neue E-Mail-Adresse, um diese zu verifizieren.", + "Dear Customer you will receive this e-mail because we have received a request to change your E-Mail Address for your account.": "Sie erhalten diese E-Mail, weil wir eine Anfrage zur \u00c4nderung Ihrer E-Mail-Adresse f\u00fcr Ihr Konto erhalten haben.", + "business": "gesch\u00e4ftlich", + "private": "privat", + "business or private": "gesch\u00e4ftlich oder privat", + "use": "Nutzung", + "Country code": "L\u00e4ndervorwahl", + "Contact": "Kontakt", + "waiting for activation since": "wartet auf Aktivierung seit", + "edit": "bearbeiten", + "delete": "\u00f6schen", + "your mivita.care team": "Dein mivita.care Team", + "create new password": "neues Passwort erstellen", + "Now assign a password.": "Vergeben Sie jetzt Ihr Passwort für den Zugriff auf Ihren Account.", + "to your data":"zu Deinen Daten", + "Your registration has already been completed.":"Deine Registrierung wurde bereits abgeschlossen.", + "go to login": "zur Anmeldung", + "Declaration of consent": "Einverst\u00e4ndniserkl\u00e4rung: Hiermit willige ich in die Verarbeitung der von mir freiwillig angegebenen personenbezogenen Daten ein. Ich wurde dar\u00fcber informiert, dass ich diese Einwilligung jederzeit widerrufen kann.", + "Please confirm your data first.": "Bitte überprüfen Sie Ihre Daten als erstes und bestätigen Sie diese.", + "yes, data checked and share":"Ja, Daten überprüft und jetzt freigeben", + "Declaration of shop": "Hiermit bestätige und akzeptiere ich die Nutzungsbedinungen zu meinem mivita-Shop.", + "Your Shop": "Dein Shop", + "Terms of Use": "Nutzungsbedingungen", + "Your Shop Name" : "Gib deinem Shop einen Namen", + "Choose Your Shop Name" : "Wähle einen einprägsamen Shop-Namen, der zu Dir passt.", + "shop_name_error_1":"Dein Shop-Name darf nur lateinische Buchstaben ohne Akzent sowie Ziffern enthalten, keine Leerzeichen.", + "shop_name_error_2":"Shop-Namen müssen 4 bis 20 Zeichen lang sein.", + "shop_name_description":"Dein Shop-Name wird in Deinem Shop angezeigt. Aus Deinem Shop-Namen wird die InternetAdresse (Domain) erstellt, mit der Dein Shop aufgerufen werden kann. Der Shop Name ist später nicht mehr änderbar.", + "save and continue":"speichern und fortfahren", + "shop_title": "Shop Titel", + "shop_title_help": "Gib Deinem Shop einen aussagekräftigen Titel.", + "shop_copy": "Shop Beschreibung", + "shop_copy_help": "Eine Beschreibnung über Dich und den Deinen Shop.", + "shop_info": "Shop Informationen", + "shop_info_help": "Informationen wie Erreichbarkeit", + "Shop details":"Shop Details", + "available":"erreichbar", + "not available":"nicht erreichbar", + "active since":"Aktiv seit", + "Domain":"Domain", + "name":"Name", + "not available copy":" Bei neu angelegten Shops dauert es einige Minuten, bis die Domain zu erreichen ist. Bitte schauen Sie in einigen Minuten noch einmal nach.", + "shop image":"Dein Shop Bild", + "shop image copy":"Lade hier ein Foto / Bild / Logo von Dir hoch.", + "":"" +} \ No newline at end of file diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php index e56c2e8..b2ad0a4 100755 --- a/resources/lang/de/validation.php +++ b/resources/lang/de/validation.php @@ -113,6 +113,7 @@ return [ 'url' => ':attribute muss eine URL sein.', 'old_password' => 'Passwort ist nicht gültig', 'users_update_email' => 'Die E-Mail ist schon zur Änderung eingetragen', + 'profanity' => ':attribute ist nicht zulässig', /* |-------------------------------------------------------------------------- @@ -172,5 +173,8 @@ return [ 'time' => 'Uhrzeit', 'available' => 'verfügbar', 'size' => 'Größe', + 'user_shop_name' => 'Shop Name', + 'user_shop_active' => 'Nutzungsbedinungen', + ], ]; diff --git a/resources/lang/vendor/profanity/en/profanity.php b/resources/lang/vendor/profanity/en/profanity.php new file mode 100644 index 0000000..136ec75 --- /dev/null +++ b/resources/lang/vendor/profanity/en/profanity.php @@ -0,0 +1,81 @@ + diff --git a/resources/views/admin/lead_edit.blade.php b/resources/views/admin/lead_edit.blade.php new file mode 100644 index 0000000..4d0cca8 --- /dev/null +++ b/resources/views/admin/lead_edit.blade.php @@ -0,0 +1,43 @@ +@extends('layouts.layout-2') + +@section('content') + + @if ($errors->any()) +
+
+
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+
+
+ @endif + +

+ {{ __('Create/Edit Contact') }} +

+ + {!! Form::open(['url' => route('admin_lead_store'), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!} + + + @include('user.form') + + @if(!$user->id || $user->id == 'new') + @include('user.data_verify') + @endif + + +
+   + + {{ __('abort') }} +
+ + + {!! Form::close() !!} + + +@endsection \ No newline at end of file diff --git a/resources/views/admin/leads.blade.php b/resources/views/admin/leads.blade.php new file mode 100644 index 0000000..e868565 --- /dev/null +++ b/resources/views/admin/leads.blade.php @@ -0,0 +1,105 @@ +@extends('layouts.layout-2') + +@section('content') + + +

+ {{ __('Contacts') }} +

+ +
+
+
+ {{__('create new Contact')}} +
+ + + + + + + + + + + + + + + + + +
#{{__('E-Mail')}}{{__('Vorname')}}{{__('Nachname')}}{{__('verifiziert')}}{{__('freigegeben')}}{{__('Einv.-Erkl.')}}
+
+ {{__('create new Contact')}} +
+
+
+ + +@endsection + + + + +*/?> + diff --git a/resources/views/admin/product/edit.blade.php b/resources/views/admin/product/edit.blade.php index b7ece72..934341a 100755 --- a/resources/views/admin/product/edit.blade.php +++ b/resources/views/admin/product/edit.blade.php @@ -16,7 +16,7 @@ @endif -

+

{{ __('Create/Edit Produkt') }}

diff --git a/resources/views/admin/user_edit.blade.php b/resources/views/admin/user_edit.blade.php index 0b5d719..f42053e 100644 --- a/resources/views/admin/user_edit.blade.php +++ b/resources/views/admin/user_edit.blade.php @@ -16,7 +16,7 @@ @endif -

+

{{ __('Create/Edit Contact') }}

diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php index b5ecb5f..06f30fe 100644 --- a/resources/views/admin/users.blade.php +++ b/resources/views/admin/users.blade.php @@ -3,7 +3,7 @@ @section('content') -

+

{{ __('User') }}

diff --git a/resources/views/emails/_auth.blade.php b/resources/views/emails/_auth.blade.php index ae573b1..8a0712e 100644 --- a/resources/views/emails/_auth.blade.php +++ b/resources/views/emails/_auth.blade.php @@ -4,7 +4,7 @@ - mein STERN TOURS + mivita @@ -106,14 +110,17 @@ + + + + + - - - + @@ -128,8 +135,241 @@ $(document).ready(function() { $('.summernote').summernote({ height: 140, - lang: 'de-DE' + lang: 'de-DE', }); + + $('.summernote-small').summernote({ + height: 140, + lang: 'de-DE', + toolbar: [ + // [groupName, [list of button]] + ['style', ['style']], + ['style', ['bold', 'italic', 'underline', 'clear']], + ['fontsize', ['fontsize']], + ['color', ['color']], + ['para', ['ul', 'ol', 'paragraph']], + ['height', ['height']] + ] + }); + }); + + + + diff --git a/resources/views/layouts/includes/layout-sidenav.blade.php b/resources/views/layouts/includes/layout-sidenav.blade.php index c3772f9..08d1e64 100755 --- a/resources/views/layouts/includes/layout-sidenav.blade.php +++ b/resources/views/layouts/includes/layout-sidenav.blade.php @@ -12,11 +12,18 @@
{{__('Home')}}
 + @if(Auth::user()->active == 1)
  • {{ __('Your Data') }}
    • +
  • +
    {{ __('Your Shop') }}
     +
    • + + @endif + @if(Auth::user()->isAdmin())
  • ADMIN
    • @@ -40,7 +47,9 @@ - +
  • +
    {{ __('Leads') }}
     +
  • diff --git a/resources/views/legal/shop_term_of_use.blade.php b/resources/views/legal/shop_term_of_use.blade.php new file mode 100755 index 0000000..2b6ba63 --- /dev/null +++ b/resources/views/legal/shop_term_of_use.blade.php @@ -0,0 +1,36 @@ +@extends('layouts.auth') + +@section('content') + + + + +
    +
    + +
    + +
    + +
    + {{__('back')}} + + +
    +
    +
    + mivita.care +
    +
    +
    + + @include('legal.shop_term_of_use_de) + + {{__('back')}} + +
    +
    +
    +
    + +@endsection \ No newline at end of file diff --git a/resources/views/legal/shop_term_of_use_de.blade.php b/resources/views/legal/shop_term_of_use_de.blade.php new file mode 100644 index 0000000..f92f20c --- /dev/null +++ b/resources/views/legal/shop_term_of_use_de.blade.php @@ -0,0 +1,15 @@ +
    + +

    Nutzungsbedingungen

    + +
    + +
    + +

    Nutzungsbedingungen ...

    + + +
    +
    + +
    diff --git a/resources/views/status/not_found.blade.php b/resources/views/status/not_found.blade.php new file mode 100755 index 0000000..789b6e8 --- /dev/null +++ b/resources/views/status/not_found.blade.php @@ -0,0 +1,39 @@ +@extends('layouts.layout-2') + +@section('content') +
    +
    + + +
    +
    + +
    + + + +
    + +

    {{ __('Your registration has already been completed.') }}

    + {{ __('go to login') }} + {{ __('create new password') }} +
    + {{ __('back to the homepage') }} + +
    +
    + + +
    +
    + +@endsection + + diff --git a/resources/views/status/status_error.blade.php b/resources/views/status/status_error.blade.php new file mode 100755 index 0000000..d6d7163 --- /dev/null +++ b/resources/views/status/status_error.blade.php @@ -0,0 +1,36 @@ +@extends('layouts.layout-2') + +@section('content') +
    +
    + + +
    +
    + +
    + + + +
    + +

    {{ __('Page not available') }}

    + + {{ __('back to the homepage') }} + +
    +
    + + +
    +
    + +@endsection + diff --git a/resources/views/status/status_register.blade.php b/resources/views/status/status_register.blade.php new file mode 100755 index 0000000..b3c1f65 --- /dev/null +++ b/resources/views/status/status_register.blade.php @@ -0,0 +1,40 @@ +@extends('layouts.layout-2') + +@section('content') +
    +
    + + +
    +
    + +
    + + + +
    + +

    {{ __('Thank you for your registration!') }}

    +

    {{ __('We have sent you an e-mail with a link to activate your data.') }}

    + + {{ __('back to the homepage') }} + +
    +
    + + +
    +
    + +@endsection + + + + diff --git a/resources/views/status/status_verify.blade.php b/resources/views/status/status_verify.blade.php new file mode 100755 index 0000000..de176b0 --- /dev/null +++ b/resources/views/status/status_verify.blade.php @@ -0,0 +1,38 @@ +@extends('layouts.layout-2') + +@section('content') +
    +
    + + +
    +
    + +
    + + + +
    + +

    {{ __('You have successfully verified your account!') }}

    +

    {{ __('Now check your data.') }}

    {{ __('to your data') }}

    +
    +

    {{ __('Now assign a password.') }}

    {{ __('create new password') }}

    +
    + {{ __('back to the homepage') }} + +
    +
    + + +
    +
    + +@endsection \ No newline at end of file diff --git a/resources/views/status/verify.blade.php b/resources/views/status/verify.blade.php new file mode 100755 index 0000000..39d790f --- /dev/null +++ b/resources/views/status/verify.blade.php @@ -0,0 +1,24 @@ +@extends('layouts.layout-2') + +@section('content') +
    +
    + + +
    +
    + +
    + +

    Your email address has been successfully confirmed.

    + + + +
    +
    + + +
    +
    + +@endsection \ No newline at end of file diff --git a/resources/views/user/components/user_shop_edit.blade.php b/resources/views/user/components/user_shop_edit.blade.php new file mode 100644 index 0000000..1814e21 --- /dev/null +++ b/resources/views/user/components/user_shop_edit.blade.php @@ -0,0 +1,98 @@ +
    +
    + + +
    +
    + + {!! Form::open(['url' => route('user_shop_store'), 'class' => 'form-horizontal', 'id'=>'']) !!} +
    + + + {{ Form::text('title', $user->shop->title, array('placeholder'=>__('shop_title'), 'class'=>'form-control', 'id'=>'title')) }} + {{ __('shop_title_help') }} +
    + +
    + + {{ Form::textarea('copy', $user->shop->copy , array('placeholder'=>__('shop_copy'), 'class'=>'form-control summernote-small', 'id'=>'copy')) }} + {{ __('shop_copy_help') }} +
    + +
    + + {{ Form::textarea('info', $user->shop->info , array('placeholder'=>__('shop_info'), 'class'=>'form-control summernote-small', 'id'=>'info')) }} + {{ __('shop_info_help') }} +
    + +
    +   +
    + {!! Form::close() !!} + +
    +
    + + + +
    + @include('user.components.user_shop_image') +
    + + +
    +
    + + +
    +
    {{ __('Shop details') }}
    +
      +
    • +
      {{ __('name') }}
      +
      + {{ $user->shop->name }} +
      +
      • +
    • +
      {{ __('Domain') }}
      + +
      • +
    • +
      {{ __('Status') }}
      +
      + @if($user->shop->getSubdomainStatus()) + {{ __('available') }} + @else + {{ __('not available') }} + @endif + +
      +
      • + @if(!$user->shop->getSubdomainStatus()) +
    • + {{ __('not available copy') }} +
      • + @endif +
    • +
      {{ __('active since') }}
      +
      + {{ $user->shop->getActiveDateFormat() }} +
      +
      • + +
    +
    + + + + +
    +
    + + diff --git a/resources/views/user/components/user_shop_image.blade.php b/resources/views/user/components/user_shop_image.blade.php new file mode 100755 index 0000000..30910fb --- /dev/null +++ b/resources/views/user/components/user_shop_image.blade.php @@ -0,0 +1,61 @@ + + + + +
    {{ __('shop image') }}
    {{ __('shop image copy') }} +
    +
    + +
    + + + @if($user->shop->isImage()) +
    +
    + +

    + Bild löschen +
    +
    + @else +
    +
    +
    +
    + @csrf +
    +
    + +
    + +
    + +
    +
    +
    +
    +
    + @endif +
    +
    \ No newline at end of file diff --git a/resources/views/user/components/user_shop_register.blade.php b/resources/views/user/components/user_shop_register.blade.php new file mode 100644 index 0000000..f850ca1 --- /dev/null +++ b/resources/views/user/components/user_shop_register.blade.php @@ -0,0 +1,68 @@ +
    +

    {{ __('open your shop') }}

    + + {!! Form::open(['url' => route('user_shop_register_form'), 'class' => 'form-horizontal' , 'id'=>'data-shop-form-validations']) !!} + @php + $shop_name_btn_color = 'btn-secondary'; + $shop_name_fa = ''; + $shop_name_form_control = ''; + @endphp + @if(Session::has('shop-name-error')) + @if(Session::get('shop-name-error') == 'check') + @php + $shop_name_btn_color = 'btn-success'; + $shop_name_fa = 'fa-check'; + $shop_name_form_control = ' is-valid'; + @endphp + + @endif + @if(Session::get('shop-name-error') == 'error') + @php + $shop_name_btn_color = 'btn-danger'; + $shop_name_fa = 'fa-times'; + $shop_name_form_control = ' is-invalid'; + @endphp + @endif + @endif + + +
    +
    +
    + {{ Form::text('user_shop_name', old('user_shop_name'), array('placeholder'=>__('Your Shop Name'), 'class'=>'form-control'.$shop_name_form_control.($errors->has('user_shop_name') ? ' is-invalid' : ''), 'id'=>'user_shop_name', 'tabindex' => 2)) }} + + + +
    + @if ($errors->has('user_shop_name')) + + {{ $errors->first('user_shop_name') }} + + @endif +

    {{__('shop_name_description')}}

    + +
    +
    +
    + + @if ($errors->has('user_shop_active')) + + {{ $errors->first('user_shop_active') }} + + @endif +
    +
    +
    +   + +
    + + {!! Form::close() !!} + +
    diff --git a/resources/views/user/data_confirm.blade.php b/resources/views/user/data_confirm.blade.php new file mode 100644 index 0000000..dfddad0 --- /dev/null +++ b/resources/views/user/data_confirm.blade.php @@ -0,0 +1,20 @@ +
    +
    + {{ __('Einwilligung & Datenschutz') }} +
    +
    +
    + +
    + +
    + +
    +
    +
    \ No newline at end of file diff --git a/resources/views/user/data_verify.blade.php b/resources/views/user/data_verify.blade.php new file mode 100644 index 0000000..3bc8a30 --- /dev/null +++ b/resources/views/user/data_verify.blade.php @@ -0,0 +1,14 @@ +
    +
    + {{ __('Kontakt verifizieren') }} +
    +
    +
    + +
    +
    +
    + diff --git a/resources/views/user/edit.blade.php b/resources/views/user/edit.blade.php index 2668364..9a148cf 100644 --- a/resources/views/user/edit.blade.php +++ b/resources/views/user/edit.blade.php @@ -16,7 +16,7 @@ @endif -

    +

    {{ __('Your Data') }}

    @@ -24,7 +24,7 @@ {!! Form::open(['url' => route('user_edit'), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!} - {{-- @include('user.form') --}} + @include('user.form')
      diff --git a/resources/views/user/form.blade.php b/resources/views/user/form.blade.php index 59569cd..488d21c 100644 --- a/resources/views/user/form.blade.php +++ b/resources/views/user/form.blade.php @@ -77,28 +77,12 @@
    -
    -
    - {{ __('Industry') }} -
    -
    -
    - {!! HTMLHelper::getIndustrySectorForHTML($user->account->getUserIndustrySectorIds()) !!} -
    -
    -
    - {{ __('Your Data') }} + {{ __('Personal Data') }}
    - -
    - - {{ Form::text('position_text', $user->account->position_text, array('placeholder'=>__('Function'), 'class'=>'form-control', 'id'=>'position_text', 'tabindex' => 9)) }} -
    -
    @@ -169,7 +153,7 @@
    - {{ Form::text('phone', $user->account->phone, array('placeholder'=>__('Mobile Phone'), 'class'=>'form-control', 'id'=>'phone', 'tabindex' => 18)) }} + {{ Form::text('phone', $user->account->phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'phone', 'tabindex' => 18)) }}
    @@ -205,11 +189,11 @@ @if(count($user->user_update_email) > 0)

    {{ $user->user_update_email->first()->email }} {{__('waiting for activation since')}} | {{ $user->user_update_email->first()->created_at->format('d.m.Y H:i') }}


    @endif - {{ __('Contact') }} {{__('Change E-Mail')}} + {{ __('Contact') }} {{__('Change E-Mail')}} @else - {{__('Change E-Mail')}} + {{__('Change E-Mail')}} @endif @@ -229,24 +213,47 @@
    -
    +
    - {{ __('Your interests') }} + {{ __('weiteres') }}
    -
    - {!! HTMLHelper::getIntereststForHTML($user->account->getUserInterestIds()) !!} + + +
    +
    + + {{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'class'=>'form-control datepicker-birthday')) }} +
    + +
    + + {{ Form::text('website', $user->account->website, array('placeholder'=>__('website'), 'class'=>'form-control', 'id'=>'website')) }} + +
    +
    + + {{ Form::text('instagram', $user->account->instagram, array('placeholder'=>__('instagram'), 'class'=>'form-control', 'id'=>'instagram')) }} + +
    +
    + +
    +
    + + {{ Form::text('facebook', $user->account->facebook, array('placeholder'=>__('facebook'), 'class'=>'form-control', 'id'=>'facebook')) }} + +
    +
    + + {{ Form::text('facebook_fanpage', $user->account->facebook_fanpage, array('placeholder'=>__('facebook_fanpage'), 'class'=>'form-control', 'id'=>'facebook_fanpage')) }} + +
    + +
    + + +
    - -
    -
    - {{ __('Your contact at JACKON') }} -
    -
    -
    - {{ Form::text('contactpartner', $user->account->contactpartner, array('placeholder'=>__('Name'), 'class'=>'form-control', 'id'=>'contactpartner', 'tabindex' => 22)) }} -
    -
    -
    \ No newline at end of file diff --git a/resources/views/user/shop.blade.php b/resources/views/user/shop.blade.php new file mode 100644 index 0000000..99ae167 --- /dev/null +++ b/resources/views/user/shop.blade.php @@ -0,0 +1,29 @@ +@extends('layouts.layout-2') + +@section('content') + + {{-- @if ($errors->any()) +
    +
    +
    +
      + @foreach ($errors->all() as $error) +
    • {{ $error }}
      • + @endforeach +
    +
    +
    +
    + @endif +--}} +

    + {{ __('Your Shop') }} +

    + + @if($user->shop) + @include('user.components.user_shop_edit') + @else + @include('user.components.user_shop_register') + @endif + +@endsection diff --git a/routes/web.php b/routes/web.php index be314a5..ec6b1f7 100755 --- a/routes/web.php +++ b/routes/web.php @@ -12,19 +12,32 @@ */ +Route::get('storage/images/{from}/{slug}', function($from = null, $slug = null) { + if ($from == 'shop'){ + $image = \App\Models\UserShop::where('filename', $slug)->first(); + $path = storage_path('app/public').'/images/shop'.'/'.$image->filename; -Route::domain('mivita.local')->group(function () { - -Route::get('/', 'Web\SiteController@index')->name('/'); - -Route::get('product/image/{slug}', function($slug = null) -{ - $image = \App\Models\ProductImage::where('slug', $slug)->first(); - $path = storage_path('app/public').'/images/product'.'/'.$image->product_id.'/'.$image->filename; + } if (file_exists($path)) { return Response::file($path); } -})->name('product_image'); +})->name('storage_images'); + + + + +Route::domain('mivita.local')->group(function () { + + Route::get('/', 'Web\SiteController@index')->name('/'); + + Route::get('product/image/{slug}', function($slug = null) + { + $image = \App\Models\ProductImage::where('slug', $slug)->first(); + $path = storage_path('app/public').'/images/product'.'/'.$image->product_id.'/'.$image->filename; + if (file_exists($path)) { + return Response::file($path); + } + })->name('product_image'); Route::get('/card/add/{id}/{quantity?}/{product_slug?}', 'Web\CardController@addToCardGet')->name('card_add_get'); @@ -43,10 +56,6 @@ Route::get('product/image/{slug}', function($slug = null) Route::get('/{site}/{subsite?}/{product_slug?}', 'Web\SiteController@site')->name('site'); - - - - }); /* ROUTING FOR CRM / CMS*/ @@ -73,6 +82,14 @@ Route::domain('mein.mivita.local')->group(function () { Route::post('/loading/modal', 'HomeController@loadingModal')->name('loading_modal'); Route::get('/', 'HomeController@index')->name('home'); Route::get('/user/update_email_confirm/{token}', 'UserUpdateEmailController@activateMail')->name('user_update_email_confirm'); + Route::post('/user/check/mail', 'HomeController@checkMail')->name('user_check_mail'); + + Route::get('/register/verify/{confirmationCode}', 'HomeController@verify')->name('register_verify'); + + Route::get('/status/register', 'HomeController@statusRegister')->name('status_register'); + Route::get('/status/verify', 'HomeController@statusVerify')->name('status_verify'); + Route::get('/status/error', 'HomeController@statusError')->name('status_error'); + Route::get('/status/not/found', 'HomeController@notFound')->name('not_found'); Route::group(['middleware' => ['auth']], function() @@ -97,6 +114,7 @@ Route::domain('mein.mivita.local')->group(function () { */ Route::get('/user/edit', 'UserDataController@userEdit')->name('user_edit'); Route::post('/user/edit', 'UserDataController@userEditStore')->name('user_edit'); + Route::post('/user/data/store', 'UserDataController@userDataStore')->name('user_data_store'); Route::get('/user/update_password', 'UserUpdatePasswordController@updatePassword')->name('user_update_password'); @@ -113,9 +131,15 @@ Route::domain('mein.mivita.local')->group(function () { Route::post('/user/data/accepted/form', 'UserDataController@userDataAcceptedForm')->name('user_data_accepted_form'); + Route::get('/user/data/free', 'UserDataController@userDataFree')->name('user_data_free'); + Route::post('/user/data/free/form', 'UserDataController@userDataFreeForm')->name('user_data_free_form'); - - + Route::get('/user/shop', 'UserShopController@index')->name('user_shop'); + Route::post('/user/shop/store', 'UserShopController@store')->name('user_shop_store'); + Route::post('/user/shop/register/form', 'UserShopController@userShopRegisterForm')->name('user_shop_register_form'); + Route::post('/user/shop/name/check', 'UserShopController@checkUserShopName')->name('user_shop_name_check'); + Route::post('/user/shop/upload/image', 'UserShopController@uploadImage')->name('user_shop_upload_image'); + Route::get('/user/shop/delete/image', 'UserShopController@deleteImage')->name('user_shop_delete_image'); }); @@ -150,6 +174,17 @@ Route::domain('mein.mivita.local')->group(function () { //Route::get('/admin/products/import', 'ImportProductController@import')->name('admin_product_import'); + //leads + Route::get('datatables/leads', 'DataTableController@getLeads')->name('datatables-leads'); + + Route::get('/admin/leads', 'LeadController@index')->name('admin_leads'); + Route::get('/admin/lead/edit/{id}', 'LeadController@edit')->name('admin_lead_edit'); + + Route::get('/admin/lead/change_mail/{id}', 'UserUpdateEmailController@adminChangeMail')->name('admin_lead_change_mail'); + Route::post('/admin/lead/change_mail/{id}', 'UserUpdateEmailController@adminUpdateMail')->name('admin_lead_change_mail'); + + Route::post('/admin/lead/store', 'LeadController@store')->name('admin_lead_store'); +