From a3139edfd2681d308afdfea1435f472fb9466a3e Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 9 Nov 2021 22:55:21 +0500 Subject: [PATCH] promotions and products --- composer.lock | 1022 +++++++---------- config/app.php | 3 +- .../Sarga/API/Http/Controllers/Categories.php | 17 +- .../Sarga/API/Http/Controllers/Channels.php | 2 +- .../Sarga/API/Http/Controllers/Products.php | 35 + .../API/Http/Resources/Catalog/Category.php | 5 +- .../API/Http/Resources/Catalog/Product.php | 195 ++++ .../Http/Resources/Catalog/ProductImage.php | 23 + .../Http/Resources/Catalog/ProductVariant.php | 43 + .../Sarga/API/Http/Resources/Core/Channel.php | 1 + packages/Sarga/API/Http/helpers.php | 20 + packages/Sarga/API/Http/routes.php | 5 + .../API/Providers/APIServiceProvider.php | 2 + packages/Sarga/Admin/composer.json | 27 + ...romotion_category_id_in_channels_table.php | 33 + .../src/Providers/AdminServiceProvider.php | 23 + .../views/settings/channels/create.blade.php | 270 +++++ .../views/settings/channels/edit.blade.php | 325 ++++++ .../Admin/src/Routes/settings-routes.php | 21 + packages/Sarga/Shop/src/Data/countries.json | 7 + .../Sarga/Shop/src/Data/countries_ru.json | 10 + .../Sarga/Shop/src/Data/countries_tm.json | 10 + packages/Sarga/Shop/src/Data/states.json | 44 + packages/Sarga/Shop/src/Data/states_ru.json | 26 + packages/Sarga/Shop/src/Data/states_tm.json | 26 + .../Database/Seeders/CategoryTableSeeder.php | 185 +++ .../Database/Seeders/ChannelTableSeeder.php | 94 +- .../Database/Seeders/ConfigTableSeeder.php | 293 +++++ .../Database/Seeders/CountriesTableSeeder.php | 18 + .../Seeders/CountryStateTranslationSeeder.php | 33 + .../src/Database/Seeders/DatabaseSeeder.php | 3 + .../Database/Seeders/SCurrencyTableSeeder.php | 12 +- .../Database/Seeders/SLocalesTableSeeder.php | 21 +- .../Database/Seeders/StatesTableSeeder.php | 18 + .../src/Providers/ShopServiceProvider.php | 4 +- .../src/Repositories/CategoryRepository.php | 37 + packages/Webkul/Shop/src/Config/menu.php | 14 +- 37 files changed, 2275 insertions(+), 652 deletions(-) create mode 100644 packages/Sarga/API/Http/Controllers/Products.php create mode 100644 packages/Sarga/API/Http/Resources/Catalog/Product.php create mode 100644 packages/Sarga/API/Http/Resources/Catalog/ProductImage.php create mode 100644 packages/Sarga/API/Http/Resources/Catalog/ProductVariant.php create mode 100644 packages/Sarga/API/Http/helpers.php create mode 100644 packages/Sarga/Admin/composer.json create mode 100644 packages/Sarga/Admin/src/Database/Migrations/2021_11_09_184538_add_promotion_category_id_in_channels_table.php create mode 100644 packages/Sarga/Admin/src/Providers/AdminServiceProvider.php create mode 100644 packages/Sarga/Admin/src/Resources/views/settings/channels/create.blade.php create mode 100644 packages/Sarga/Admin/src/Resources/views/settings/channels/edit.blade.php create mode 100644 packages/Sarga/Admin/src/Routes/settings-routes.php create mode 100644 packages/Sarga/Shop/src/Data/countries.json create mode 100644 packages/Sarga/Shop/src/Data/countries_ru.json create mode 100644 packages/Sarga/Shop/src/Data/countries_tm.json create mode 100644 packages/Sarga/Shop/src/Data/states.json create mode 100644 packages/Sarga/Shop/src/Data/states_ru.json create mode 100644 packages/Sarga/Shop/src/Data/states_tm.json create mode 100644 packages/Sarga/Shop/src/Database/Seeders/CategoryTableSeeder.php create mode 100644 packages/Sarga/Shop/src/Database/Seeders/ConfigTableSeeder.php create mode 100644 packages/Sarga/Shop/src/Database/Seeders/CountriesTableSeeder.php create mode 100644 packages/Sarga/Shop/src/Database/Seeders/CountryStateTranslationSeeder.php create mode 100644 packages/Sarga/Shop/src/Database/Seeders/StatesTableSeeder.php create mode 100644 packages/Sarga/Shop/src/Repositories/CategoryRepository.php diff --git a/composer.lock b/composer.lock index ff5fa5b0b..104dcf579 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": "b1710279cb7cc769d4ed404692c85082", + "content-hash": "067386494a1daca00701346294f666d8", "packages": [ { "name": "algolia/algoliasearch-client-php", @@ -165,147 +165,6 @@ ], "time": "2020-11-19T14:10:38+00:00" }, - { - "name": "aws/aws-crt-php", - "version": "v1.0.2", - "source": { - "type": "git", - "url": "https://github.com/awslabs/aws-crt-php.git", - "reference": "3942776a8c99209908ee0b287746263725685732" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/3942776a8c99209908ee0b287746263725685732", - "reference": "3942776a8c99209908ee0b287746263725685732", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35|^5.4.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "AWS SDK Common Runtime Team", - "email": "aws-sdk-common-runtime@amazon.com" - } - ], - "description": "AWS Common Runtime for PHP", - "homepage": "http://aws.amazon.com/sdkforphp", - "keywords": [ - "amazon", - "aws", - "crt", - "sdk" - ], - "support": { - "issues": "https://github.com/awslabs/aws-crt-php/issues", - "source": "https://github.com/awslabs/aws-crt-php/tree/v1.0.2" - }, - "time": "2021-09-03T22:57:30+00:00" - }, - { - "name": "aws/aws-sdk-php", - "version": "3.196.1", - "source": { - "type": "git", - "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "2845899d05c66a00d88eabbf7cf5d3dbae2da58a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2845899d05c66a00d88eabbf7cf5d3dbae2da58a", - "reference": "2845899d05c66a00d88eabbf7cf5d3dbae2da58a", - "shasum": "" - }, - "require": { - "aws/aws-crt-php": "^1.0.2", - "ext-json": "*", - "ext-pcre": "*", - "ext-simplexml": "*", - "guzzlehttp/guzzle": "^5.3.3|^6.2.1|^7.0", - "guzzlehttp/promises": "^1.4.0", - "guzzlehttp/psr7": "^1.7.0", - "mtdowling/jmespath.php": "^2.6", - "php": ">=5.5" - }, - "require-dev": { - "andrewsville/php-token-reflection": "^1.4", - "aws/aws-php-sns-message-validator": "~1.0", - "behat/behat": "~3.0", - "doctrine/cache": "~1.4", - "ext-dom": "*", - "ext-openssl": "*", - "ext-pcntl": "*", - "ext-sockets": "*", - "nette/neon": "^2.3", - "paragonie/random_compat": ">= 2", - "phpunit/phpunit": "^4.8.35|^5.4.3", - "psr/cache": "^1.0", - "psr/simple-cache": "^1.0", - "sebastian/comparator": "^1.2.3" - }, - "suggest": { - "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", - "doctrine/cache": "To use the DoctrineCacheAdapter", - "ext-curl": "To send requests using cURL", - "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages", - "ext-sockets": "To use client-side monitoring" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Aws\\": "src/" - }, - "files": [ - "src/functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Amazon Web Services", - "homepage": "http://aws.amazon.com" - } - ], - "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project", - "homepage": "http://aws.amazon.com/sdkforphp", - "keywords": [ - "amazon", - "aws", - "cloud", - "dynamodb", - "ec2", - "glacier", - "s3", - "sdk" - ], - "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.196.1" - }, - "time": "2021-10-01T18:23:06+00:00" - }, { "name": "babenkoivan/elastic-adapter", "version": "v1.17.0", @@ -621,23 +480,23 @@ }, { "name": "barryvdh/laravel-debugbar", - "version": "v3.6.2", + "version": "v3.6.4", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "70b89754913fd89fef16d0170a91dbc2a5cd633a" + "reference": "3c2d678269ba60e178bcd93e36f6a91c36b727f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/70b89754913fd89fef16d0170a91dbc2a5cd633a", - "reference": "70b89754913fd89fef16d0170a91dbc2a5cd633a", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/3c2d678269ba60e178bcd93e36f6a91c36b727f1", + "reference": "3c2d678269ba60e178bcd93e36f6a91c36b727f1", "shasum": "" }, "require": { "illuminate/routing": "^6|^7|^8", "illuminate/session": "^6|^7|^8", "illuminate/support": "^6|^7|^8", - "maximebf/debugbar": "^1.16.3", + "maximebf/debugbar": "^1.17.2", "php": ">=7.2", "symfony/debug": "^4.3|^5", "symfony/finder": "^4.3|^5" @@ -651,7 +510,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.5-dev" + "dev-master": "3.6-dev" }, "laravel": { "providers": [ @@ -690,7 +549,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-debugbar/issues", - "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.2" + "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.4" }, "funding": [ { @@ -702,7 +561,7 @@ "type": "github" } ], - "time": "2021-06-14T14:29:26+00:00" + "time": "2021-10-21T10:57:31+00:00" }, { "name": "barryvdh/laravel-dompdf", @@ -830,6 +689,77 @@ ], "time": "2021-08-15T20:50:18+00:00" }, + { + "name": "diglactic/laravel-breadcrumbs", + "version": "v7.0.1", + "source": { + "type": "git", + "url": "https://github.com/diglactic/laravel-breadcrumbs.git", + "reference": "0a14e8785fa9423c878edd3975af2a92dfcdaf42" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/diglactic/laravel-breadcrumbs/zipball/0a14e8785fa9423c878edd3975af2a92dfcdaf42", + "reference": "0a14e8785fa9423c878edd3975af2a92dfcdaf42", + "shasum": "" + }, + "require": { + "facade/ignition-contracts": "^1.0", + "laravel/framework": "^6.0 || ^7.0 || ^8.0", + "php": "^7.2 || ^8.0" + }, + "conflict": { + "davejamesmiller/laravel-breadcrumbs": "*" + }, + "require-dev": { + "orchestra/testbench": "^4.10 || ^5.9 || ^6.4", + "php-coveralls/php-coveralls": "^2.4", + "phpunit/phpunit": "^8.5 || ^9.4", + "spatie/phpunit-snapshot-assertions": "^2.2 || ^4.2" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Diglactic\\Breadcrumbs\\ServiceProvider" + ], + "aliases": { + "Breadcrumbs": "Diglactic\\Breadcrumbs\\Breadcrumbs" + } + } + }, + "autoload": { + "psr-4": { + "Diglactic\\Breadcrumbs\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Sheng Slogar", + "email": "sheng@diglactic.com", + "role": "Maintainer" + }, + { + "name": "Dave James Miller", + "email": "dave@davejamesmiller.com", + "role": "Original Creator" + } + ], + "description": "A simple Laravel-style way to create breadcrumbs.", + "homepage": "https://github.com/diglactic/laravel-breadcrumbs", + "keywords": [ + "laravel" + ], + "support": { + "issues": "https://github.com/diglactic/laravel-breadcrumbs/issues", + "source": "https://github.com/diglactic/laravel-breadcrumbs/tree/v7.0.1" + }, + "time": "2021-09-23T20:31:25+00:00" + }, { "name": "doctrine/cache", "version": "2.1.1", @@ -1177,34 +1107,30 @@ }, { "name": "doctrine/inflector", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210" + "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/9cf661f4eb38f7c881cac67c75ea9b00bf97b210", - "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", + "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^7.0", - "phpstan/phpstan": "^0.11", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-strict-rules": "^0.11", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "doctrine/coding-standard": "^8.2", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "vimeo/psalm": "^4.10" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" @@ -1252,7 +1178,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.x" + "source": "https://github.com/doctrine/inflector/tree/2.0.4" }, "funding": [ { @@ -1268,7 +1194,7 @@ "type": "tidelift" } ], - "time": "2020-05-29T15:13:26+00:00" + "time": "2021-10-22T20:16:43+00:00" }, { "name": "doctrine/lexer", @@ -1891,19 +1817,20 @@ }, { "name": "facade/ignition", - "version": "2.14.0", + "version": "2.16.0", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "c6126e291bd44ad3fe482537a145fc70e3320598" + "reference": "23400e6cc565c9dcae2c53704b4de1c4870c0697" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/c6126e291bd44ad3fe482537a145fc70e3320598", - "reference": "c6126e291bd44ad3fe482537a145fc70e3320598", + "url": "https://api.github.com/repos/facade/ignition/zipball/23400e6cc565c9dcae2c53704b4de1c4870c0697", + "reference": "23400e6cc565c9dcae2c53704b4de1c4870c0697", "shasum": "" }, "require": { + "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", "facade/flare-client-php": "^1.9.1", @@ -1963,7 +1890,7 @@ "issues": "https://github.com/facade/ignition/issues", "source": "https://github.com/facade/ignition" }, - "time": "2021-10-01T12:58:45+00:00" + "time": "2021-10-28T11:47:23+00:00" }, { "name": "facade/ignition-contracts", @@ -2205,16 +2132,16 @@ }, { "name": "graham-campbell/result-type", - "version": "v1.0.2", + "version": "v1.0.3", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "84afea85c6841deeea872f36249a206e878a5de0" + "reference": "296c015dc30ec4322168c5ad3ee5cc11dae827ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/84afea85c6841deeea872f36249a206e878a5de0", - "reference": "84afea85c6841deeea872f36249a206e878a5de0", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/296c015dc30ec4322168c5ad3ee5cc11dae827ac", + "reference": "296c015dc30ec4322168c5ad3ee5cc11dae827ac", "shasum": "" }, "require": { @@ -2250,7 +2177,7 @@ ], "support": { "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.2" + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.3" }, "funding": [ { @@ -2262,28 +2189,29 @@ "type": "tidelift" } ], - "time": "2021-08-28T21:34:50+00:00" + "time": "2021-10-17T19:48:54+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.3.0", + "version": "7.4.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "7008573787b430c1c1f650e3722d9bba59967628" + "reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7008573787b430c1c1f650e3722d9bba59967628", - "reference": "7008573787b430c1c1f650e3722d9bba59967628", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/868b3571a039f0ebc11ac8f344f4080babe2cb94", + "reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.4", - "guzzlehttp/psr7": "^1.7 || ^2.0", + "guzzlehttp/promises": "^1.5", + "guzzlehttp/psr7": "^1.8.3 || ^2.1", "php": "^7.2.5 || ^8.0", - "psr/http-client": "^1.0" + "psr/http-client": "^1.0", + "symfony/deprecation-contracts": "^2.2" }, "provide": { "psr/http-client-implementation": "1.0" @@ -2293,7 +2221,7 @@ "ext-curl": "*", "php-http/client-integration-tests": "^3.0", "phpunit/phpunit": "^8.5.5 || ^9.3.5", - "psr/log": "^1.1" + "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { "ext-curl": "Required for CURL handler support", @@ -2303,7 +2231,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.3-dev" + "dev-master": "7.4-dev" } }, "autoload": { @@ -2319,19 +2247,43 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "Jeremy Lindblom", + "email": "jeremeamia@gmail.com", + "homepage": "https://github.com/jeremeamia" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, { "name": "Márk Sági-Kazár", "email": "mark.sagikazar@gmail.com", - "homepage": "https://sagikazarmark.hu" + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], "description": "Guzzle is a PHP HTTP client library", - "homepage": "http://guzzlephp.org/", "keywords": [ "client", "curl", @@ -2345,7 +2297,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.3.0" + "source": "https://github.com/guzzle/guzzle/tree/7.4.0" }, "funding": [ { @@ -2357,28 +2309,24 @@ "type": "github" }, { - "url": "https://github.com/alexeyshockov", - "type": "github" - }, - { - "url": "https://github.com/gmponos", - "type": "github" + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", + "type": "tidelift" } ], - "time": "2021-03-23T11:33:13+00:00" + "time": "2021-10-18T09:52:00+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.4.1", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d" + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d", + "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", "shasum": "" }, "require": { @@ -2390,7 +2338,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -2406,10 +2354,25 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], "description": "Guzzle promises library", @@ -2418,35 +2381,52 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.4.1" + "source": "https://github.com/guzzle/promises/tree/1.5.1" }, - "time": "2021-03-07T09:25:29+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2021-10-22T20:56:57+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.8.2", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91" + "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", + "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", "shasum": "" }, "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0", - "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" + "php": "^7.2.5 || ^8.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "ralouphie/getallheaders": "^3.0" }, "provide": { + "psr/http-factory-implementation": "1.0", "psr/http-message-implementation": "1.0" }, "require-dev": { - "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" + "bamarni/composer-bin-plugin": "^1.4.1", + "http-interop/http-factory-tests": "^0.9", + "phpunit/phpunit": "^8.5.8 || ^9.3.10" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -2454,30 +2434,53 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "2.1-dev" } }, "autoload": { "psr-4": { "GuzzleHttp\\Psr7\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" } ], "description": "PSR-7 message implementation that also provides common utility methods", @@ -2493,22 +2496,36 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.8.2" + "source": "https://github.com/guzzle/psr7/tree/2.1.0" }, - "time": "2021-04-26T09:17:50+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2021-10-06T17:43:30+00:00" }, { "name": "intervention/image", - "version": "2.6.1", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "0925f10b259679b5d8ca58f3a2add9255ffcda45" + "reference": "9a8cc99d30415ec0b3f7649e1647d03a55698545" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/0925f10b259679b5d8ca58f3a2add9255ffcda45", - "reference": "0925f10b259679b5d8ca58f3a2add9255ffcda45", + "url": "https://api.github.com/repos/Intervention/image/zipball/9a8cc99d30415ec0b3f7649e1647d03a55698545", + "reference": "9a8cc99d30415ec0b3f7649e1647d03a55698545", "shasum": "" }, "require": { @@ -2567,7 +2584,7 @@ ], "support": { "issues": "https://github.com/Intervention/image/issues", - "source": "https://github.com/Intervention/image/tree/2.6.1" + "source": "https://github.com/Intervention/image/tree/2.7.0" }, "funding": [ { @@ -2579,7 +2596,7 @@ "type": "github" } ], - "time": "2021-07-22T14:31:53+00:00" + "time": "2021-10-03T14:17:12+00:00" }, { "name": "intervention/imagecache", @@ -3432,16 +3449,16 @@ }, { "name": "laravel/ui", - "version": "v3.3.0", + "version": "v3.3.2", "source": { "type": "git", "url": "https://github.com/laravel/ui.git", - "reference": "07d725813350c695c779382cbd6dac0ab8665537" + "reference": "28f3d190fe270b6dcd6fdab4a77a392e693ceca5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/07d725813350c695c779382cbd6dac0ab8665537", - "reference": "07d725813350c695c779382cbd6dac0ab8665537", + "url": "https://api.github.com/repos/laravel/ui/zipball/28f3d190fe270b6dcd6fdab4a77a392e693ceca5", + "reference": "28f3d190fe270b6dcd6fdab4a77a392e693ceca5", "shasum": "" }, "require": { @@ -3484,39 +3501,36 @@ "ui" ], "support": { - "source": "https://github.com/laravel/ui/tree/v3.3.0" + "source": "https://github.com/laravel/ui/tree/v3.3.2" }, - "time": "2021-05-25T16:45:33+00:00" + "time": "2021-11-05T08:25:44+00:00" }, { "name": "lcobucci/jwt", - "version": "3.2.5", + "version": "3.3.3", "source": { "type": "git", "url": "https://github.com/lcobucci/jwt.git", - "reference": "82be04b4753f8b7693b62852b7eab30f97524f9b" + "reference": "c1123697f6a2ec29162b82f170dd4a491f524773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lcobucci/jwt/zipball/82be04b4753f8b7693b62852b7eab30f97524f9b", - "reference": "82be04b4753f8b7693b62852b7eab30f97524f9b", + "url": "https://api.github.com/repos/lcobucci/jwt/zipball/c1123697f6a2ec29162b82f170dd4a491f524773", + "reference": "c1123697f6a2ec29162b82f170dd4a491f524773", "shasum": "" }, "require": { + "ext-mbstring": "*", "ext-openssl": "*", - "php": ">=5.5" + "php": "^5.6 || ^7.0" }, "require-dev": { - "mdanter/ecc": "~0.3.1", "mikey179/vfsstream": "~1.5", "phpmd/phpmd": "~2.2", "phpunit/php-invoker": "~1.1", - "phpunit/phpunit": "~4.5", + "phpunit/phpunit": "^5.7 || ^7.3", "squizlabs/php_codesniffer": "~2.3" }, - "suggest": { - "mdanter/ecc": "Required to use Elliptic Curves based algorithms." - }, "type": "library", "extra": { "branch-alias": { @@ -3546,9 +3560,19 @@ ], "support": { "issues": "https://github.com/lcobucci/jwt/issues", - "source": "https://github.com/lcobucci/jwt/tree/3.2" + "source": "https://github.com/lcobucci/jwt/tree/3.3.3" }, - "time": "2018-11-11T12:22:26+00:00" + "funding": [ + { + "url": "https://github.com/lcobucci", + "type": "github" + }, + { + "url": "https://www.patreon.com/lcobucci", + "type": "patreon" + } + ], + "time": "2020-08-20T13:22:28+00:00" }, { "name": "league/commonmark", @@ -4028,16 +4052,16 @@ }, { "name": "markbaker/complex", - "version": "2.0.3", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/MarkBaker/PHPComplex.git", - "reference": "6f724d7e04606fd8adaa4e3bb381c3e9db09c946" + "reference": "ab8bc271e404909db09ff2d5ffa1e538085c0f22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/6f724d7e04606fd8adaa4e3bb381c3e9db09c946", - "reference": "6f724d7e04606fd8adaa4e3bb381c3e9db09c946", + "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/ab8bc271e404909db09ff2d5ffa1e538085c0f22", + "reference": "ab8bc271e404909db09ff2d5ffa1e538085c0f22", "shasum": "" }, "require": { @@ -4053,51 +4077,7 @@ "autoload": { "psr-4": { "Complex\\": "classes/src/" - }, - "files": [ - "classes/src/functions/abs.php", - "classes/src/functions/acos.php", - "classes/src/functions/acosh.php", - "classes/src/functions/acot.php", - "classes/src/functions/acoth.php", - "classes/src/functions/acsc.php", - "classes/src/functions/acsch.php", - "classes/src/functions/argument.php", - "classes/src/functions/asec.php", - "classes/src/functions/asech.php", - "classes/src/functions/asin.php", - "classes/src/functions/asinh.php", - "classes/src/functions/atan.php", - "classes/src/functions/atanh.php", - "classes/src/functions/conjugate.php", - "classes/src/functions/cos.php", - "classes/src/functions/cosh.php", - "classes/src/functions/cot.php", - "classes/src/functions/coth.php", - "classes/src/functions/csc.php", - "classes/src/functions/csch.php", - "classes/src/functions/exp.php", - "classes/src/functions/inverse.php", - "classes/src/functions/ln.php", - "classes/src/functions/log2.php", - "classes/src/functions/log10.php", - "classes/src/functions/negative.php", - "classes/src/functions/pow.php", - "classes/src/functions/rho.php", - "classes/src/functions/sec.php", - "classes/src/functions/sech.php", - "classes/src/functions/sin.php", - "classes/src/functions/sinh.php", - "classes/src/functions/sqrt.php", - "classes/src/functions/tan.php", - "classes/src/functions/tanh.php", - "classes/src/functions/theta.php", - "classes/src/operations/add.php", - "classes/src/operations/subtract.php", - "classes/src/operations/multiply.php", - "classes/src/operations/divideby.php", - "classes/src/operations/divideinto.php" - ] + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4117,22 +4097,22 @@ ], "support": { "issues": "https://github.com/MarkBaker/PHPComplex/issues", - "source": "https://github.com/MarkBaker/PHPComplex/tree/2.0.3" + "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.1" }, - "time": "2021-06-02T09:44:11+00:00" + "time": "2021-06-29T15:32:53+00:00" }, { "name": "markbaker/matrix", - "version": "2.1.3", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/MarkBaker/PHPMatrix.git", - "reference": "174395a901b5ba0925f1d790fa91bab531074b61" + "reference": "c66aefcafb4f6c269510e9ac46b82619a904c576" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/174395a901b5ba0925f1d790fa91bab531074b61", - "reference": "174395a901b5ba0925f1d790fa91bab531074b61", + "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/c66aefcafb4f6c269510e9ac46b82619a904c576", + "reference": "c66aefcafb4f6c269510e9ac46b82619a904c576", "shasum": "" }, "require": { @@ -4152,25 +4132,7 @@ "autoload": { "psr-4": { "Matrix\\": "classes/src/" - }, - "files": [ - "classes/src/Functions/adjoint.php", - "classes/src/Functions/antidiagonal.php", - "classes/src/Functions/cofactors.php", - "classes/src/Functions/determinant.php", - "classes/src/Functions/diagonal.php", - "classes/src/Functions/identity.php", - "classes/src/Functions/inverse.php", - "classes/src/Functions/minors.php", - "classes/src/Functions/trace.php", - "classes/src/Functions/transpose.php", - "classes/src/Operations/add.php", - "classes/src/Operations/directsum.php", - "classes/src/Operations/subtract.php", - "classes/src/Operations/multiply.php", - "classes/src/Operations/divideby.php", - "classes/src/Operations/divideinto.php" - ] + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4191,27 +4153,27 @@ ], "support": { "issues": "https://github.com/MarkBaker/PHPMatrix/issues", - "source": "https://github.com/MarkBaker/PHPMatrix/tree/2.1.3" + "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.0" }, - "time": "2021-05-25T15:42:17+00:00" + "time": "2021-07-01T19:01:15+00:00" }, { "name": "maximebf/debugbar", - "version": "v1.17.1", + "version": "v1.17.3", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "0a3532556be0145603f8a9de23e76dc28eed7054" + "reference": "e8ac3499af0ea5b440908e06cc0abe5898008b3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0a3532556be0145603f8a9de23e76dc28eed7054", - "reference": "0a3532556be0145603f8a9de23e76dc28eed7054", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/e8ac3499af0ea5b440908e06cc0abe5898008b3c", + "reference": "e8ac3499af0ea5b440908e06cc0abe5898008b3c", "shasum": "" }, "require": { "php": "^7.1|^8", - "psr/log": "^1.0", + "psr/log": "^1|^2|^3", "symfony/var-dumper": "^2.6|^3|^4|^5" }, "require-dev": { @@ -4256,9 +4218,9 @@ ], "support": { "issues": "https://github.com/maximebf/php-debugbar/issues", - "source": "https://github.com/maximebf/php-debugbar/tree/v1.17.1" + "source": "https://github.com/maximebf/php-debugbar/tree/v1.17.3" }, - "time": "2021-08-01T09:19:02+00:00" + "time": "2021-10-19T12:33:27+00:00" }, { "name": "mbezhanov/faker-provider-collection", @@ -4410,67 +4372,6 @@ ], "time": "2021-10-01T21:08:31+00:00" }, - { - "name": "mtdowling/jmespath.php", - "version": "2.6.1", - "source": { - "type": "git", - "url": "https://github.com/jmespath/jmespath.php.git", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb", - "shasum": "" - }, - "require": { - "php": "^5.4 || ^7.0 || ^8.0", - "symfony/polyfill-mbstring": "^1.17" - }, - "require-dev": { - "composer/xdebug-handler": "^1.4 || ^2.0", - "phpunit/phpunit": "^4.8.36 || ^7.5.15" - }, - "bin": [ - "bin/jp.php" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "JmesPath\\": "src/" - }, - "files": [ - "src/JmesPath.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Declaratively specify how to extract elements from a JSON document", - "keywords": [ - "json", - "jsonpath" - ], - "support": { - "issues": "https://github.com/jmespath/jmespath.php/issues", - "source": "https://github.com/jmespath/jmespath.php/tree/2.6.1" - }, - "time": "2021-06-14T00:11:39+00:00" - }, { "name": "myclabs/php-enum", "version": "1.8.3", @@ -4600,16 +4501,16 @@ }, { "name": "nesbot/carbon", - "version": "2.53.1", + "version": "2.54.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "f4655858a784988f880c1b8c7feabbf02dfdf045" + "reference": "eed83939f1aed3eee517d03a33f5ec587ac529b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f4655858a784988f880c1b8c7feabbf02dfdf045", - "reference": "f4655858a784988f880c1b8c7feabbf02dfdf045", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/eed83939f1aed3eee517d03a33f5ec587ac529b5", + "reference": "eed83939f1aed3eee517d03a33f5ec587ac529b5", "shasum": "" }, "require": { @@ -4620,6 +4521,7 @@ "symfony/translation": "^3.4 || ^4.0 || ^5.0" }, "require-dev": { + "doctrine/dbal": "^2.0 || ^3.0", "doctrine/orm": "^2.7", "friendsofphp/php-cs-fixer": "^3.0", "kylekatarnls/multi-tester": "^2.0", @@ -4690,20 +4592,20 @@ "type": "tidelift" } ], - "time": "2021-09-06T09:29:23+00:00" + "time": "2021-11-01T21:22:20+00:00" }, { "name": "nikic/php-parser", - "version": "v4.13.0", + "version": "v4.13.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "50953a2691a922aa1769461637869a0a2faa3f53" + "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53", - "reference": "50953a2691a922aa1769461637869a0a2faa3f53", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/63a79e8daa781cac14e5195e63ed8ae231dd10fd", + "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd", "shasum": "" }, "require": { @@ -4744,9 +4646,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.1" }, - "time": "2021-09-20T12:20:58+00:00" + "time": "2021-11-03T20:52:16+00:00" }, { "name": "opis/closure", @@ -4813,102 +4715,6 @@ }, "time": "2021-04-09T13:42:10+00:00" }, - { - "name": "paypal/paypal-checkout-sdk", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/paypal/Checkout-PHP-SDK.git", - "reference": "ed6a55075448308b87a8b59dcb7fedf04a048cb1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paypal/Checkout-PHP-SDK/zipball/ed6a55075448308b87a8b59dcb7fedf04a048cb1", - "reference": "ed6a55075448308b87a8b59dcb7fedf04a048cb1", - "shasum": "" - }, - "require": { - "paypal/paypalhttp": "1.0.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7" - }, - "type": "library", - "autoload": { - "psr-4": { - "PayPalCheckoutSdk\\": "lib/PayPalCheckoutSdk", - "Sample\\": "samples/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "https://github.com/paypal/Checkout-PHP-SDK/blob/master/LICENSE" - ], - "authors": [ - { - "name": "PayPal", - "homepage": "https://github.com/paypal/Checkout-PHP-SDK/contributors" - } - ], - "description": "PayPal's PHP SDK for Checkout REST APIs", - "homepage": "http://github.com/paypal/Checkout-PHP-SDK/", - "keywords": [ - "checkout", - "orders", - "payments", - "paypal", - "rest", - "sdk" - ], - "support": { - "issues": "https://github.com/paypal/Checkout-PHP-SDK/issues", - "source": "https://github.com/paypal/Checkout-PHP-SDK/tree/1.0.1" - }, - "time": "2019-11-07T23:16:44+00:00" - }, - { - "name": "paypal/paypalhttp", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/paypal/paypalhttp_php.git", - "reference": "1ad9b846a046f09d6135cbf2cbaa7701bbc630a3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paypal/paypalhttp_php/zipball/1ad9b846a046f09d6135cbf2cbaa7701bbc630a3", - "reference": "1ad9b846a046f09d6135cbf2cbaa7701bbc630a3", - "shasum": "" - }, - "require": { - "ext-curl": "*" - }, - "require-dev": { - "phpunit/phpunit": "^5.7", - "wiremock-php/wiremock-php": "1.43.2" - }, - "type": "library", - "autoload": { - "psr-4": { - "PayPalHttp\\": "lib/PayPalHttp" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PayPal", - "homepage": "https://github.com/paypal/paypalhttp_php/contributors" - } - ], - "support": { - "issues": "https://github.com/paypal/paypalhttp_php/issues", - "source": "https://github.com/paypal/paypalhttp_php/tree/1.0.0" - }, - "time": "2019-11-06T21:27:12+00:00" - }, { "name": "phenx/php-font-lib", "version": "0.5.2", @@ -4952,23 +4758,24 @@ }, { "name": "phenx/php-svg-lib", - "version": "v0.3.3", + "version": "0.3.4", "source": { "type": "git", "url": "https://github.com/PhenX/php-svg-lib.git", - "reference": "5fa61b65e612ce1ae15f69b3d223cb14ecc60e32" + "reference": "f627771eb854aa7f45f80add0f23c6c4d67ea0f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32", - "reference": "5fa61b65e612ce1ae15f69b3d223cb14ecc60e32", + "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/f627771eb854aa7f45f80add0f23c6c4d67ea0f2", + "reference": "f627771eb854aa7f45f80add0f23c6c4d67ea0f2", "shasum": "" }, "require": { + "php": "^7.4 || ^8.0", "sabberworm/php-css-parser": "^8.3" }, "require-dev": { - "phpunit/phpunit": "^5.5|^6.5" + "phpunit/phpunit": "^9.5" }, "type": "library", "autoload": { @@ -4990,22 +4797,22 @@ "homepage": "https://github.com/PhenX/php-svg-lib", "support": { "issues": "https://github.com/PhenX/php-svg-lib/issues", - "source": "https://github.com/PhenX/php-svg-lib/tree/master" + "source": "https://github.com/PhenX/php-svg-lib/tree/0.3.4" }, - "time": "2019-09-11T20:02:13+00:00" + "time": "2021-10-18T02:13:32+00:00" }, { "name": "phpoffice/phpspreadsheet", - "version": "1.18.0", + "version": "1.19.0", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "418cd304e8e6b417ea79c3b29126a25dc4b1170c" + "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/418cd304e8e6b417ea79c3b29126a25dc4b1170c", - "reference": "418cd304e8e6b417ea79c3b29126a25dc4b1170c", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf", + "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf", "shasum": "" }, "require": { @@ -5024,8 +4831,8 @@ "ext-zlib": "*", "ezyang/htmlpurifier": "^4.13", "maennchen/zipstream-php": "^2.1", - "markbaker/complex": "^2.0", - "markbaker/matrix": "^2.0", + "markbaker/complex": "^3.0", + "markbaker/matrix": "^3.0", "php": "^7.2 || ^8.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", @@ -5094,9 +4901,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.18.0" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.19.0" }, - "time": "2021-05-31T18:21:15+00:00" + "time": "2021-10-31T15:09:20+00:00" }, { "name": "phpoption/phpoption", @@ -5169,16 +4976,16 @@ }, { "name": "prettus/l5-repository", - "version": "2.7.8", + "version": "2.7.9", "source": { "type": "git", "url": "https://github.com/andersao/l5-repository.git", - "reference": "2425139f178681553cd77460f75af045a818ecad" + "reference": "834d61f0d5d9b6ef5786980e0bf4900fffbccd76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/andersao/l5-repository/zipball/2425139f178681553cd77460f75af045a818ecad", - "reference": "2425139f178681553cd77460f75af045a818ecad", + "url": "https://api.github.com/repos/andersao/l5-repository/zipball/834d61f0d5d9b6ef5786980e0bf4900fffbccd76", + "reference": "834d61f0d5d9b6ef5786980e0bf4900fffbccd76", "shasum": "" }, "require": { @@ -5238,7 +5045,7 @@ "source": "https://github.com/andersao/l5-repository", "wiki": "https://github.com/andersao/l5-repository" }, - "time": "2021-09-03T21:05:45+00:00" + "time": "2021-10-14T23:03:30+00:00" }, { "name": "prettus/laravel-validation", @@ -5292,20 +5099,20 @@ }, { "name": "psr/container", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": ">=7.4.0" }, "type": "library", "autoload": { @@ -5334,9 +5141,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" + "source": "https://github.com/php-fig/container/tree/1.1.2" }, - "time": "2021-03-05T17:36:06+00:00" + "time": "2021-11-05T16:50:12+00:00" }, { "name": "psr/event-dispatcher", @@ -5651,16 +5458,16 @@ }, { "name": "psy/psysh", - "version": "v0.10.8", + "version": "v0.10.9", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3" + "reference": "01281336c4ae557fe4a994544f30d3a1bc204375" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e4573f47750dd6c92dca5aee543fa77513cbd8d3", - "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/01281336c4ae557fe4a994544f30d3a1bc204375", + "reference": "01281336c4ae557fe4a994544f30d3a1bc204375", "shasum": "" }, "require": { @@ -5720,9 +5527,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.10.8" + "source": "https://github.com/bobthecow/psysh/tree/v0.10.9" }, - "time": "2021-04-10T16:23:39+00:00" + "time": "2021-10-10T13:37:39+00:00" }, { "name": "ralouphie/getallheaders", @@ -5770,16 +5577,16 @@ }, { "name": "ramsey/collection", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "eaca1dc1054ddd10cbd83c1461907bee6fb528fa" + "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/eaca1dc1054ddd10cbd83c1461907bee6fb528fa", - "reference": "eaca1dc1054ddd10cbd83c1461907bee6fb528fa", + "url": "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a", + "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a", "shasum": "" }, "require": { @@ -5833,7 +5640,7 @@ ], "support": { "issues": "https://github.com/ramsey/collection/issues", - "source": "https://github.com/ramsey/collection/tree/1.2.1" + "source": "https://github.com/ramsey/collection/tree/1.2.2" }, "funding": [ { @@ -5845,7 +5652,7 @@ "type": "tidelift" } ], - "time": "2021-08-06T03:41:06+00:00" + "time": "2021-10-10T03:01:02+00:00" }, { "name": "ramsey/uuid", @@ -6046,16 +5853,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.2.7", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "15f7faf8508e04471f666633addacf54c0ab5933" + "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933", - "reference": "15f7faf8508e04471f666633addacf54c0ab5933", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c", + "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c", "shasum": "" }, "require": { @@ -6067,7 +5874,7 @@ }, "require-dev": { "mockery/mockery": "^1.0", - "symfony/phpunit-bridge": "^4.4|^5.0" + "symfony/phpunit-bridge": "^4.4|^5.4" }, "suggest": { "ext-intl": "Needed to support internationalized email addresses" @@ -6105,7 +5912,7 @@ ], "support": { "issues": "https://github.com/swiftmailer/swiftmailer/issues", - "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7" + "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.3.0" }, "funding": [ { @@ -6117,20 +5924,20 @@ "type": "tidelift" } ], - "time": "2021-03-09T12:30:35+00:00" + "time": "2021-10-18T15:26:12+00:00" }, { "name": "symfony/console", - "version": "v5.3.7", + "version": "v5.3.10", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "8b1008344647462ae6ec57559da166c2bfa5e16a" + "reference": "d4e409d9fbcfbf71af0e5a940abb7b0b4bad0bd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/8b1008344647462ae6ec57559da166c2bfa5e16a", - "reference": "8b1008344647462ae6ec57559da166c2bfa5e16a", + "url": "https://api.github.com/repos/symfony/console/zipball/d4e409d9fbcfbf71af0e5a940abb7b0b4bad0bd3", + "reference": "d4e409d9fbcfbf71af0e5a940abb7b0b4bad0bd3", "shasum": "" }, "require": { @@ -6200,7 +6007,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.3.7" + "source": "https://github.com/symfony/console/tree/v5.3.10" }, "funding": [ { @@ -6216,7 +6023,7 @@ "type": "tidelift" } ], - "time": "2021-08-25T20:02:16+00:00" + "time": "2021-10-26T09:30:15+00:00" }, { "name": "symfony/css-selector", @@ -6793,16 +6600,16 @@ }, { "name": "symfony/http-foundation", - "version": "v5.3.7", + "version": "v5.3.10", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e36c8e5502b4f3f0190c675f1c1f1248a64f04e5" + "reference": "9f34f02e8a5fdc7a56bafe011cea1ce97300e54c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e36c8e5502b4f3f0190c675f1c1f1248a64f04e5", - "reference": "e36c8e5502b4f3f0190c675f1c1f1248a64f04e5", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9f34f02e8a5fdc7a56bafe011cea1ce97300e54c", + "reference": "9f34f02e8a5fdc7a56bafe011cea1ce97300e54c", "shasum": "" }, "require": { @@ -6846,7 +6653,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.3.7" + "source": "https://github.com/symfony/http-foundation/tree/v5.3.10" }, "funding": [ { @@ -6862,20 +6669,20 @@ "type": "tidelift" } ], - "time": "2021-08-27T11:20:35+00:00" + "time": "2021-10-11T15:41:55+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.3.9", + "version": "v5.3.10", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "ceaf46a992f60e90645e7279825a830f733a17c5" + "reference": "703e4079920468e9522b72cf47fd76ce8d795e86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ceaf46a992f60e90645e7279825a830f733a17c5", - "reference": "ceaf46a992f60e90645e7279825a830f733a17c5", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/703e4079920468e9522b72cf47fd76ce8d795e86", + "reference": "703e4079920468e9522b72cf47fd76ce8d795e86", "shasum": "" }, "require": { @@ -6958,7 +6765,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v5.3.9" + "source": "https://github.com/symfony/http-kernel/tree/v5.3.10" }, "funding": [ { @@ -6974,7 +6781,7 @@ "type": "tidelift" } ], - "time": "2021-09-28T10:25:11+00:00" + "time": "2021-10-29T08:36:48+00:00" }, { "name": "symfony/mime", @@ -8168,16 +7975,16 @@ }, { "name": "symfony/string", - "version": "v5.3.7", + "version": "v5.3.10", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "8d224396e28d30f81969f083a58763b8b9ceb0a5" + "reference": "d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/8d224396e28d30f81969f083a58763b8b9ceb0a5", - "reference": "8d224396e28d30f81969f083a58763b8b9ceb0a5", + "url": "https://api.github.com/repos/symfony/string/zipball/d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c", + "reference": "d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c", "shasum": "" }, "require": { @@ -8231,7 +8038,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.3.7" + "source": "https://github.com/symfony/string/tree/v5.3.10" }, "funding": [ { @@ -8247,20 +8054,20 @@ "type": "tidelift" } ], - "time": "2021-08-26T08:00:08+00:00" + "time": "2021-10-27T18:21:46+00:00" }, { "name": "symfony/translation", - "version": "v5.3.9", + "version": "v5.3.10", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "6e69f3551c1a3356cf6ea8d019bf039a0f8b6886" + "reference": "6ef197aea2ac8b9cd63e0da7522b3771714035aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/6e69f3551c1a3356cf6ea8d019bf039a0f8b6886", - "reference": "6e69f3551c1a3356cf6ea8d019bf039a0f8b6886", + "url": "https://api.github.com/repos/symfony/translation/zipball/6ef197aea2ac8b9cd63e0da7522b3771714035aa", + "reference": "6ef197aea2ac8b9cd63e0da7522b3771714035aa", "shasum": "" }, "require": { @@ -8326,7 +8133,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v5.3.9" + "source": "https://github.com/symfony/translation/tree/v5.3.10" }, "funding": [ { @@ -8342,7 +8149,7 @@ "type": "tidelift" } ], - "time": "2021-08-26T08:22:53+00:00" + "time": "2021-10-10T06:43:24+00:00" }, { "name": "symfony/translation-contracts", @@ -8424,16 +8231,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.3.8", + "version": "v5.3.10", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "eaaea4098be1c90c8285543e1356a09c8aa5c8da" + "reference": "875432adb5f5570fff21036fd22aee244636b7d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/eaaea4098be1c90c8285543e1356a09c8aa5c8da", - "reference": "eaaea4098be1c90c8285543e1356a09c8aa5c8da", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/875432adb5f5570fff21036fd22aee244636b7d1", + "reference": "875432adb5f5570fff21036fd22aee244636b7d1", "shasum": "" }, "require": { @@ -8492,7 +8299,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.3.8" + "source": "https://github.com/symfony/var-dumper/tree/v5.3.10" }, "funding": [ { @@ -8508,7 +8315,7 @@ "type": "tidelift" } ], - "time": "2021-09-24T15:59:58+00:00" + "time": "2021-10-26T09:30:15+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -8863,25 +8670,24 @@ "packages-dev": [ { "name": "behat/gherkin", - "version": "v4.8.0", + "version": "v4.9.0", "source": { "type": "git", "url": "https://github.com/Behat/Gherkin.git", - "reference": "2391482cd003dfdc36b679b27e9f5326bd656acd" + "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/2391482cd003dfdc36b679b27e9f5326bd656acd", - "reference": "2391482cd003dfdc36b679b27e9f5326bd656acd", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/0bc8d1e30e96183e4f36db9dc79caead300beff4", + "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4", "shasum": "" }, "require": { "php": "~7.2|~8.0" }, "require-dev": { - "cucumber/cucumber": "dev-gherkin-16.0.0", + "cucumber/cucumber": "dev-gherkin-22.0.0", "phpunit/phpunit": "~8|~9", - "symfony/phpunit-bridge": "~3|~4|~5", "symfony/yaml": "~3|~4|~5" }, "suggest": { @@ -8890,7 +8696,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "4.x-dev" } }, "autoload": { @@ -8921,9 +8727,9 @@ ], "support": { "issues": "https://github.com/Behat/Gherkin/issues", - "source": "https://github.com/Behat/Gherkin/tree/v4.8.0" + "source": "https://github.com/Behat/Gherkin/tree/v4.9.0" }, - "time": "2021-02-04T12:44:21+00:00" + "time": "2021-10-12T13:05:09+00:00" }, { "name": "codeception/codeception", @@ -9962,16 +9768,16 @@ }, { "name": "php-webdriver/webdriver", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/php-webdriver/php-webdriver.git", - "reference": "da16e39968f8dd5cfb7d07eef91dc2b731c69880" + "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/da16e39968f8dd5cfb7d07eef91dc2b731c69880", - "reference": "da16e39968f8dd5cfb7d07eef91dc2b731c69880", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/99d4856ed7dffcdf6a52eccd6551e83d8d557ceb", + "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb", "shasum": "" }, "require": { @@ -9980,20 +9786,19 @@ "ext-zip": "*", "php": "^5.6 || ~7.0 || ^8.0", "symfony/polyfill-mbstring": "^1.12", - "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0" + "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0 || ^6.0" }, "replace": { "facebook/webdriver": "*" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.0", "ondram/ci-detector": "^2.1 || ^3.5 || ^4.0", "php-coveralls/php-coveralls": "^2.4", "php-mock/php-mock-phpunit": "^1.1 || ^2.0", "php-parallel-lint/php-parallel-lint": "^1.2", "phpunit/phpunit": "^5.7 || ^7 || ^8 || ^9", "squizlabs/php_codesniffer": "^3.5", - "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0" + "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0 || ^6.0" }, "suggest": { "ext-SimpleXML": "For Firefox profile creation" @@ -10022,9 +9827,9 @@ ], "support": { "issues": "https://github.com/php-webdriver/php-webdriver/issues", - "source": "https://github.com/php-webdriver/php-webdriver/tree/1.11.1" + "source": "https://github.com/php-webdriver/php-webdriver/tree/1.12.0" }, - "time": "2021-05-21T15:12:49+00:00" + "time": "2021-10-14T09:30:02+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -10081,16 +9886,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.2", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", "shasum": "" }, "require": { @@ -10101,7 +9906,8 @@ "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2" + "mockery/mockery": "~1.3.2", + "psalm/phar": "^4.8" }, "type": "library", "extra": { @@ -10131,9 +9937,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" }, - "time": "2020-09-03T19:13:55+00:00" + "time": "2021-10-19T17:43:47+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -10254,23 +10060,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.7", + "version": "9.2.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218" + "reference": "cf04e88a2e3c56fc1a65488afd493325b4c1bc3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d4c798ed8d51506800b441f7a13ecb0f76f12218", - "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cf04e88a2e3c56fc1a65488afd493325b4c1bc3e", + "reference": "cf04e88a2e3c56fc1a65488afd493325b4c1bc3e", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.12.0", + "nikic/php-parser": "^4.13.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -10319,7 +10125,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.7" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.8" }, "funding": [ { @@ -10327,7 +10133,7 @@ "type": "github" } ], - "time": "2021-09-17T05:39:03+00:00" + "time": "2021-10-30T08:01:38+00:00" }, { "name": "phpunit/php-file-iterator", diff --git a/config/app.php b/config/app.php index d0674a98f..e3ba20752 100755 --- a/config/app.php +++ b/config/app.php @@ -283,7 +283,8 @@ return [ Webkul\DebugBar\Providers\DebugBarServiceProvider::class, Webkul\Marketing\Providers\MarketingServiceProvider::class, Sarga\Shop\Providers\ShopServiceProvider::class, - Sarga\API\Providers\APIServiceProvider::class + Sarga\API\Providers\APIServiceProvider::class, + Sarga\Admin\Providers\AdminServiceProvider::class ], /* diff --git a/packages/Sarga/API/Http/Controllers/Categories.php b/packages/Sarga/API/Http/Controllers/Categories.php index 8b1109bcd..c683de0de 100644 --- a/packages/Sarga/API/Http/Controllers/Categories.php +++ b/packages/Sarga/API/Http/Controllers/Categories.php @@ -2,11 +2,24 @@ namespace Sarga\API\Http\Controllers; +use App\Http\Controllers\Controller; use Sarga\API\Http\Resources\Catalog\Category; -use Webkul\API\Http\Controllers\Shop\CategoryController; +use Sarga\Shop\Repositories\CategoryRepository; -class Categories extends CategoryController + +class Categories extends Controller { + /** + * CategoryRepository object + * + * @var \Sarga\Shop\Repositories\CategoryRepository + */ + protected $categoryRepository; + + public function __construct(CategoryRepository $categoryRepository) + { + $this->categoryRepository = $categoryRepository; + } public function index() { return Category::collection( diff --git a/packages/Sarga/API/Http/Controllers/Channels.php b/packages/Sarga/API/Http/Controllers/Channels.php index e9d6d14f3..19b558c56 100644 --- a/packages/Sarga/API/Http/Controllers/Channels.php +++ b/packages/Sarga/API/Http/Controllers/Channels.php @@ -30,7 +30,7 @@ class Channels extends Controller } public function get($channel_id){ - $this->categoryRepository->getVisibleCategoryTree(request()->input('parent_id')); + $this->categoryRepository->getCategoryTreeWithoutDescendant(request()->input('parent_id')); } } \ No newline at end of file diff --git a/packages/Sarga/API/Http/Controllers/Products.php b/packages/Sarga/API/Http/Controllers/Products.php new file mode 100644 index 000000000..c3af192da --- /dev/null +++ b/packages/Sarga/API/Http/Controllers/Products.php @@ -0,0 +1,35 @@ +productRepository->getAll(request()->input('category_id'))); + } + + /** + * Returns a individual resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function get($id) + { + return new ProductResource( + $this->productRepository->findOrFail($id) + ); + } + +} diff --git a/packages/Sarga/API/Http/Resources/Catalog/Category.php b/packages/Sarga/API/Http/Resources/Catalog/Category.php index 88fad7be2..82dac51e3 100644 --- a/packages/Sarga/API/Http/Resources/Catalog/Category.php +++ b/packages/Sarga/API/Http/Resources/Catalog/Category.php @@ -19,11 +19,10 @@ class Category extends JsonResource 'id' => $this->id, // 'code' => $this->code, 'name' => $this->name, -// 'slug' => $this->slug, + 'slug' => $this->slug, // 'display_mode' => $this->display_mode, // 'description' => $this->description, -// 'status' => $this->status, - 'menu' => $this->visible_in_menu, + 'status' => $this->status, 'image_url' => $this->image_url, 'category_icon_path' => $this->category_icon_path ? Storage::url($this->category_icon_path) diff --git a/packages/Sarga/API/Http/Resources/Catalog/Product.php b/packages/Sarga/API/Http/Resources/Catalog/Product.php new file mode 100644 index 000000000..e5f6fd8dc --- /dev/null +++ b/packages/Sarga/API/Http/Resources/Catalog/Product.php @@ -0,0 +1,195 @@ +productReviewHelper = app('Webkul\Product\Helpers\Review'); + + $this->wishlistHelper = app('Webkul\Customer\Helpers\Wishlist'); + + parent::__construct($resource); + } + + /** + * Transform the resource into an array. + * + * @param \Illuminate\Http\Request + * @return array + */ + public function toArray($request) + { + /* assign product */ + $product = $this->product ? $this->product : $this; + + /* get type instance */ + $productTypeInstance = $product->getTypeInstance(); + + /* generating resource */ + return [ + /* product's information */ + 'id' => $product->id, +// 'sku' => $product->sku, + 'type' => $product->type, + 'name' => $product->name, + 'url_key' => $product->url_key, + 'price' => $productTypeInstance->getMinimalPrice(), + 'converted_price' => core()->convertPrice($productTypeInstance->getMinimalPrice()), + 'short_description' => $product->short_description, + 'description' => $product->description, + 'images' => ProductImage::collection($product->images), + + /* product's checks */ + 'in_stock' => $product->haveSufficientQuantity(1), + + 'is_wishlisted' => $this->wishlistHelper->getWishlistProduct($product) ? true : false, + 'is_item_in_cart' => \Cart::hasProduct($product), + 'show_quantity_changer' => $this->when( + $product->type !== 'grouped', + $product->getTypeInstance()->showQuantityBox() + ), + + /* product's extra information */ + $this->merge($this->allProductExtraInfo()), + + /* special price cases */ + $this->merge($this->specialPriceInfo()), + + /* super attributes */ + $this->mergeWhen($productTypeInstance->isComposite(), [ + 'super_attributes' => Attribute::collection($product->super_attributes), + ]), + ]; + } + + /** + * Get special price information. + * + * @return array + */ + private function specialPriceInfo() + { + $product = $this->product ? $this->product : $this; + + $productTypeInstance = $product->getTypeInstance(); + + return [ + 'special_price' => $this->when( + $productTypeInstance->haveSpecialPrice(), + $productTypeInstance->getSpecialPrice() + ), + 'formated_special_price' => $this->when( + $productTypeInstance->haveSpecialPrice(), + core()->currency($productTypeInstance->getSpecialPrice()) + ), + 'regular_price' => $this->when( + $productTypeInstance->haveSpecialPrice(), + data_get($productTypeInstance->getProductPrices(), 'regular_price.price') + ), + 'formated_regular_price' => $this->when( + $productTypeInstance->haveSpecialPrice(), + data_get($productTypeInstance->getProductPrices(), 'regular_price.formated_price') + ), + ]; + } + + /** + * Get all product's extra information. + * + * @return array + */ + private function allProductExtraInfo() + { + $product = $this->product ? $this->product : $this; + + $productTypeInstance = $product->getTypeInstance(); + + return [ + /* grouped product */ + $this->mergeWhen( + $productTypeInstance instanceof \Webkul\Product\Type\Grouped, + $product->type == 'grouped' + ? $this->getGroupedProductInfo($product) + : null + ), + + /* bundle product */ + $this->mergeWhen( + $productTypeInstance instanceof \Webkul\Product\Type\Bundle, + $product->type == 'bundle' + ? $this->getBundleProductInfo($product) + : null + ), + + /* configurable product */ + $this->mergeWhen( + $productTypeInstance instanceof \Webkul\Product\Type\Configurable, + $product->type == 'configurable' + ? $this->getConfigurableProductInfo($product) + : null + ), + + ]; + } + + /** + * Get grouped product's extra information. + * + * @param \Webkul\Product\Models\Product + * @return array + */ + private function getGroupedProductInfo($product) + { + return [ + 'grouped_products' => $product->grouped_products->map(function($groupedProduct) { + $associatedProduct = $groupedProduct->associated_product; + + $data = $associatedProduct->toArray(); + + return array_merge($data, [ + 'qty' => $groupedProduct->qty, + 'isSaleable' => $associatedProduct->getTypeInstance()->isSaleable(), + 'formated_price' => $associatedProduct->getTypeInstance()->getPriceHtml(), + 'show_quantity_changer' => $associatedProduct->getTypeInstance()->showQuantityBox(), + ]); + }) + ]; + } + + /** + * Get bundle product's extra information. + * + * @param \Webkul\Product\Models\Product + * @return array + */ + private function getBundleProductInfo($product) + { + return [ + 'currency_options' => core()->getAccountJsSymbols(), + 'bundle_options' => app('Webkul\Product\Helpers\BundleOption')->getBundleConfig($product) + ]; + } + + /** + * Get configurable product's extra information. + * + * @param \Webkul\Product\Models\Product + * @return array + */ + private function getConfigurableProductInfo($product) + { + return [ + 'variants' => ProductVariant::collection($product->variants) + ]; + } + +} diff --git a/packages/Sarga/API/Http/Resources/Catalog/ProductImage.php b/packages/Sarga/API/Http/Resources/Catalog/ProductImage.php new file mode 100644 index 000000000..cf13d93a5 --- /dev/null +++ b/packages/Sarga/API/Http/Resources/Catalog/ProductImage.php @@ -0,0 +1,23 @@ + $this->path, + 'original_image_url' => $this->url, + 'small_image_url' => url('cache/small/' . $this->path), + ]; + } +} \ No newline at end of file diff --git a/packages/Sarga/API/Http/Resources/Catalog/ProductVariant.php b/packages/Sarga/API/Http/Resources/Catalog/ProductVariant.php new file mode 100644 index 000000000..1a7cb190b --- /dev/null +++ b/packages/Sarga/API/Http/Resources/Catalog/ProductVariant.php @@ -0,0 +1,43 @@ +product ? $this->product : $this; + + /* get type instance */ + $productTypeInstance = $product->getTypeInstance(); + return [ + 'id' => $this->id, + 'parent_id' => $this->parent_id, + 'additional' => $this->additional, + 'price' => $productTypeInstance->getMinimalPrice(), + 'converted_price' => core()->convertPrice($productTypeInstance->getMinimalPrice()), + "color" => $this->color, + "size"=>$this->size, + "brand"=>$this->brand, + + "special_price"=> $this->special_price, + "special_price_from"=>$this->special_price_from, + "special_price_to"=>$this->special_price_to, + "length"=>$this->length, + "width"=>$this->width, + "height"=>$this->height, + "weight"=>$this->weight, + "quantity" => $this->inventories->sum('qty') + ]; + } + +} \ No newline at end of file diff --git a/packages/Sarga/API/Http/Resources/Core/Channel.php b/packages/Sarga/API/Http/Resources/Core/Channel.php index 51ee54dff..c8b207217 100644 --- a/packages/Sarga/API/Http/Resources/Core/Channel.php +++ b/packages/Sarga/API/Http/Resources/Core/Channel.php @@ -22,6 +22,7 @@ class Channel extends JsonResource 'name' => $this->name, 'hostname' => $this->hostname, 'root_category_id' => $this->root_category_id, + 'promotion_category_id' => $this->promotion_category_id, 'is_maintenance_on' => $this->is_maintenance_on, 'sliders' => Slider::collection($this->sliders), 'brand_attribute_id' => 25 //todo vremenno goyuldy. id admindan bazadan settingsden almaly(2 marketplace goshulanda) diff --git a/packages/Sarga/API/Http/helpers.php b/packages/Sarga/API/Http/helpers.php new file mode 100644 index 000000000..6a2eb751c --- /dev/null +++ b/packages/Sarga/API/Http/helpers.php @@ -0,0 +1,20 @@ +make(\Webkul\Core\Core::class); + if (is_null($amount)) { + $amount = 0; + } + + $formatter = new \NumberFormatter(app()->getLocale(), \NumberFormatter::CURRENCY); + + return $formatter->formatCurrency($core->convertPrice($amount), $core->getCurrentCurrency()->code); + + } +} \ No newline at end of file diff --git a/packages/Sarga/API/Http/routes.php b/packages/Sarga/API/Http/routes.php index 005955550..0e53a8eca 100644 --- a/packages/Sarga/API/Http/routes.php +++ b/packages/Sarga/API/Http/routes.php @@ -2,6 +2,7 @@ use Sarga\API\Http\Controllers\Categories; use Sarga\API\Http\Controllers\Channels; +use Sarga\API\Http\Controllers\Products; use Webkul\API\Http\Controllers\Shop\ResourceController; use Webkul\Attribute\Repositories\AttributeOptionRepository; use Sarga\API\Http\Resources\Catalog\AttributeOption; @@ -21,5 +22,9 @@ Route::group(['prefix' => 'api'], function ($router) { 'resource' => AttributeOption::class, ]); + //Product routes + Route::get('products', [Products::class, 'index']); + + Route::get('products/{id}', [Products::class, 'get']); }); }); diff --git a/packages/Sarga/API/Providers/APIServiceProvider.php b/packages/Sarga/API/Providers/APIServiceProvider.php index 12096e054..b228589b2 100644 --- a/packages/Sarga/API/Providers/APIServiceProvider.php +++ b/packages/Sarga/API/Providers/APIServiceProvider.php @@ -12,6 +12,8 @@ class APIServiceProvider extends ServiceProvider */ public function boot(Router $router) { + include __DIR__ . '/../Http/helpers.php'; + $this->loadRoutesFrom(__DIR__.'/../Http/routes.php'); } } \ No newline at end of file diff --git a/packages/Sarga/Admin/composer.json b/packages/Sarga/Admin/composer.json new file mode 100644 index 000000000..df7f5ffa2 --- /dev/null +++ b/packages/Sarga/Admin/composer.json @@ -0,0 +1,27 @@ +{ + "name": "sarga/laravel-admin", + "license": "MIT", + "authors": [ + { + "name": "Merdan Singh", + "email": "merdan.m@gmail.com" + } + ], + "require": { + "bagisto/laravel-core": "dev-master" + }, + "autoload": { + "psr-4": { + "Sarga\\Admin\\": "src/" + } + }, + "extra": { + "laravel": { + "providers": [ + "Sarga\\Admin\\Providers\\AdminServiceProvider" + ], + "aliases": {} + } + }, + "minimum-stability": "dev" +} \ No newline at end of file diff --git a/packages/Sarga/Admin/src/Database/Migrations/2021_11_09_184538_add_promotion_category_id_in_channels_table.php b/packages/Sarga/Admin/src/Database/Migrations/2021_11_09_184538_add_promotion_category_id_in_channels_table.php new file mode 100644 index 000000000..ea2864f56 --- /dev/null +++ b/packages/Sarga/Admin/src/Database/Migrations/2021_11_09_184538_add_promotion_category_id_in_channels_table.php @@ -0,0 +1,33 @@ +integer('promotion_category_id')->nullable()->unsigned(); + $table->foreign('promotion_category_id')->references('id')->on('categories')->onDelete('set null'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('channels', function (Blueprint $table) { + $table->dropColumn('promotion_category_id'); + }); + } +} diff --git a/packages/Sarga/Admin/src/Providers/AdminServiceProvider.php b/packages/Sarga/Admin/src/Providers/AdminServiceProvider.php new file mode 100644 index 000000000..2442967df --- /dev/null +++ b/packages/Sarga/Admin/src/Providers/AdminServiceProvider.php @@ -0,0 +1,23 @@ +loadRoutesFrom(__DIR__ . '/../Routes/settings-routes.php'); + $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'sarga_admin'); + $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); + } +} diff --git a/packages/Sarga/Admin/src/Resources/views/settings/channels/create.blade.php b/packages/Sarga/Admin/src/Resources/views/settings/channels/create.blade.php new file mode 100644 index 000000000..bc9c577cd --- /dev/null +++ b/packages/Sarga/Admin/src/Resources/views/settings/channels/create.blade.php @@ -0,0 +1,270 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.settings.channels.add-title') }} +@stop + +@section('content') +
+ +
+
+
+

