diff --git a/.rnd b/.rnd index 0e176e9..59e480d 100644 Binary files a/.rnd and b/.rnd differ diff --git a/composer.json b/composer.json index 63643c6..364d6f1 100644 --- a/composer.json +++ b/composer.json @@ -21,8 +21,9 @@ "wm/common": "dev-master", "wm/core": "dev-master", "wm/crm": "dev-master", + "wm/finance": "dev-master", "wm/portfolio": "dev-master", - "wm/product": "dev-master", + "wm/product": "dev-dev", "wm/service": "dev-master", "wm/store": "dev-master", "wm/warehouse": "dev-master", @@ -110,6 +111,10 @@ { "type": "path", "url": "./modules/wm-warehouse" + }, + { + "type": "path", + "url": "./modules/wm-finance" } ] } diff --git a/composer.lock b/composer.lock index bff05ce..7f49770 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": "24364d0ae2a627d5aeb2db02a3a7e64e", + "content-hash": "6d4b1caad2582dd665740bb377acf435", "packages": [ { "name": "aws/aws-sdk-php", @@ -5716,6 +5716,53 @@ ], "description": "client relationship management" }, + { + "name": "wm/finance", + "version": "dev-master", + "dist": { + "type": "path", + "url": "./modules/wm-finance", + "reference": "958ea9a2536dafc84aab4441cbb8ce166bc3860b" + }, + "require": { + "php": "^7.1.3", + "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\\Finance\\FinanceServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "WM\\Finance\\": "src/" + }, + "classmap": [ + "database/seeds", + "database/factories" + ] + }, + "autoload-dev": { + "psr-4": { + "WM\\Finance\\Tests\\": "tests/" + } + }, + "license": [ + "MIT" + ], + "description": "Finance Management Service", + "transport-options": { + "relative": true + } + }, { "name": "wm/portfolio", "version": "dev-master", @@ -5760,11 +5807,11 @@ }, { "name": "wm/product", - "version": "dev-master", + "version": "dev-dev", "dist": { "type": "path", "url": "./modules/wm-product", - "reference": "230193ddba0ab754d4a5e5b719a38528fb46b604" + "reference": "f2b4ddea636f2fc7cecce2e64939bd63ee6db74e" }, "require": { "php": "^7.1.3", @@ -5800,7 +5847,10 @@ "license": [ "MIT" ], - "description": "client relationship management" + "description": "client relationship management", + "transport-options": { + "relative": true + } }, { "name": "wm/service", @@ -8062,6 +8112,7 @@ "wm/common": 20, "wm/core": 20, "wm/crm": 20, + "wm/finance": 20, "wm/portfolio": 20, "wm/product": 20, "wm/service": 20, @@ -8073,5 +8124,6 @@ "platform": { "php": "^7.2" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "2.0.0" } diff --git a/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 b/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 index 616580a..2d8fc02 100644 --- a/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 +++ b/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 @@ -1 +1 @@ -1601220079i:1601220079; \ No newline at end of file +1605779084i:1605779084; \ No newline at end of file diff --git a/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c b/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c index ee38aea..28d3edf 100644 --- a/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c +++ b/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c @@ -1 +1 @@ -1601220079i:4; \ No newline at end of file +1605779084i:1; \ No newline at end of file diff --git a/webpack.mix.js b/webpack.mix.js index 38aa6e7..bef4ea5 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -32,7 +32,7 @@ require('./modules/wm-common/webpack.mix'); require('./modules/wm-crm/webpack.mix'); require('./modules/wm-blog/webpack.mix'); require('./modules/wm-portfolio/webpack.mix'); -// require('./modules/wm-finance/webpack.mix'); +require('./modules/wm-finance/webpack.mix'); require('./modules/wm-product/webpack.mix'); require('./modules/wm-service/webpack.mix'); require('./modules/wm-store/webpack.mix');