Merge branch 'dev' of https://git.willaspace.com/WillaEngine-Project/WillaEngine into dev

misc...
5 changed files with 2060 additions and 241 deletions
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@ -8,6 +8,10 @@ use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 use WM\Common\Services\Sms\Events\SmsSent;
 use WM\Common\Services\Sms\Listeners\StoreSmsInDatabase;
+use WM\Store\Events\InitiateStoreBusinessEvent;
+use WM\Store\Events\StoreStoreOrderEvent;
+use WM\Store\Listeners\InitiateStoreBusinessListener;
+use WM\Store\Listeners\StoreStoreOrderListener;

 class EventServiceProvider extends ServiceProvider
 {
@ -23,6 +27,12 @@ class EventServiceProvider extends ServiceProvider
        SmsSent::class => [
            StoreSmsInDatabase::class,
        ],
+        InitiateStoreBusinessEvent::class => [
+            InitiateStoreBusinessListener::class
+        ],
+        StoreStoreOrderEvent::class => [
+            StoreStoreOrderListener::class
+        ]
    ];

    /**
--- a/composer.json
+++ b/composer.json
@ -17,14 +17,10 @@
        "maatwebsite/excel": "^3.1",
        "nestedset/willaarts": "^5.0.7",
        "spatie/laravel-medialibrary": "^8.0.0",
-        "wm/blog": "dev-master",
        "wm/common": "dev-master",
        "wm/core": "dev-master",
-        "wm/crm": "dev-master",
-        "wm/portfolio": "dev-master",
        "wm/product": "dev-master",
-        "wm/service": "dev-master",
-        "wm/store": "dev-master",
+        "wm/store": "dev-dev",
        "zircote/swagger-php": "^3.0"
    },
    "provide": {
@ -76,39 +72,23 @@
            "@php artisan key:generate --ansi"
        ]
    },
-    
+
    "repositories": [
        {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/crm.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/common.git"
+            "type": "path",
+            "url": "./modules/wm-common"
        },
        {
            "type": "vcs",
            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/core.git"
        },
-        {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/blog.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/portfolio.git"
-        },
        {
            "type": "vcs",
            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/product.git"
        },
        {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/service.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/store.git"
+            "type": "path",
+            "url": "./modules/wm-store"
        }
    ]
 }
--- a/composer.lock
+++ b/composer.lock
@ -4,20 +4,20 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "e89a1a06653673d8bfb53544a343bb1d",
+    "content-hash": "e843cc662ee5033061efcf090120031f",
    "packages": [
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.171.14",
+            "version": "3.171.11",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "2bc8681a623caa13d5c1da90ca4d6c76436b545d"
+                "reference": "eeebac8f6efd141af09c44dbd9cca4f1d327ef21"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2bc8681a623caa13d5c1da90ca4d6c76436b545d",
-                "reference": "2bc8681a623caa13d5c1da90ca4d6c76436b545d",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/eeebac8f6efd141af09c44dbd9cca4f1d327ef21",
+                "reference": "eeebac8f6efd141af09c44dbd9cca4f1d327ef21",
                "shasum": ""
            },
            "require": {
@ -92,9 +92,9 @@
            "support": {
                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.171.14"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.171.11"
            },
-            "time": "2021-01-07T19:16:26+00:00"
+            "time": "2021-01-04T19:13:09+00:00"
        },
        {
            "name": "brick/math",
@ -1225,16 +1225,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v8.21.0",
+            "version": "v8.20.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "a61cab167c35f465a923737ee6e6fb99cd5fde88"
+                "reference": "b5d8573ab16027867eaa1ac148893833434f9b02"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/a61cab167c35f465a923737ee6e6fb99cd5fde88",
-                "reference": "a61cab167c35f465a923737ee6e6fb99cd5fde88",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/b5d8573ab16027867eaa1ac148893833434f9b02",
+                "reference": "b5d8573ab16027867eaa1ac148893833434f9b02",
                "shasum": ""
            },
            "require": {
@ -1388,7 +1388,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2021-01-05T15:43:10+00:00"
+            "time": "2020-12-22T21:21:19+00:00"
        },
        {
            "name": "laravel/passport",
@ -2761,6 +2761,79 @@
            ],
            "time": "2020-12-17T20:55:32+00:00"
        },
+        {
+            "name": "nestedset/willaarts",
+            "version": "v5.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/aliqasemi/laravel-nestedset.git",
+                "reference": "6ce0f09d89423df59b82169c6dbeb30e7a0b4e74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/aliqasemi/laravel-nestedset/zipball/6ce0f09d89423df59b82169c6dbeb30e7a0b4e74",
+                "reference": "6ce0f09d89423df59b82169c6dbeb30e7a0b4e74",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/database": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0",
+                "illuminate/events": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0",
+                "illuminate/support": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0",
+                "php": ">=7.1.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "7.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "v5.0.x-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Kalnoy\\Nestedset\\NestedSetServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Kalnoy\\Nestedset\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alexander Kalnoy",
+                    "email": "lazychaser@gmail.com"
+                }
+            ],
+            "description": "Nested Set Model for Laravel 5.7 and up",
+            "keywords": [
+                "database",
+                "hierarchy",
+                "laravel",
+                "nested sets",
+                "nsm"
+            ],
+            "support": {
+                "issues": "https://github.com/briannesbitt/Carbon/issues",
+                "source": "https://github.com/briannesbitt/Carbon"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/Carbon",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-12-17T20:55:32+00:00"
+        },
        {
            "name": "nestedset/willaarts",
            "version": "v5.0.7",
@ -3127,7 +3200,7 @@
        },
        {
            "name": "phpoffice/phpspreadsheet",
-            "version": "1.16.0",
+            "version": "1.16.1",
            "source": {
                "type": "git",
                "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
@ -3222,7 +3295,7 @@
            ],
            "support": {
                "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
-                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.16.0"
+                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.16.1"
            },
            "time": "2020-12-31T18:03:49+00:00"
        },
@ -6313,6 +6386,89 @@
            ],
            "time": "2020-09-07T11:33:47+00:00"
        },
+        {
+            "name": "symfony/string",
+            "version": "v5.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/string.git",
+                "reference": "5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/string/zipball/5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed",
+                "reference": "5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "~1.15"
+            },
+            "require-dev": {
+                "symfony/error-handler": "^4.4|^5.0",
+                "symfony/http-client": "^4.4|^5.0",
+                "symfony/translation-contracts": "^1.1|^2",
+                "symfony/var-exporter": "^4.4|^5.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "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": "Symfony String component",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "grapheme",
+                "i18n",
+                "string",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/master"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-09-07T11:33:47+00:00"
+        },
        {
            "name": "symfony/string",
            "version": "v5.2.1",
@ -6990,56 +7146,13 @@
            },
            "time": "2020-07-08T17:02:28+00:00"
        },
-        {
-            "name": "wm/blog",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/blog.git",
-                "reference": "c2b4c76b3141d4429d70fa036fa202b06ffcd262"
-            },
-            "require": {
-                "php": "^7.1.3"
-            },
-            "require-dev": {
-                "orchestra/testbench": "~3.6.0",
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "WM\\Blog\\BlogServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "WM\\Blog\\": "src/"
-                },
-                "classmap": [
-                    "database/seeds",
-                    "database/factories"
-                ]
-            },
-            "autoload-dev": {
-                "psr-4": {
-                    "WM\\Blog\\Tests\\": "tests/"
-                }
-            },
-            "license": [
-                "MIT"
-            ],
-            "description": "blog management",
-            "time": "2021-01-04T08:17:57+00:00"
-        },
        {
            "name": "wm/common",
            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/common.git",
-                "reference": "a5ddca7d46ecce0132959dc662b13ce8c4ce53ec"
+            "dist": {
+                "type": "path",
+                "url": "./modules/wm-common",
+                "reference": "b88e9cd87ced3977c12674af69f779da8b1ba967"
            },
            "require": {
                "php": "^7.1.3",
@ -7080,13 +7193,15 @@
        {
            "name": "wm/core",
            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/core.git",
-                "reference": "d0ead40691ba8896c72cf5692a7f4165b11a5985"
+            "dist": {
+                "type": "path",
+                "url": "./modules/wm-core",
+                "reference": "92e33e05729a5b315a7984140b8a1030ed38fbb7"
            },
            "require": {
-                "php": "^7.1.3"
+                "php": "^7.1.3",
+                "wm/common": "dev-master",
+                "wm/core": "dev-master"
            },
            "require-dev": {
                "orchestra/testbench": "~3.6.0",
@ -7124,102 +7239,13 @@
            "description": "client relationship management",
            "time": "2020-12-22T09:51:57+00:00"
        },
-        {
-            "name": "wm/crm",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/crm.git",
-                "reference": "ae7277e4d9394ae3c5bdf9f3fdf580887aa33865"
-            },
-            "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\\CRM\\CrmServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "WM\\CRM\\": "src/"
-                },
-                "classmap": [
-                    "database/seeds",
-                    "database/factories"
-                ]
-            },
-            "autoload-dev": {
-                "psr-4": {
-                    "WM\\CRM\\Tests\\": "tests/"
-                }
-            },
-            "license": [
-                "MIT"
-            ],
-            "description": "client relationship management",
-            "time": "2020-12-22T08:48:02+00:00"
-        },
-        {
-            "name": "wm/portfolio",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/portfolio.git",
-                "reference": "8ef831aa07215466f21823f8e9bc50a3a4866605"
-            },
-            "require": {
-                "php": "^7.1.3"
-            },
-            "require-dev": {
-                "orchestra/testbench": "~3.6.0",
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "WM\\Portfolio\\PortfolioServiceProvider",
-                        "WM\\Portfolio\\DependencyProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "WM\\Portfolio\\": "src/"
-                },
-                "classmap": [
-                    "database/seeds",
-                    "database/factories"
-                ]
-            },
-            "autoload-dev": {
-                "psr-4": {
-                    "WM\\Portfolio\\Tests\\": "tests/"
-                }
-            },
-            "license": [
-                "MIT"
-            ],
-            "description": "Portfolio management",
-            "time": "2020-12-22T08:44:35+00:00"
-        },
        {
            "name": "wm/product",
            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/product.git",
-                "reference": "31c00762d0ed74c5a90c1117c817107353d18d16"
+            "dist": {
+                "type": "path",
+                "url": "./modules/wm-product",
+                "reference": "889a06f31675ca05a7fc8deaf23d5a7c2a3dcdaf"
            },
            "require": {
                "php": "^7.1.3",
@ -7259,17 +7285,15 @@
            "time": "2020-12-22T08:47:32+00:00"
        },
        {
-            "name": "wm/service",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/service.git",
-                "reference": "42c09da5ff658f68a1a744aa9018bd8e9e7c7110"
+            "name": "wm/store",
+            "version": "dev-dev",
+            "dist": {
+                "type": "path",
+                "url": "./modules/wm-store",
+                "reference": "a84c72869803f774c5ee07a910a11f886f42df8f"
            },
            "require": {
-                "php": "^7.1.3",
-                "wm/common": "dev-master",
-                "wm/core": "dev-master"
+                "php": "^7.4"
            },
            "require-dev": {
                "orchestra/testbench": "~3.6.0",
@ -7279,59 +7303,19 @@
            "extra": {
                "laravel": {
                    "providers": [
-                        "WM\\Service\\ServiceServiceProvider",
-                        "WM\\Service\\DependencyProvider"
+                        "WM\\Store\\StoreServiceProvider"
                    ]
                }
            },
            "autoload": {
                "psr-4": {
-                    "WM\\Service\\": "src/"
+                    "WM\\Store\\": "src/"
                },
                "classmap": [
                    "database/seeds",
                    "database/factories"
                ]
            },
-            "autoload-dev": {
-                "psr-4": {
-                    "WM\\Service\\Tests\\": "tests/"
-                }
-            },
-            "license": [
-                "MIT"
-            ],
-            "description": "Service Management Service",
-            "time": "2021-01-04T15:09:20+00:00"
-        },
-        {
-            "name": "wm/store",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/store.git",
-                "reference": "86220183bd68c7cc4fd53eecf070839bddf5ae54"
-            },
-            "require": {
-                "php": "^7.1.3"
-            },
-            "require-dev": {
-                "orchestra/testbench": "~3.6.0",
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "WM\\Store\\StoreServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "WM\\Store\\": "src/"
-                }
-            },
            "autoload-dev": {
                "psr-4": {
                    "WM\\Store\\Tests\\": "tests/"
@ -9844,13 +9828,9 @@
    "aliases": [],
    "minimum-stability": "dev",
    "stability-flags": {
-        "wm/blog": 20,
        "wm/common": 20,
        "wm/core": 20,
-        "wm/crm": 20,
-        "wm/portfolio": 20,
        "wm/product": 20,
-        "wm/service": 20,
        "wm/store": 20
    },
    "prefer-stable": true,
--- a/resources/js/Global/components/Modals/BasicModal.vue
+++ b/resources/js/Global/components/Modals/BasicModal.vue
@ -4,7 +4,6 @@
    </v-dialog>
 </template>

-
 <script>
    import {mapGetters} from "vuex";

--- a/resources/wm-store.postman_collection.json
+++ b/resources/wm-store.postman_collection.json
Author	SHA1	Message	Date
MBT	03c4fca14f	Merge branch 'dev' of https://git.willaspace.com/WillaEngine-Project/WillaEngine into dev	4 years ago
MBT	d6a94479d5	Merge branch 'dev' of https://git.willaspace.com/WillaEngine-Project/WillaEngine into dev	4 years ago
MBT	1a7ac32f30	misc...	4 years ago