diff --git a/.gitignore b/.gitignore index 702909c..34cb938 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ bootstrap/compiled.php app/storage/ -storage/* +storage/ # Laravel 5 & Lumen specific public/storage @@ -37,6 +37,8 @@ Homestead.json # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 .idea/ .idea/vcs.xml +.idea/php.xml +.idea/willamall-admin.iml # User-specific stuff .idea/**/workspace.xml .idea/**/tasks.xml diff --git a/.idea/php.xml b/.idea/php.xml index ef9ce1f..e3a3a7f 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -127,31 +127,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -166,9 +141,10 @@ + + - diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 283c7e7..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,23 +2,5 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/willamall-admin.iml b/.idea/willamall-admin.iml index 525da30..fb21e09 100644 --- a/.idea/willamall-admin.iml +++ b/.idea/willamall-admin.iml @@ -136,10 +136,11 @@ + - \ No newline at end of file + diff --git a/composer.json b/composer.json index 922b866..0e907a9 100644 --- a/composer.json +++ b/composer.json @@ -21,13 +21,13 @@ "wm/common": "dev-master", "wm/core": "dev-master", "wm/crm": "dev-master", - "wm/finance": "dev-dev", - "wm/store": "dev-master", - "wm/product": "dev-master", - "wm/service": "dev-master", - "wm/warehouse": "dev-dev", "wm/portfolio": "dev-master", + "wm/product": "dev-master", "wm/reservation": "dev-master", + "wm/service": "dev-master", + "wm/store": "dev-master", + "wm/warehouse": "dev-master", + "wm/webbuilder": "dev-master", "zircote/swagger-php": "^3.0" }, "require-dev": { @@ -101,10 +101,6 @@ "type": "path", "url": "./modules/wm-portfolio" }, - { - "type": "path", - "url": "./modules/wm-finance" - }, { "type": "path", "url": "./modules/wm-product" @@ -117,9 +113,17 @@ "type": "path", "url": "./modules/wm-store" }, + { + "type": "path", + "url": "./modules/wm-finance" + }, { "type": "path", "url": "./modules/wm-warehouse" + }, + { + "type": "path", + "url": "./modules/wm-webbuilder" } ] } diff --git a/composer.lock b/composer.lock index d86f55d..c7513d4 100644 --- a/composer.lock +++ b/composer.lock @@ -6173,11 +6173,11 @@ }, { "name": "wm/finance", - "version": "dev-dev", + "version": "dev-master", "dist": { "type": "path", "url": "./modules/wm-finance", - "reference": "9766c16ef0b5af65b1cefee6eac9cf3fa7e2fdfd" + "reference": "2c904e26440283a10a9f683ee8d9d4a476f56e07" }, "require": { "php": "^7.1.3", @@ -6467,6 +6467,50 @@ ], "description": "Warehouse Management Service" }, + { + "name": "wm/webbuilder", + "version": "dev-master", + "dist": { + "type": "path", + "url": "./modules/wm-webbuilder", + "reference": "ed33448a0dac6531946e37d748853b3cccf7182a" + }, + "require": { + "php": "^7.2", + "wm/common": "dev-master", + "wm/core": "dev-master" + }, + "require-dev": { + "orchestra/testbench": "~3.6.0", + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "WM\\WebBuilder\\WebBuilderServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "WM\\WebBuilder\\": "src/" + }, + "classmap": [ + "database/seeds", + "database/factories" + ] + }, + "autoload-dev": { + "psr-4": { + "WM\\WebBuilder\\Tests\\": "tests/" + } + }, + "license": [ + "MIT" + ], + "description": "webbuilder relationship management" + }, { "name": "zendframework/zend-diactoros", "version": "2.2.1", @@ -8655,7 +8699,8 @@ "wm/reservation": 20, "wm/service": 20, "wm/store": 20, - "wm/warehouse": 20 + "wm/warehouse": 20, + "wm/webbuilder": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/jsconfig.json b/jsconfig.json index 95b2ace..827a4cc 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -13,9 +13,10 @@ "@Core/*": ["./modules/wm-core/resources/js/*"], "@User/*": ["./modules/wm-core/resources/js/Modules/User/*"], "@Auth/*": ["./modules/wm-core/resources/js/Modules/Authentication/*"], - "@Service/*": ["./modules/wm-core/resources/js/Modules/Service/*"], + "@Service/*": ["./modules/wm-service/resources/js/*"], + "@Product/*": ["./modules/wm-product/resources/js/*"], "@Blog/*": ["./modules/wm-blog/resources/js/*"] } }, "exclude": ["node_modules"] - } \ No newline at end of file + } diff --git a/package-lock.json b/package-lock.json index 36fe40d..bcba7c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1684,7 +1684,7 @@ }, "util": { "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, "requires": { @@ -1854,7 +1854,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true } @@ -4803,7 +4803,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true } @@ -9586,7 +9586,7 @@ }, "yargs": { "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "dev": true, "requires": { @@ -11007,7 +11007,7 @@ }, "sprintf-js": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "sshpk": { @@ -11299,7 +11299,7 @@ }, "strip-eof": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, @@ -11517,7 +11517,7 @@ }, "through": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, "thunky": { @@ -11672,7 +11672,7 @@ }, "tty-browserify": { "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "resolved": "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, diff --git a/resources/js/Global/components/Inputs/Checkbox.vue b/resources/js/Global/components/Inputs/Checkbox.vue index af642bf..65699b8 100644 --- a/resources/js/Global/components/Inputs/Checkbox.vue +++ b/resources/js/Global/components/Inputs/Checkbox.vue @@ -1,105 +1,105 @@