+ + + {{ __('admin::app.settings.channels.add-title') }} +

+
+ +
+ +
+
+ +
+
+ @csrf() + + {!! view_render_event('bagisto.admin.settings.channel.create.before') !!} + + {{-- general --}} + +
+ +
+ + + @{{ errors.first('code') }} +
+ +
+ + + @{{ errors.first('name') }} +
+ +
+ + +
+ +
+ + + @{{ errors.first('inventory_sources[]') }} +
+ +
+ + + @{{ errors.first('root_category_id') }} +
+ +
+ + + @{{ errors.first('promotion_category_id') }} +
+ +
+ + + + @{{ errors.first('hostname') }} +
+ +
+ + + {{-- currencies and locales --}} + +
+ +
+ + + @{{ errors.first('locales[]') }} +
+ +
+ + + @{{ errors.first('default_locale_id') }} +
+ +
+ + + @{{ errors.first('currencies[]') }} +
+ +
+ + + @{{ errors.first('base_currency_id') }} +
+ +
+ + + {{-- design --}} + +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + {{-- home page seo --}} + +
+
+ + + @{{ errors.first('seo_title') }} +
+ +
+ + + + + @{{ errors.first('seo_description') }} +
+ +
+ + + + + @{{ errors.first('seo_keywords') }} +
+
+ + + {{-- maintenance mode --}} + +
+
+ + +
+ +
+ + +
+ +
+ + +
+
+ + + {!! view_render_event('bagisto.admin.settings.channel.create.after') !!} +
+
+
+
+@stop + +@push('scripts') + @include('admin::layouts.tinymce') + + +@endpush \ No newline at end of file diff --git a/packages/Sarga/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Sarga/Admin/src/Resources/views/settings/channels/edit.blade.php new file mode 100644 index 000000000..4ca423811 --- /dev/null +++ b/packages/Sarga/Admin/src/Resources/views/settings/channels/edit.blade.php @@ -0,0 +1,325 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.settings.channels.edit-title') }} +@stop + +@section('content') +
+ @php $locale = core()->getRequestedLocaleCode(); @endphp + +
+
+
+

