diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index d2daf5d..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/bootstrap/.DS_Store b/bootstrap/.DS_Store deleted file mode 100644 index d1ecf9a..0000000 Binary files a/bootstrap/.DS_Store and /dev/null differ diff --git a/composer.json b/composer.json index 31afcba..9e864d2 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,6 @@ "zircote/swagger-php": "^3.0" }, "require-dev": { - "barryvdh/laravel-ide-helper": "^2.6", "facade/ignition": "^2.0", "fzaninotto/faker": "^1.9.1", "mockery/mockery": "^1.3.1", diff --git a/composer.lock b/composer.lock index 4cf8ff3..31226d4 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": "2e1535f199098b30f3943fb68b33b70d", + "content-hash": "9bee5b364553644fe2fee966d3385d96", "packages": [ { "name": "adbario/php-dot-notation", @@ -7139,6 +7139,7 @@ ], "packages-dev": [ { +<<<<<<< HEAD "name": "barryvdh/laravel-ide-helper", "version": "v2.8.2", "source": { @@ -8107,6 +8108,8 @@ "time": "2020-05-29T18:28:51+00:00" }, { +======= +>>>>>>> 3417af67c015796062bd10018264488545f53a75 "name": "doctrine/instantiator", "version": "1.4.0", "source": { @@ -8559,78 +8562,6 @@ ], "time": "2020-07-09T08:09:16+00:00" }, - { - "name": "justinrainbow/json-schema", - "version": "5.2.10", - "source": { - "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b", - "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", - "json-schema/json-schema-test-suite": "1.2.0", - "phpunit/phpunit": "^4.8.35" - }, - "bin": [ - "bin/validate-json" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "JsonSchema\\": "src/JsonSchema/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bruno Prieto Reis", - "email": "bruno.p.reis@gmail.com" - }, - { - "name": "Justin Rainbow", - "email": "justin.rainbow@gmail.com" - }, - { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch" - }, - { - "name": "Robert Schönthal", - "email": "seroscho@googlemail.com" - } - ], - "description": "A library to validate a json schema.", - "homepage": "https://github.com/justinrainbow/json-schema", - "keywords": [ - "json", - "schema" - ], - "time": "2020-05-27T16:41:55+00:00" - }, { "name": "mockery/mockery", "version": "1.4.3", @@ -9609,58 +9540,6 @@ ], "time": "2021-03-17T07:27:54+00:00" }, - { - "name": "react/promise", - "version": "v2.8.0", - "source": { - "type": "git", - "url": "https://github.com/reactphp/promise.git", - "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4", - "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36" - }, - "type": "library", - "autoload": { - "psr-4": { - "React\\Promise\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jan Sorgalla", - "email": "jsorgalla@gmail.com" - } - ], - "description": "A lightweight implementation of CommonJS Promises/A for PHP", - "keywords": [ - "promise", - "promises" - ], - "time": "2020-05-12T15:16:56+00:00" - }, { "name": "sebastian/code-unit-reverse-lookup", "version": "1.0.2", @@ -10415,6 +10294,7 @@ "time": "2016-10-03T07:35:21+00:00" }, { +<<<<<<< HEAD "name": "seld/jsonlint", "version": "1.8.3", "source": { @@ -10595,6 +10475,8 @@ "time": "2021-04-01T10:42:13+00:00" }, { +======= +>>>>>>> 3417af67c015796062bd10018264488545f53a75 "name": "theseer/tokenizer", "version": "1.2.0", "source": { @@ -10716,5 +10598,9 @@ "php": "^7.2.5" }, "platform-dev": [], +<<<<<<< HEAD "plugin-api-version": "1.1.0" +======= + "plugin-api-version": "2.3.0" +>>>>>>> 3417af67c015796062bd10018264488545f53a75 } diff --git a/database/migrations/2023_06_18_225919_update_managers_add_order_status_ability.php b/database/migrations/2023_06_18_225919_update_managers_add_order_status_ability.php new file mode 100644 index 0000000..5080526 --- /dev/null +++ b/database/migrations/2023_06_18_225919_update_managers_add_order_status_ability.php @@ -0,0 +1,30 @@ +tinyInteger("order_status_ability")->default(1)->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/public/.DS_Store b/public/.DS_Store deleted file mode 100644 index 17363ab..0000000 Binary files a/public/.DS_Store and /dev/null differ diff --git a/public/dashboard/.DS_Store b/public/dashboard/.DS_Store deleted file mode 100644 index 0f4ff04..0000000 Binary files a/public/dashboard/.DS_Store and /dev/null differ diff --git a/public/hyper/.DS_Store b/public/hyper/.DS_Store deleted file mode 100644 index 9dcb7f0..0000000 Binary files a/public/hyper/.DS_Store and /dev/null differ diff --git a/public/hyper/dist/.DS_Store b/public/hyper/dist/.DS_Store deleted file mode 100644 index f60018b..0000000 Binary files a/public/hyper/dist/.DS_Store and /dev/null differ diff --git a/public/hyper/dist/saas/.DS_Store b/public/hyper/dist/saas/.DS_Store deleted file mode 100644 index 2564ef9..0000000 Binary files a/public/hyper/dist/saas/.DS_Store and /dev/null differ diff --git a/public/hyper/dist/saas/assets/.DS_Store b/public/hyper/dist/saas/assets/.DS_Store deleted file mode 100644 index 0d941ff..0000000 Binary files a/public/hyper/dist/saas/assets/.DS_Store and /dev/null differ diff --git a/public/hyper/dist/saas/assets/images/.DS_Store b/public/hyper/dist/saas/assets/images/.DS_Store deleted file mode 100644 index 18aabd2..0000000 Binary files a/public/hyper/dist/saas/assets/images/.DS_Store and /dev/null differ diff --git a/public/hyper/src/.DS_Store b/public/hyper/src/.DS_Store deleted file mode 100644 index 9736475..0000000 Binary files a/public/hyper/src/.DS_Store and /dev/null differ