diff --git a/.gitignore b/.gitignore index 492e3c3..f681820 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ /storage/*.key /vendor /modules -/public .env .phpunit.result.cache Homestead.json diff --git a/app/CorePackages/Models/VAModel.php b/app/CorePackages/Models/VAModel.php new file mode 100644 index 0000000..14eff4c --- /dev/null +++ b/app/CorePackages/Models/VAModel.php @@ -0,0 +1,17 @@ +attributes); + } + +} diff --git a/app/CorePackages/RelatedToUser.php b/app/CorePackages/RelatedToUser.php new file mode 100644 index 0000000..30bc430 --- /dev/null +++ b/app/CorePackages/RelatedToUser.php @@ -0,0 +1,23 @@ +user_id = 116; + }); + } + +} diff --git a/app/CorePackages/Resources/UserResource.php b/app/CorePackages/Resources/UserResource.php new file mode 100644 index 0000000..2ed115c --- /dev/null +++ b/app/CorePackages/Resources/UserResource.php @@ -0,0 +1,23 @@ + $this->id, + 'name' => $this->name, + ]; + } +} diff --git a/app/CorePackages/Scopes/RelatedToVirtualActivity.php b/app/CorePackages/Scopes/RelatedToVirtualActivity.php new file mode 100644 index 0000000..c460c8b --- /dev/null +++ b/app/CorePackages/Scopes/RelatedToVirtualActivity.php @@ -0,0 +1,27 @@ +business_id = request()->business_id; + $model->user_id = 116; + }); + } + +} diff --git a/app/CorePackages/VirtualActivity/VirtualActivityServiceProvider.php b/app/CorePackages/VirtualActivity/VirtualActivityServiceProvider.php index 82e38e8..d42a284 100644 --- a/app/CorePackages/VirtualActivity/VirtualActivityServiceProvider.php +++ b/app/CorePackages/VirtualActivity/VirtualActivityServiceProvider.php @@ -3,29 +3,54 @@ namespace App\CorePackages\VirtualActivity; use Illuminate\Support\ServiceProvider; +use Illuminate\Support\Str; +use Illuminate\Support\Facades\Route; +use Illuminate\Support\Facades\Validator; + + use App\Business; class VirtualActivityServiceProvider extends ServiceProvider { - protected $defer = true; + public function boot() + { + Validator::extend('exists_va', function ($attribute, $value, $parameters, $validator) { + $table = $parameters[0]; + $column = $parameters[1]; + + return \DB::table($table) + ->where($column, $value) + ->where('business_id', request()->business_id) + ->count() > 0; + }); + } public function register() { + $this->app->singleton(Business::class, function () { return VirtualActivityFinder::fetch(); }); - } + $this->registerHandler(); + } - /** - * Get the services provided by the provider. - * - * @return array - */ - public function provides() + protected function registerHandler() { - return [Business::class]; + + Route::macro('handler', function ($prefix) { + $singular = Str::singular($prefix); + Route::group([ + 'namespace' => $singular + ], function () use ($prefix, $singular) { + Route::get($prefix, 'Index' . $singular); + Route::post($prefix , 'Store' . $singular); + Route::put($prefix . '/{' . $singular . '}', 'Update' . $singular); + Route::delete($prefix . '/{' . $singular . '}', 'Destroy' . $singular); + Route::get($prefix . '/{' . $singular . '}', 'Show' . $singular); + }); + }); } } diff --git a/app/User.php b/app/User.php index 95e82fa..65f21a0 100644 --- a/app/User.php +++ b/app/User.php @@ -13,8 +13,8 @@ use Carbon\Carbon; class User extends Authenticatable { - use Notifiable, HasRoles, HasApiTokens; - use GetDateAttributesTrait; + // use Notifiable, HasRoles, HasApiTokens; + // use GetDateAttributesTrait; /** diff --git a/composer.json b/composer.json index ff8d4b2..b2012e3 100755 --- a/composer.json +++ b/composer.json @@ -12,9 +12,11 @@ "fideloper/proxy": "^4.0", "laravel/framework": "5.8.*", "laravel/tinker": "^1.0", + "mll-lab/laravel-graphql-playground": "^1.1", + "nuwave/lighthouse": "^3.7", "nwidart/laravel-modules": "^4.0", - "wm/crm": "dev-master", - "wm/task": "dev-master" + "wm/common": "dev-master", + "wm/crm": "dev-master" }, "require-dev": { "beyondcode/laravel-dump-server": "^1.0", @@ -68,9 +70,9 @@ "type": "path", "url": "./modules/wm-crm" }, - { + { "type": "path", - "url": "./modules/wm-task" + "url": "./modules/wm-common" } ] } diff --git a/composer.lock b/composer.lock index 5d46381..95e0179 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f8eaf468e405e51c383538dcb6fc1a9b", + "content-hash": "d86f9d77233258bb5257d1a5bdda9258", "packages": [ { "name": "dnoegel/php-xdg-base-dir", @@ -467,16 +467,16 @@ }, { "name": "laravel/framework", - "version": "v5.8.26", + "version": "v5.8.27", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "1d8ec9afdedc79314c18715056b8143d7e1fac31" + "reference": "f1dccffb96f614895393e27e4667105a05407af5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/1d8ec9afdedc79314c18715056b8143d7e1fac31", - "reference": "1d8ec9afdedc79314c18715056b8143d7e1fac31", + "url": "https://api.github.com/repos/laravel/framework/zipball/f1dccffb96f614895393e27e4667105a05407af5", + "reference": "f1dccffb96f614895393e27e4667105a05407af5", "shasum": "" }, "require": { @@ -610,7 +610,7 @@ "framework", "laravel" ], - "time": "2019-06-25T16:20:51+00:00" + "time": "2019-07-02T13:43:47+00:00" }, { "name": "laravel/tinker", @@ -759,6 +759,58 @@ ], "time": "2019-06-18T20:09:29+00:00" }, + { + "name": "mll-lab/laravel-graphql-playground", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/mll-lab/laravel-graphql-playground.git", + "reference": "8b238625a0e432746ddada9ae87406e7cfdc326b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mll-lab/laravel-graphql-playground/zipball/8b238625a0e432746ddada9ae87406e7cfdc326b", + "reference": "8b238625a0e432746ddada9ae87406e7cfdc326b", + "shasum": "" + }, + "require": { + "laravel/framework": ">=5.1.0", + "php": ">=7" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.12" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "MLL\\GraphQLPlayground\\GraphQLPlaygroundServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "MLL\\GraphQLPlayground\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Benedikt Franke", + "email": "benedikt@franke.tech" + } + ], + "description": "Easily integrate GraphQL Playground into your Laravel project", + "keywords": [ + "graphql", + "graphql-playground", + "laravel" + ], + "time": "2019-07-05T12:09:26+00:00" + }, { "name": "monolog/monolog", "version": "1.24.0", @@ -948,6 +1000,91 @@ ], "time": "2019-05-25T20:07:01+00:00" }, + { + "name": "nuwave/lighthouse", + "version": "v3.7.0", + "source": { + "type": "git", + "url": "https://github.com/nuwave/lighthouse.git", + "reference": "cb0627424cd7028ddd1c3bf09be22fb6e84b1af4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nuwave/lighthouse/zipball/cb0627424cd7028ddd1c3bf09be22fb6e84b1af4", + "reference": "cb0627424cd7028ddd1c3bf09be22fb6e84b1af4", + "shasum": "" + }, + "require": { + "ext-json": "*", + "illuminate/contracts": "5.5.*|5.6.*|5.7.*|5.8.*", + "illuminate/http": "5.5.*|5.6.*|5.7.*|5.8.*", + "illuminate/pagination": "5.5.*|5.6.*|5.7.*|5.8.*", + "illuminate/routing": "5.5.*|5.6.*|5.7.*|5.8.*", + "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*", + "illuminate/validation": "5.5.*|5.6.*|5.7.*|5.8.*", + "opis/closure": "^3.0", + "php": ">= 7.1", + "webonyx/graphql-php": "^0.13" + }, + "require-dev": { + "bensampo/laravel-enum": "^1.19", + "laravel/lumen-framework": "5.5.*|5.6.*|5.7.*|5.8.*", + "laravel/scout": "^4.0", + "mll-lab/graphql-php-scalars": "^2.1", + "mockery/mockery": "^1.0", + "orchestra/database": "3.5.*|3.6.*|3.7.*|3.8.x-dev", + "orchestra/testbench": "3.5.*|3.6.*|3.7.*|3.8.*", + "phpbench/phpbench": "@dev", + "pusher/pusher-php-server": "^3.2" + }, + "suggest": { + "bensampo/laravel-enum": "Convenient enum definitions that can easily be registered in your Schema", + "laravel/scout": "Required for the @search directive", + "mll-lab/graphql-php-scalars": "Useful scalar types, required for @whereConstraints", + "mll-lab/laravel-graphql-playground": "GraphQL IDE for better development workflow - integrated with Laravel" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Nuwave\\Lighthouse\\LighthouseServiceProvider" + ], + "aliases": { + "graphql": "Nuwave\\Lighthouse\\GraphQL" + } + } + }, + "autoload": { + "psr-4": { + "Nuwave\\Lighthouse\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christopher Moore", + "email": "chris@nuwavecommerce.com", + "homepage": "https://www.nuwavecommerce.com" + }, + { + "name": "Benedikt Franke", + "email": "benedikt@franke.tech", + "homepage": "https://franke.tech" + } + ], + "description": "Lighthouse is a schema first GraphQL package for Laravel applications.", + "homepage": "https://lighthouse-php.com", + "keywords": [ + "api", + "graphql", + "laravel", + "laravel-graphql" + ], + "time": "2019-05-27T07:10:46+00:00" + }, { "name": "nwidart/laravel-modules", "version": "4.1.0", @@ -2946,17 +3083,68 @@ "time": "2019-06-15T22:40:20+00:00" }, { - "name": "wm/crm", + "name": "webonyx/graphql-php", + "version": "v0.13.5", + "source": { + "type": "git", + "url": "https://github.com/webonyx/graphql-php.git", + "reference": "cdcf5b44737ee743358f5ed25b19a39ad7daf777" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/cdcf5b44737ee743358f5ed25b19a39ad7daf777", + "reference": "cdcf5b44737ee743358f5ed25b19a39ad7daf777", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "php": "^7.1||^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^6.0", + "phpbench/phpbench": "^0.14.0", + "phpstan/phpstan": "^0.11.4", + "phpstan/phpstan-phpunit": "^0.11.0", + "phpstan/phpstan-strict-rules": "^0.11.0", + "phpunit/phpcov": "^5.0", + "phpunit/phpunit": "^7.2", + "psr/http-message": "^1.0", + "react/promise": "2.*" + }, + "suggest": { + "psr/http-message": "To use standard GraphQL server", + "react/promise": "To leverage async resolving on React PHP platform" + }, + "type": "library", + "autoload": { + "psr-4": { + "GraphQL\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A PHP port of GraphQL reference implementation", + "homepage": "https://github.com/webonyx/graphql-php", + "keywords": [ + "api", + "graphql" + ], + "time": "2019-06-12T07:16:37+00:00" + }, + { + "name": "wm/common", "version": "dev-master", "dist": { "type": "path", - "url": "./modules/wm-crm", - "reference": "fd0bb206f007227d4d257deb6799fec274cfebc5" + "url": "./modules/wm-common", + "reference": "abe6be64f1e0a969b328b76416200cac8cdf2421" }, "require": { "illuminate/support": "5.8.*", - "php": "^7.1.3", - "wm/task": "dev-master" + "php": "^7.1.3" }, "require-dev": { "orchestra/testbench": "~3.6.0", @@ -2966,36 +3154,37 @@ "extra": { "laravel": { "providers": [ - "WM\\CRM\\CrmServiceProvider" + "WM\\Common\\CommonServiceProvider" ] } }, "autoload": { "psr-4": { - "WM\\CRM\\": "src/" + "WM\\Common\\": "src/" } }, "autoload-dev": { "psr-4": { - "WM\\CRM\\Tests\\": "tests/" + "WM\\Common\\Tests\\": "tests/" } }, "license": [ "MIT" ], - "description": "client relationship management" + "description": "manage common information in willamall" }, { - "name": "wm/task", + "name": "wm/crm", "version": "dev-master", "dist": { "type": "path", - "url": "./modules/wm-task", - "reference": "1d75a3a4ac879e59e62b9f19fb6d32222e13d271" + "url": "./modules/wm-crm", + "reference": "217fb2b641004848a0bb7a6ff39f0e5b5b6db550" }, "require": { "illuminate/support": "5.8.*", - "php": "^7.1.3" + "php": "^7.1.3", + "wm/common": "dev-master" }, "require-dev": { "orchestra/testbench": "~3.6.0", @@ -3005,24 +3194,24 @@ "extra": { "laravel": { "providers": [ - "WM\\Task\\TaskServiceProvider" + "WM\\CRM\\CrmServiceProvider" ] } }, "autoload": { "psr-4": { - "WM\\Task\\": "src/" + "WM\\CRM\\": "src/" } }, "autoload-dev": { "psr-4": { - "WM\\Task\\Tests\\": "tests/" + "WM\\CRM\\Tests\\": "tests/" } }, "license": [ "MIT" ], - "description": "task management" + "description": "client relationship management" } ], "packages-dev": [ @@ -3145,16 +3334,16 @@ }, { "name": "filp/whoops", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33" + "reference": "6fb502c23885701a991b0bba974b1a8eb6673577" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/1a1a1044ad00e285bd2825fac4c3a0443d90ad33", - "reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33", + "url": "https://api.github.com/repos/filp/whoops/zipball/6fb502c23885701a991b0bba974b1a8eb6673577", + "reference": "6fb502c23885701a991b0bba974b1a8eb6673577", "shasum": "" }, "require": { @@ -3202,7 +3391,7 @@ "throwable", "whoops" ], - "time": "2019-06-23T09:00:00+00:00" + "time": "2019-07-04T09:00:00+00:00" }, { "name": "fzaninotto/faker", @@ -4793,8 +4982,8 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "wm/crm": 20, - "wm/task": 20 + "wm/common": 20, + "wm/crm": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/graphql/schema.graphql b/graphql/schema.graphql new file mode 100644 index 0000000..4c9db0e --- /dev/null +++ b/graphql/schema.graphql @@ -0,0 +1,18 @@ +"A datetime string with format `Y-m-d H:i:s`, e.g. `2018-01-01 13:00:00`." +scalar DateTime @scalar(class: "Nuwave\\Lighthouse\\Schema\\Types\\Scalars\\DateTime") + +"A date string with format `Y-m-d`, e.g. `2011-05-23`." +scalar Date @scalar(class: "Nuwave\\Lighthouse\\Schema\\Types\\Scalars\\Date") + +type Query { + users: [User!]! @paginate(type: "paginator" model: "App\\User") + user(id: ID @eq): User @find(model: "App\\User") +} + +type User { + id: ID! + name: String! + email: String! + created_at: DateTime! + updated_at: DateTime! +} diff --git a/package-lock.json b/package-lock.json index 152937b..aeaa9d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4168,8 +4168,8 @@ "dev": true, "optional": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "delegates": "1.0.0", + "readable-stream": "2.3.6" } }, "balanced-match": { @@ -4182,7 +4182,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -4219,7 +4219,7 @@ "dev": true, "optional": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.1" } }, "deep-extend": { @@ -4246,7 +4246,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.5" } }, "fs.realpath": { @@ -4261,14 +4261,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" } }, "glob": { @@ -4277,12 +4277,12 @@ "dev": true, "optional": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "has-unicode": { @@ -4297,7 +4297,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } }, "ignore-walk": { @@ -4306,7 +4306,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "^3.0.4" + "minimatch": "3.0.4" } }, "inflight": { @@ -4315,8 +4315,8 @@ "dev": true, "optional": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -4335,7 +4335,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "isarray": { @@ -4349,7 +4349,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -4362,8 +4362,8 @@ "bundled": true, "dev": true, "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" + "safe-buffer": "5.1.2", + "yallist": "3.0.3" } }, "minizlib": { @@ -4372,7 +4372,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.5" } }, "mkdirp": { @@ -4395,9 +4395,9 @@ "dev": true, "optional": true, "requires": { - "debug": "^4.1.0", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" + "debug": "4.1.1", + "iconv-lite": "0.4.24", + "sax": "1.2.4" } }, "node-pre-gyp": { @@ -4406,16 +4406,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.3.0", + "nopt": "4.0.1", + "npm-packlist": "1.4.1", + "npmlog": "4.1.2", + "rc": "1.2.8", + "rimraf": "2.6.3", + "semver": "5.7.0", + "tar": "4.4.8" } }, "nopt": { @@ -4424,8 +4424,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "abbrev": "1.1.1", + "osenv": "0.1.5" } }, "npm-bundled": { @@ -4440,8 +4440,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.6" } }, "npmlog": { @@ -4450,10 +4450,10 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "number-is-nan": { @@ -4472,7 +4472,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "os-homedir": { @@ -4493,8 +4493,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "path-is-absolute": { @@ -4515,10 +4515,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" + "deep-extend": "0.6.0", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" }, "dependencies": { "minimist": { @@ -4535,13 +4535,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "rimraf": { @@ -4550,7 +4550,7 @@ "dev": true, "optional": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.3" } }, "safe-buffer": { @@ -4593,9 +4593,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string_decoder": { @@ -4604,7 +4604,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "strip-ansi": { @@ -4612,7 +4612,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-json-comments": { @@ -4627,13 +4627,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "chownr": "1.1.1", + "fs-minipass": "1.2.5", + "minipass": "2.3.5", + "minizlib": "1.2.1", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.3" } }, "util-deprecate": { @@ -4648,7 +4648,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "^1.0.2 || 2" + "string-width": "1.0.2" } }, "wrappy": { diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 7467bec..9aad1be 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,6 +1,6 @@ { "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=584db8725dd8389d6625", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=0e81b96017453da3c794", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=2f242135595b1577d684", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=7f8c0f6c06ca056c472e" + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=5581ac535fe1434a081f", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=6028674e5182710b33b4", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=89942bc60ced76a57b43" } diff --git a/resources/js/Common/components/Contact/SMS/Send.vue b/resources/js/Common/components/Contact/SMS/Send.vue index 336839b..d367349 100644 --- a/resources/js/Common/components/Contact/SMS/Send.vue +++ b/resources/js/Common/components/Contact/SMS/Send.vue @@ -115,6 +115,7 @@ export default { scheduleDateState: false, scheduleTime: '12:00', scheduleTimeState: false, + Schedule: '', } } diff --git a/resources/js/Common/components/Task/Add.vue b/resources/js/Common/components/Task/Add.vue index 3c47b35..2311a0f 100644 --- a/resources/js/Common/components/Task/Add.vue +++ b/resources/js/Common/components/Task/Add.vue @@ -158,6 +158,7 @@ export default { taskRemindMethods: [' پیام کوتاه ', ' ایمیل '], taskRemindValues: [' پیام کوتاه ', ' ایمیل '], remindState: true, + Remind: '', } }