+ + + {{ __('admin::app.settings.channels.edit-title') }} +

+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ @csrf() + + + {!! view_render_event('bagisto.admin.settings.channel.edit.before') !!} + + {{-- general --}} + +
+ +
+ + + + @{{ errors.first('code') }} +
+ +
+ + + @{{ errors.first('{!!$locale!!}[page_title]') }} +
+ +
+ + +
+ +
+ + inventory_sources->pluck('id')->toArray() ?> + + @{{ errors.first('inventory_sources[]') }} +
+ +
+ + root_category_id ?> + + @{{ errors.first('root_category_id') }} +
+
+ + + @{{ errors.first('promotion_category_id') }} +
+
+ + + + @{{ errors.first('hostname') }} +
+ +
+ + + {{-- currencies and locales --}} + +
+ +
+ + locales->pluck('id')->toArray() ?> + + @{{ errors.first('locales[]') }} +
+ +
+ + default_locale_id ?> + + @{{ errors.first('default_locale_id') }} +
+ +
+ + currencies->pluck('id')->toArray() ?> + + @{{ errors.first('currencies[]') }} +
+ +
+ + base_currency_id ?> + + @{{ errors.first('base_currency_id') }} +
+ +
+ + + {{-- design --}} + +
+
+ + + theme ?> + + +
+ +
+ + +
+ +
+ + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + @php + $home_seo = $channel->translate($locale)['home_seo'] ?? $channel->home_seo; + $seo = json_decode($home_seo); + @endphp + + {{-- home page seo --}} + +
+
+ + + + + @{{ errors.first('{!!$locale!!}[page_title]') }} +
+ +
+ + + + + @{{ errors.first('{!!$locale!!}[page_title]') }} +
+ +
+ + + + + @{{ errors.first('{!!$locale!!}[page_title]') }} +
+
+ + + {{-- maintenance mode --}} + +
+
+ + +
+ +
+ + +
+ +
+ + +
+
+ + + {!! view_render_event('bagisto.admin.settings.channel.edit.after') !!} +
+
+
+
+@stop + +@push('scripts') + @include('admin::layouts.tinymce') + + +@endpush \ No newline at end of file diff --git a/packages/Sarga/Admin/src/Routes/settings-routes.php b/packages/Sarga/Admin/src/Routes/settings-routes.php new file mode 100644 index 000000000..e77304a85 --- /dev/null +++ b/packages/Sarga/Admin/src/Routes/settings-routes.php @@ -0,0 +1,21 @@ + ['web', 'admin', 'admin_locale'], 'prefix' => config('app.admin_url')], function () { + /** + * Channels routes. + */ + + Route::get('/channels/create', [ChannelController::class, 'create'])->defaults('_config', [ + 'view' => 'sarga_admin::settings.channels.create', + ])->name('admin.channels.create'); + + + Route::get('/channels/edit/{id}', [ChannelController::class, 'edit'])->defaults('_config', [ + 'view' => 'sarga_admin::settings.channels.edit', + ])->name('admin.channels.edit'); + +}); diff --git a/packages/Sarga/Shop/src/Data/countries.json b/packages/Sarga/Shop/src/Data/countries.json new file mode 100644 index 000000000..11e790f43 --- /dev/null +++ b/packages/Sarga/Shop/src/Data/countries.json @@ -0,0 +1,7 @@ +[ + { + "id":1, + "code":"TM", + "name":"Turkmenistan" + } +] \ No newline at end of file diff --git a/packages/Sarga/Shop/src/Data/countries_ru.json b/packages/Sarga/Shop/src/Data/countries_ru.json new file mode 100644 index 000000000..efecd413f --- /dev/null +++ b/packages/Sarga/Shop/src/Data/countries_ru.json @@ -0,0 +1,10 @@ +[ + { + "country_id":1, + "name":"Турция" + }, + { + "country_id":2, + "name":"Туркменистан" + } +] \ No newline at end of file diff --git a/packages/Sarga/Shop/src/Data/countries_tm.json b/packages/Sarga/Shop/src/Data/countries_tm.json new file mode 100644 index 000000000..83a5114df --- /dev/null +++ b/packages/Sarga/Shop/src/Data/countries_tm.json @@ -0,0 +1,10 @@ +[ + { + "country_id":1, + "name":"Turkiýa" + }, + { + "country_id":2, + "name":"Türkmenistan" + } +] \ No newline at end of file diff --git a/packages/Sarga/Shop/src/Data/states.json b/packages/Sarga/Shop/src/Data/states.json new file mode 100644 index 000000000..f0abc65e9 --- /dev/null +++ b/packages/Sarga/Shop/src/Data/states.json @@ -0,0 +1,44 @@ +[ + { + "id":1, + "country_code":"TM", + "code":"ASH", + "default_name":"Aşkabat", + "country_id":1 + }, + { + "id":2, + "country_code":"TM", + "code":"AH", + "default_name":"Ahal", + "country_id":1 + }, + { + "id":3, + "country_code":"TM", + "code":"BN", + "default_name":"Balkan", + "country_id":1 + }, + { + "id":4, + "country_code":"TM", + "code":"DZ", + "default_name":"Daşoguz", + "country_id":1 + }, + { + "id":5, + "country_code":"TM", + "code":"LB", + "default_name":"Lebap", + "country_id":1 + }, + { + "id":6, + "country_code":"TM", + "code":"MR", + "default_name":"Mari", + "country_id":1 + } +] \ No newline at end of file diff --git a/packages/Sarga/Shop/src/Data/states_ru.json b/packages/Sarga/Shop/src/Data/states_ru.json new file mode 100644 index 000000000..a8aea5257 --- /dev/null +++ b/packages/Sarga/Shop/src/Data/states_ru.json @@ -0,0 +1,26 @@ +[ + { + "country_state_id":1, + "default_name":"Ашхабад" + }, + { + "country_state_id":2, + "default_name":"Ахал" + }, + { + "country_state_id":3, + "default_name":"Балкан" + }, + { + "country_state_id":4, + "default_name":"Дашогуз" + }, + { + "country_state_id":5, + "default_name":"Лебап" + }, + { + "country_state_id":6, + "default_name":"Мары" + } +] \ No newline at end of file diff --git a/packages/Sarga/Shop/src/Data/states_tm.json b/packages/Sarga/Shop/src/Data/states_tm.json new file mode 100644 index 000000000..6e247eb8a --- /dev/null +++ b/packages/Sarga/Shop/src/Data/states_tm.json @@ -0,0 +1,26 @@ +[ + { + "country_state_id":1, + "default_name":"Aşgabat" + }, + { + "country_state_id":2, + "default_name":"Ahal" + }, + { + "country_state_id":3, + "default_name":"Balkan" + }, + { + "country_state_id":4, + "default_name":"Daşoguz" + }, + { + "country_state_id":5, + "default_name":"Lebap" + }, + { + "country_state_id":6, + "default_name":"Mary" + } +] \ No newline at end of file diff --git a/packages/Sarga/Shop/src/Database/Seeders/CategoryTableSeeder.php b/packages/Sarga/Shop/src/Database/Seeders/CategoryTableSeeder.php new file mode 100644 index 000000000..f23984efc --- /dev/null +++ b/packages/Sarga/Shop/src/Database/Seeders/CategoryTableSeeder.php @@ -0,0 +1,185 @@ +delete(); + + DB::table('category_translations')->delete(); + + $now = Carbon::now(); + + DB::table('categories')->insert([ + [ + 'id' => '1', + 'position' => '1', + 'image' => NULL, + 'status' => '1', + '_lft' => '1', + '_rgt' => '14', + 'parent_id' => NULL, + 'created_at' => $now, + 'updated_at' => $now, + ], + [ + 'id' => '2', + 'position' => '2', + 'image' => NULL, + 'status' => '1', + '_lft' => '1', + '_rgt' => '14', + 'parent_id' => NULL, + 'created_at' => $now, + 'updated_at' => $now, + ], + [ + 'id' => '3', + 'position' => '3', + 'image' => NULL, + 'status' => '1', + '_lft' => '1', + '_rgt' => '14', + 'parent_id' => NULL, + 'created_at' => $now, + 'updated_at' => $now, + ] + ]); + + DB::table('category_translations')->insert([ + [ + 'name' => 'Trendyol', + 'slug' => 'trendyol', + 'description' => 'Trendyol', + 'meta_title' => '', + 'meta_description' => '', + 'meta_keywords' => '', + 'category_id' => '1', + 'locale' => 'en', + ], + [ + 'name' => 'Trendyol', + 'slug' => 'trendyol', + 'description' => 'Trendyol', + 'meta_title' => '', + 'meta_description' => '', + 'meta_keywords' => '', + 'category_id' => '1', + 'locale' => 'ru', + ], + [ + 'name' => 'Trendyol', + 'slug' => 'trendyol', + 'description' => 'Trendyol', + 'meta_title' => '', + 'meta_description' => '', + 'meta_keywords' => '', + 'category_id' => '1', + 'locale' => 'tm', + ], + [ + 'name' => 'Trendyol', + 'slug' => 'trendyol', + 'description' => 'Trendyol', + 'meta_title' => '', + 'meta_description' => '', + 'meta_keywords' => '', + 'category_id' => '1', + 'locale' => 'tr', + ], + //lcw + [ + 'name' => 'LCW', + 'slug' => 'lcw', + 'description' => 'LCW', + 'meta_title' => '', + 'meta_description' => '', + 'meta_keywords' => '', + 'category_id' => '2', + 'locale' => 'en', + ], + [ + 'name' => 'LCW', + 'slug' => 'lcw', + 'description' => 'LCW', + 'meta_title' => '', + 'meta_description' => '', + 'meta_keywords' => '', + 'category_id' => '2', + 'locale' => 'ru', + ], + [ + 'name' => 'LCW', + 'slug' => 'lcw', + 'description' => 'LCW', + 'meta_title' => '', + 'meta_description' => '', + 'meta_keywords' => '', + 'category_id' => '2', + 'locale' => 'tm', + ], + [ + 'name' => 'LCW', + 'slug' => 'lcw', + 'description' => 'LCW', + 'meta_title' => '', + 'meta_description' => '', + 'meta_keywords' => '', + 'category_id' => '2', + 'locale' => 'tr', + ], + //outlet + [ + 'name' => 'Outlet', + 'slug' => 'outlet', + 'description' => 'Outlet', + 'meta_title' => '', + 'meta_description' => '', + 'meta_keywords' => '', + 'category_id' => '3', + 'locale' => 'en', + ], + [ + 'name' => 'Outlet', + 'slug' => 'outlet', + 'description' => 'Outlet', + 'meta_title' => '', + 'meta_description' => '', + 'meta_keywords' => '', + 'category_id' => '3', + 'locale' => 'ru', + ], + [ + 'name' => 'Outlet', + 'slug' => 'outlet', + 'description' => 'Outlet', + 'meta_title' => '', + 'meta_description' => '', + 'meta_keywords' => '', + 'category_id' => '3', + 'locale' => 'tm', + ], + [ + 'name' => 'Outlet', + 'slug' => 'outlet', + 'description' => 'Outlet', + 'meta_title' => '', + 'meta_description' => '', + 'meta_keywords' => '', + 'category_id' => '3', + 'locale' => 'tr', + ] + ]); + } +} diff --git a/packages/Sarga/Shop/src/Database/Seeders/ChannelTableSeeder.php b/packages/Sarga/Shop/src/Database/Seeders/ChannelTableSeeder.php index f42539824..6c3f28374 100644 --- a/packages/Sarga/Shop/src/Database/Seeders/ChannelTableSeeder.php +++ b/packages/Sarga/Shop/src/Database/Seeders/ChannelTableSeeder.php @@ -12,19 +12,39 @@ class ChannelTableSeeder extends Seeder */ public function run() { + DB::table('channels')->delete(); + DB::table('channels')->insert([ - 'id' => 2, - 'code' => 'test', - 'theme' => 'default', - 'hostname' => config('app.url').'/test', - 'root_category_id' => 2, - 'default_locale_id' => 1, - 'base_currency_id' => 1, + [ + 'id' => 1, + 'code' => 'Trendyol', + 'theme' => 'default', + 'hostname' => config('app.url'), + 'root_category_id' => 1, + 'default_locale_id' => 1, + 'base_currency_id' => 1 + ],[ + 'id' => 2, + 'code' => 'LCW', + 'theme' => 'default', + 'hostname' => config('app.url').'/lcw', + 'root_category_id' => 2, + 'default_locale_id' => 1, + 'base_currency_id' => 1 + ],[ + 'id' => 3, + 'code' => 'Outlet', + 'theme' => 'default', + 'hostname' => config('app.url').'/outlet', + 'root_category_id' => 3, + 'default_locale_id' => 1, + 'base_currency_id' => 1 + ], ]); DB::table('channel_translations')->insert([ [ - 'id' => 6, - 'channel_id' => 2, + 'id' => 1, + 'channel_id' => 1, 'locale' => 'en', 'name' => 'Test', 'home_page_content' => ' @@ -63,10 +83,10 @@ class ChannelTableSeeder extends Seeder ', 'home_seo' => '{"meta_title": "Demo store", "meta_keywords": "Demo store meta keyword", "meta_description": "Demo store meta description"}', ], [ - 'id' => 7, - 'channel_id' => 2, + 'id' => 2, + 'channel_id' => 1, 'locale' => 'tr', - 'name' => 'Test', + 'name' => 'Trendyol', 'home_page_content' => '

@include("shop::home.slider") @include("shop::home.featured-products") @include("shop::home.new-products")