+
diff --git a/composer.json b/composer.json
index 4a7a583a5..a689929d3 100755
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,9 @@
"ext-pdo": "*",
"ext-pdo_mysql": "*",
"ext-tokenizer": "*",
+ "algolia/algoliasearch-client-php": "^2.2",
"astrotomic/laravel-translatable": "^11.0.0",
+ "babenkoivan/elastic-scout-driver": "^1.1",
"barryvdh/laravel-debugbar": "^3.1",
"barryvdh/laravel-dompdf": "0.8.6",
"doctrine/dbal": "2.9.2",
@@ -30,6 +32,7 @@
"kalnoy/nestedset": "5.0.1",
"konekt/concord": "^1.2",
"laravel/framework": "^7.0",
+ "laravel/scout": "^8.0",
"laravel/socialite": "^4.4",
"laravel/tinker": "^2.0",
"laravel/ui": "^2.0",
diff --git a/composer.lock b/composer.lock
index 0583a4c69..228bcf12f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,78 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "a64bc9824943e94bc0643161f1bb59d4",
+ "content-hash": "fdf74de7a5b3178ce60852ca512a6f21",
"packages": [
+ {
+ "name": "algolia/algoliasearch-client-php",
+ "version": "2.7.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/algolia/algoliasearch-client-php.git",
+ "reference": "ce8b35a5aa842ad3e0dc05bbd7aaf5ed82481d71"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/algolia/algoliasearch-client-php/zipball/ce8b35a5aa842ad3e0dc05bbd7aaf5ed82481d71",
+ "reference": "ce8b35a5aa842ad3e0dc05bbd7aaf5ed82481d71",
+ "shasum": ""
+ },
+ "require": {
+ "ext-curl": "*",
+ "ext-json": "*",
+ "ext-mbstring": "*",
+ "php": "^5.3 || ^7.0",
+ "psr/http-message": "^1.0",
+ "psr/log": "^1.0",
+ "psr/simple-cache": "^1.0"
+ },
+ "require-dev": {
+ "friendsofphp/php-cs-fixer": "^2.0",
+ "fzaninotto/faker": "^1.8",
+ "phpunit/phpunit": "^4.8",
+ "symfony/yaml": "^2.0 || ^4.0"
+ },
+ "suggest": {
+ "guzzlehttp/guzzle": "If you prefer to use Guzzle HTTP client instead of the Http Client implementation provided by the package"
+ },
+ "bin": [
+ "bin/algolia-doctor"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-2.0": "2.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Algolia\\AlgoliaSearch\\": "src/"
+ },
+ "files": [
+ "src/Http/Psr7/functions.php",
+ "src/functions.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Algolia Team",
+ "email": "contact@algolia.com"
+ }
+ ],
+ "description": "Algolia Search API Client for PHP",
+ "keywords": [
+ "algolia",
+ "api",
+ "client",
+ "php",
+ "search"
+ ],
+ "time": "2020-06-25T08:47:13+00:00"
+ },
{
"name": "astrotomic/laravel-translatable",
"version": "v11.8.1",
@@ -69,25 +139,168 @@
"laravel",
"translation"
],
- "funding": [
+ "time": "2020-04-23T08:57:35+00:00"
+ },
+ {
+ "name": "babenkoivan/elastic-adapter",
+ "version": "v1.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/babenkoivan/elastic-adapter.git",
+ "reference": "d4823c6c9629cc954ec247347e50c1e7a2c8d1b7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/babenkoivan/elastic-adapter/zipball/d4823c6c9629cc954ec247347e50c1e7a2c8d1b7",
+ "reference": "d4823c6c9629cc954ec247347e50c1e7a2c8d1b7",
+ "shasum": ""
+ },
+ "require": {
+ "elasticsearch/elasticsearch": "^7.3",
+ "php": "^7.2"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^8.4"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "ElasticAdapter\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
{
- "url": "https://plant.treeware.earth/Astrotomic/laravel-translatable",
- "type": "custom"
- },
- {
- "url": "https://github.com/Gummibeer",
- "type": "github"
- },
- {
- "url": "https://issuehunt.io/r/astrotomic",
- "type": "issuehunt"
- },
- {
- "url": "https://opencollective.com/astrotomic",
- "type": "open_collective"
+ "name": "Ivan Babenko",
+ "email": "babenko.i.a@gmail.com"
}
],
- "time": "2020-04-23T08:57:35+00:00"
+ "description": "Adapter for official PHP Elasticsearch client",
+ "keywords": [
+ "adapter",
+ "client",
+ "elastic",
+ "elasticsearch",
+ "php"
+ ],
+ "time": "2020-06-20T09:53:44+00:00"
+ },
+ {
+ "name": "babenkoivan/elastic-client",
+ "version": "v1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/babenkoivan/elastic-client.git",
+ "reference": "0aa13e8fa1e64f4475b16b6bae1a0ed17b33349c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/babenkoivan/elastic-client/zipball/0aa13e8fa1e64f4475b16b6bae1a0ed17b33349c",
+ "reference": "0aa13e8fa1e64f4475b16b6bae1a0ed17b33349c",
+ "shasum": ""
+ },
+ "require": {
+ "elasticsearch/elasticsearch": "^7.3",
+ "php": "^7.2"
+ },
+ "require-dev": {
+ "orchestra/testbench": "^4.3",
+ "phpunit/phpunit": "^8.4"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "ElasticClient\\ServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "ElasticClient\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ivan Babenko",
+ "email": "babenko.i.a@gmail.com"
+ }
+ ],
+ "description": "The official PHP Elasticsearch client integrated with Laravel",
+ "keywords": [
+ "client",
+ "elastic",
+ "elasticsearch",
+ "laravel",
+ "php"
+ ],
+ "time": "2020-05-12T17:55:14+00:00"
+ },
+ {
+ "name": "babenkoivan/elastic-scout-driver",
+ "version": "v1.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/babenkoivan/elastic-scout-driver.git",
+ "reference": "d9343e84cdbddbff7cac161c91d1f8b5e9603cf3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/babenkoivan/elastic-scout-driver/zipball/d9343e84cdbddbff7cac161c91d1f8b5e9603cf3",
+ "reference": "d9343e84cdbddbff7cac161c91d1f8b5e9603cf3",
+ "shasum": ""
+ },
+ "require": {
+ "babenkoivan/elastic-adapter": "^1.0",
+ "babenkoivan/elastic-client": "^1.0",
+ "php": "^7.2"
+ },
+ "require-dev": {
+ "babenkoivan/elastic-migrations": "^1.0",
+ "laravel/scout": "^8.0",
+ "orchestra/testbench": "^5.2",
+ "phpunit/phpunit": "^8.5"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "ElasticScoutDriver\\ServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "ElasticScoutDriver\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ivan Babenko",
+ "email": "babenko.i.a@gmail.com"
+ }
+ ],
+ "description": "Elasticsearch driver for Laravel Scout",
+ "keywords": [
+ "driver",
+ "elastic",
+ "elasticsearch",
+ "laravel",
+ "php",
+ "scout"
+ ],
+ "time": "2020-06-22T14:14:32+00:00"
},
{
"name": "barryvdh/laravel-debugbar",
@@ -155,12 +368,6 @@
"profiler",
"webprofiler"
],
- "funding": [
- {
- "url": "https://github.com/barryvdh",
- "type": "github"
- }
- ],
"time": "2020-05-05T10:53:32+00:00"
},
{
@@ -263,12 +470,6 @@
"brick",
"math"
],
- "funding": [
- {
- "url": "https://tidelift.com/funding/github/packagist/brick/math",
- "type": "tidelift"
- }
- ],
"time": "2020-04-15T15:59:35+00:00"
},
{
@@ -384,20 +585,6 @@
"redis",
"xcache"
],
- "funding": [
- {
- "url": "https://www.doctrine-project.org/sponsorship.html",
- "type": "custom"
- },
- {
- "url": "https://www.patreon.com/phpdoctrine",
- "type": "patreon"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
- "type": "tidelift"
- }
- ],
"time": "2020-05-27T16:24:54+00:00"
},
{
@@ -633,20 +820,6 @@
"uppercase",
"words"
],
- "funding": [
- {
- "url": "https://www.doctrine-project.org/sponsorship.html",
- "type": "custom"
- },
- {
- "url": "https://www.patreon.com/phpdoctrine",
- "type": "patreon"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector",
- "type": "tidelift"
- }
- ],
"time": "2020-05-29T15:13:26+00:00"
},
{
@@ -709,20 +882,6 @@
"parser",
"php"
],
- "funding": [
- {
- "url": "https://www.doctrine-project.org/sponsorship.html",
- "type": "custom"
- },
- {
- "url": "https://www.patreon.com/phpdoctrine",
- "type": "patreon"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
- "type": "tidelift"
- }
- ],
"time": "2020-05-25T17:44:05+00:00"
},
{
@@ -903,6 +1062,170 @@
],
"time": "2020-02-13T22:36:52+00:00"
},
+ {
+ "name": "elasticsearch/elasticsearch",
+ "version": "v7.8.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/elastic/elasticsearch-php.git",
+ "reference": "5c2d039ae7bdaa1e28f1e66971c5b3314fc36383"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/5c2d039ae7bdaa1e28f1e66971c5b3314fc36383",
+ "reference": "5c2d039ae7bdaa1e28f1e66971c5b3314fc36383",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": ">=1.3.7",
+ "ezimuel/ringphp": "^1.1.2",
+ "php": "^7.1",
+ "psr/log": "~1.0"
+ },
+ "require-dev": {
+ "cpliakas/git-wrapper": "~2.0",
+ "doctrine/inflector": "^1.3",
+ "mockery/mockery": "^1.2",
+ "phpstan/phpstan": "^0.12",
+ "phpunit/phpunit": "^7.5",
+ "squizlabs/php_codesniffer": "^3.4",
+ "symfony/finder": "~4.0",
+ "symfony/yaml": "~4.0"
+ },
+ "suggest": {
+ "ext-curl": "*",
+ "monolog/monolog": "Allows for client-level logging and tracing"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/autoload.php"
+ ],
+ "psr-4": {
+ "Elasticsearch\\": "src/Elasticsearch/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Zachary Tong"
+ },
+ {
+ "name": "Enrico Zimuel"
+ }
+ ],
+ "description": "PHP Client for Elasticsearch",
+ "keywords": [
+ "client",
+ "elasticsearch",
+ "search"
+ ],
+ "time": "2020-06-18T19:23:29+00:00"
+ },
+ {
+ "name": "ezimuel/guzzlestreams",
+ "version": "3.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ezimuel/guzzlestreams.git",
+ "reference": "abe3791d231167f14eb80d413420d1eab91163a8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/abe3791d231167f14eb80d413420d1eab91163a8",
+ "reference": "abe3791d231167f14eb80d413420d1eab91163a8",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Stream\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "Fork of guzzle/streams (abandoned) to be used with elasticsearch-php",
+ "homepage": "http://guzzlephp.org/",
+ "keywords": [
+ "Guzzle",
+ "stream"
+ ],
+ "time": "2020-02-14T23:11:50+00:00"
+ },
+ {
+ "name": "ezimuel/ringphp",
+ "version": "1.1.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ezimuel/ringphp.git",
+ "reference": "0b78f89d8e0bb9e380046c31adfa40347e9f663b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/0b78f89d8e0bb9e380046c31adfa40347e9f663b",
+ "reference": "0b78f89d8e0bb9e380046c31adfa40347e9f663b",
+ "shasum": ""
+ },
+ "require": {
+ "ezimuel/guzzlestreams": "^3.0.1",
+ "php": ">=5.4.0",
+ "react/promise": "~2.0"
+ },
+ "require-dev": {
+ "ext-curl": "*",
+ "phpunit/phpunit": "~4.0"
+ },
+ "suggest": {
+ "ext-curl": "Guzzle will use specific adapters if cURL is present"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Ring\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php",
+ "time": "2020-02-14T23:51:21+00:00"
+ },
{
"name": "fideloper/proxy",
"version": "4.3.0",
@@ -1825,6 +2148,71 @@
],
"time": "2020-06-02T22:34:18+00:00"
},
+ {
+ "name": "laravel/scout",
+ "version": "v8.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laravel/scout.git",
+ "reference": "85e018b752088057881f780e05a85c8657ff8e95"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laravel/scout/zipball/85e018b752088057881f780e05a85c8657ff8e95",
+ "reference": "85e018b752088057881f780e05a85c8657ff8e95",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/bus": "^6.0|^7.0",
+ "illuminate/contracts": "^6.0|^7.0",
+ "illuminate/database": "^6.0|^7.0",
+ "illuminate/pagination": "^6.0|^7.0",
+ "illuminate/queue": "^6.0|^7.0",
+ "illuminate/support": "^6.0|^7.0",
+ "php": "^7.2"
+ },
+ "require-dev": {
+ "algolia/algoliasearch-client-php": "^2.2",
+ "mockery/mockery": "^1.0",
+ "phpunit/phpunit": "^8.0"
+ },
+ "suggest": {
+ "algolia/algoliasearch-client-php": "Required to use the Algolia engine (^2.2)."
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "8.x-dev"
+ },
+ "laravel": {
+ "providers": [
+ "Laravel\\Scout\\ScoutServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Laravel\\Scout\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ }
+ ],
+ "description": "Laravel Scout provides a driver based solution to searching your Eloquent models.",
+ "keywords": [
+ "algolia",
+ "laravel",
+ "search"
+ ],
+ "time": "2020-04-21T19:33:18+00:00"
+ },
{
"name": "laravel/socialite",
"version": "v4.4.1",
@@ -2062,16 +2450,6 @@
"JWS",
"jwt"
],
- "funding": [
- {
- "url": "https://github.com/lcobucci",
- "type": "github"
- },
- {
- "url": "https://www.patreon.com/lcobucci",
- "type": "patreon"
- }
- ],
"time": "2020-05-22T08:21:12+00:00"
},
{
@@ -2146,32 +2524,6 @@
"md",
"parser"
],
- "funding": [
- {
- "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark",
- "type": "custom"
- },
- {
- "url": "https://www.colinodell.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://www.paypal.me/colinpodell/10.00",
- "type": "custom"
- },
- {
- "url": "https://github.com/colinodell",
- "type": "github"
- },
- {
- "url": "https://www.patreon.com/colinodell",
- "type": "patreon"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/league/commonmark",
- "type": "tidelift"
- }
- ],
"time": "2020-05-04T22:15:21+00:00"
},
{
@@ -2256,12 +2608,6 @@
"sftp",
"storage"
],
- "funding": [
- {
- "url": "https://offset.earth/frankdejonge",
- "type": "other"
- }
- ],
"time": "2020-05-18T15:13:39+00:00"
},
{
@@ -2392,16 +2738,6 @@
"php",
"phpspreadsheet"
],
- "funding": [
- {
- "url": "https://laravel-excel.com/commercial-support",
- "type": "custom"
- },
- {
- "url": "https://github.com/patrickbrouwers",
- "type": "github"
- }
- ],
"time": "2020-02-28T15:47:45+00:00"
},
{
@@ -2463,12 +2799,6 @@
"stream",
"zip"
],
- "funding": [
- {
- "url": "https://opencollective.com/zipstream",
- "type": "open_collective"
- }
- ],
"time": "2020-05-30T13:11:16+00:00"
},
{
@@ -2775,16 +3105,6 @@
"logging",
"psr-3"
],
- "funding": [
- {
- "url": "https://github.com/Seldaek",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
- "type": "tidelift"
- }
- ],
"time": "2020-05-22T08:12:19+00:00"
},
{
@@ -2967,16 +3287,6 @@
"datetime",
"time"
],
- "funding": [
- {
- "url": "https://opencollective.com/Carbon",
- "type": "open_collective"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
- "type": "tidelift"
- }
- ],
"time": "2020-05-24T18:27:52+00:00"
},
{
@@ -3316,16 +3626,6 @@
"php",
"type"
],
- "funding": [
- {
- "url": "https://github.com/GrahamCampbell",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
- "type": "tidelift"
- }
- ],
"time": "2020-06-07T10:40:07+00:00"
},
{
@@ -3929,13 +4229,53 @@
"identifier",
"uuid"
],
- "funding": [
+ "time": "2020-03-29T20:13:32+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": ""
+ },
+ "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": [
{
- "url": "https://github.com/ramsey",
- "type": "github"
+ "name": "Jan Sorgalla",
+ "email": "jsorgalla@gmail.com"
}
],
- "time": "2020-03-29T20:13:32+00:00"
+ "description": "A lightweight implementation of CommonJS Promises/A for PHP",
+ "keywords": [
+ "promise",
+ "promises"
+ ],
+ "time": "2020-05-12T15:16:56+00:00"
},
{
"name": "sabberworm/php-css-parser",
@@ -4121,20 +4461,6 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-30T20:35:19+00:00"
},
{
@@ -4188,20 +4514,6 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-20T17:43:50+00:00"
},
{
@@ -4259,20 +4571,6 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-24T08:33:35+00:00"
},
{
@@ -4319,20 +4617,6 @@
],
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-27T08:34:37+00:00"
},
{
@@ -4390,20 +4674,6 @@
],
"description": "Symfony ErrorHandler Component",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-30T20:35:19+00:00"
},
{
@@ -4476,20 +4746,6 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-20T17:43:50+00:00"
},
{
@@ -4548,20 +4804,6 @@
"interoperability",
"standards"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-20T17:43:50+00:00"
},
{
@@ -4611,20 +4853,6 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-20T17:43:50+00:00"
},
{
@@ -4686,20 +4914,6 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-24T12:18:07+00:00"
},
{
@@ -4799,20 +5013,6 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-31T06:14:18+00:00"
},
{
@@ -4876,20 +5076,6 @@
"mime",
"mime-type"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-25T12:33:44+00:00"
},
{
@@ -4948,20 +5134,6 @@
"polyfill",
"portable"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-12T16:14:59+00:00"
},
{
@@ -5021,20 +5193,6 @@
"portable",
"shim"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-12T16:47:27+00:00"
},
{
@@ -5095,20 +5253,6 @@
"portable",
"shim"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-12T16:47:27+00:00"
},
{
@@ -5171,20 +5315,6 @@
"portable",
"shim"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-12T16:47:27+00:00"
},
{
@@ -5248,20 +5378,6 @@
"portable",
"shim"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-12T16:14:59+00:00"
},
{
@@ -5321,20 +5437,6 @@
"portable",
"shim"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-12T16:47:27+00:00"
},
{
@@ -5391,20 +5493,6 @@
"portable",
"shim"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-12T16:47:27+00:00"
},
{
@@ -5460,20 +5548,6 @@
"portable",
"shim"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-12T16:47:27+00:00"
},
{
@@ -5532,20 +5606,6 @@
"portable",
"shim"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-12T16:47:27+00:00"
},
{
@@ -5608,20 +5668,6 @@
"portable",
"shim"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-12T16:47:27+00:00"
},
{
@@ -5674,20 +5720,6 @@
"polyfill",
"shim"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-12T16:14:59+00:00"
},
{
@@ -5738,20 +5770,6 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-30T20:35:19+00:00"
},
{
@@ -5830,20 +5848,6 @@
"uri",
"url"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-30T20:35:19+00:00"
},
{
@@ -5902,20 +5906,6 @@
"interoperability",
"standards"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-20T17:43:50+00:00"
},
{
@@ -5987,20 +5977,6 @@
"utf-8",
"utf8"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-20T17:43:50+00:00"
},
{
@@ -6079,20 +6055,6 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-30T20:35:19+00:00"
},
{
@@ -6150,20 +6112,6 @@
"interoperability",
"standards"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-20T17:43:50+00:00"
},
{
@@ -6240,20 +6188,6 @@
"debug",
"dump"
],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-30T20:35:19+00:00"
},
{
@@ -6377,12 +6311,6 @@
"jwt",
"laravel"
],
- "funding": [
- {
- "url": "https://www.patreon.com/seantymon",
- "type": "patreon"
- }
- ],
"time": "2020-03-04T11:21:28+00:00"
},
{
@@ -6447,16 +6375,6 @@
"env",
"environment"
],
- "funding": [
- {
- "url": "https://github.com/GrahamCampbell",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
- "type": "tidelift"
- }
- ],
"time": "2020-06-07T18:25:35+00:00"
},
{
@@ -6505,24 +6423,6 @@
"clean",
"php"
],
- "funding": [
- {
- "url": "https://www.paypal.me/moelleken",
- "type": "custom"
- },
- {
- "url": "https://github.com/voku",
- "type": "github"
- },
- {
- "url": "https://www.patreon.com/voku",
- "type": "patreon"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii",
- "type": "tidelift"
- }
- ],
"time": "2020-05-26T06:40:44+00:00"
}
],
@@ -7105,20 +7005,6 @@
"constructor",
"instantiate"
],
- "funding": [
- {
- "url": "https://www.doctrine-project.org/sponsorship.html",
- "type": "custom"
- },
- {
- "url": "https://www.patreon.com/phpdoctrine",
- "type": "patreon"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
- "type": "tidelift"
- }
- ],
"time": "2020-05-29T17:27:14+00:00"
},
{
@@ -7458,20 +7344,6 @@
"php",
"symfony"
],
- "funding": [
- {
- "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L",
- "type": "custom"
- },
- {
- "url": "https://github.com/nunomaduro",
- "type": "github"
- },
- {
- "url": "https://www.patreon.com/nunomaduro",
- "type": "patreon"
- }
- ],
"time": "2020-04-04T19:56:08+00:00"
},
{
@@ -8185,16 +8057,6 @@
"testing",
"xunit"
],
- "funding": [
- {
- "url": "https://phpunit.de/donate.html",
- "type": "custom"
- },
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
"time": "2020-05-22T13:51:52+00:00"
},
{
@@ -8869,20 +8731,6 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-23T13:13:03+00:00"
},
{
@@ -8945,20 +8793,6 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-23T13:08:13+00:00"
},
{
@@ -9022,20 +8856,6 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-05-20T17:43:50+00:00"
},
{
@@ -9142,6 +8962,5 @@
"ext-pdo_mysql": "*",
"ext-tokenizer": "*"
},
- "platform-dev": [],
- "plugin-api-version": "1.1.0"
+ "platform-dev": []
}
diff --git a/config/elastic.client.php b/config/elastic.client.php
new file mode 100644
index 000000000..13fb60386
--- /dev/null
+++ b/config/elastic.client.php
@@ -0,0 +1,7 @@
+ [
+ env('ELASTIC_HOST', 'localhost:9200'),
+ ]
+];
diff --git a/config/elastic.scout_driver.php b/config/elastic.scout_driver.php
new file mode 100644
index 000000000..b28fe35a3
--- /dev/null
+++ b/config/elastic.scout_driver.php
@@ -0,0 +1,5 @@
+ env('ELASTIC_SCOUT_DRIVER_REFRESH_DOCUMENTS', false)
+];
diff --git a/config/scout.php b/config/scout.php
new file mode 100644
index 000000000..b2f0f4d22
--- /dev/null
+++ b/config/scout.php
@@ -0,0 +1,91 @@
+ env('SCOUT_DRIVER', null),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Index Prefix
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify a prefix that will be applied to all search index
+ | names used by Scout. This prefix may be useful if you have multiple
+ | "tenants" or applications sharing the same search infrastructure.
+ |
+ */
+
+ 'prefix' => env('SCOUT_PREFIX', ''),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Queue Data Syncing
+ |--------------------------------------------------------------------------
+ |
+ | This option allows you to control if the operations that sync your data
+ | with your search engines are queued. When this is set to "true" then
+ | all automatic data syncing will get queued for better performance.
+ |
+ */
+
+ 'queue' => env('SCOUT_QUEUE', true),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Chunk Sizes
+ |--------------------------------------------------------------------------
+ |
+ | These options allow you to control the maximum chunk size when you are
+ | mass importing data into the search engine. This allows you to fine
+ | tune each of these chunk sizes based on the power of the servers.
+ |
+ */
+
+ 'chunk' => [
+ 'searchable' => 500,
+ 'unsearchable' => 500,
+ ],
+
+ /*
+ |--------------------------------------------------------------------------
+ | Soft Deletes
+ |--------------------------------------------------------------------------
+ |
+ | This option allows to control whether to keep soft deleted records in
+ | the search indexes. Maintaining soft deleted records can be useful
+ | if your application still needs to search for the records later.
+ |
+ */
+
+ 'soft_delete' => false,
+
+ /*
+ |--------------------------------------------------------------------------
+ | Algolia Configuration
+ |--------------------------------------------------------------------------
+ |
+ | Here you may configure your Algolia settings. Algolia is a cloud hosted
+ | search engine which works great with Scout out of the box. Just plug
+ | in your application ID and admin API key to get started searching.
+ |
+ */
+
+ 'algolia' => [
+ 'id' => env('ALGOLIA_APP_ID', ''),
+ 'secret' => env('ALGOLIA_SECRET', ''),
+ ],
+
+];
diff --git a/config/view.php b/config/view.php
index 2acfd9cc9..a9743c718 100755
--- a/config/view.php
+++ b/config/view.php
@@ -1,6 +1,16 @@
false,
/*
|--------------------------------------------------------------------------
diff --git a/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php
index dbdaed761..74e764713 100755
--- a/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php
+++ b/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php
@@ -10,6 +10,7 @@ use Webkul\User\Database\Seeders\DatabaseSeeder as UserSeeder;
use Webkul\Customer\Database\Seeders\DatabaseSeeder as CustomerSeeder;
use Webkul\Inventory\Database\Seeders\DatabaseSeeder as InventorySeeder;
use Webkul\CMS\Database\Seeders\DatabaseSeeder as CMSSeeder;
+use Webkul\SocialLogin\Database\Seeders\DatabaseSeeder as SocialLoginSeeder;
class DatabaseSeeder extends Seeder
{
@@ -27,5 +28,6 @@ class DatabaseSeeder extends Seeder
$this->call(UserSeeder::class);
$this->call(CustomerSeeder::class);
$this->call(CMSSeeder::class);
+ $this->call(SocialLoginSeeder::class);
}
-}
\ No newline at end of file
+}
diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php
index 70717e83c..7a9415c33 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php
@@ -241,6 +241,8 @@ class DashboardController extends Controller
->addSelect('id', 'customer_id', 'customer_email', 'customer_first_name', 'customer_last_name')
->where('orders.created_at', '>=', $this->startDate)
->where('orders.created_at', '<=', $this->endDate)
+ ->where('orders.status', '<>', 'closed')
+ ->where('orders.status', '<>', 'canceled')
->groupBy('customer_email')
->orderBy('total_base_grand_total', 'DESC')
->limit(5)
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php
index 42239458b..df7479293 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php
@@ -108,8 +108,6 @@ class ShipmentController extends Controller
}
$this->validate(request(), [
- 'shipment.carrier_title' => 'required',
- 'shipment.track_number' => 'required',
'shipment.source' => 'required',
'shipment.items.*.*' => 'required|numeric|min:0',
]);
diff --git a/packages/Webkul/Admin/src/Listeners/Order.php b/packages/Webkul/Admin/src/Listeners/Order.php
index 95398c5b0..f2e1c06c5 100755
--- a/packages/Webkul/Admin/src/Listeners/Order.php
+++ b/packages/Webkul/Admin/src/Listeners/Order.php
@@ -16,22 +16,22 @@ class Order
{
/**
* Send new order Mail to the customer and admin
- *
+ *
* @param \Webkul\Sales\Contracts\Order $order
* @return void
*/
public function sendNewOrderMail($order)
{
try {
+ /* email to customer */
$configKey = 'emails.general.notifications.emails.general.notifications.new-order';
-
- if (core()->getConfigData($configKey)) {
+ if (core()->getConfigData($configKey))
Mail::queue(new NewOrderNotification($order));
- }
+ /* email to admin */
$configKey = 'emails.general.notifications.emails.general.notifications.new-admin';
-
if (core()->getConfigData($configKey)) {
+ app()->setLocale(env('APP_LOCALE'));
Mail::queue(new NewAdminNotification($order));
}
} catch (\Exception $e) {
@@ -41,7 +41,7 @@ class Order
/**
* Send new invoice mail to the customer
- *
+ *
* @param \Webkul\Sales\Contracts\Invoice $invoice
* @return void
*/
@@ -64,7 +64,7 @@ class Order
/**
* Send new refund mail to the customer
- *
+ *
* @param \Webkul\Sales\Contracts\Refund $refund
* @return void
*/
@@ -83,7 +83,7 @@ class Order
/**
* Send new shipment mail to the customer
- *
+ *
* @param \Webkul\Sales\Contracts\Shipment $shipment
* @return void
*/
diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
index 793e577a6..0c941c43c 100644
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -1304,6 +1304,7 @@ return [
'order-number-prefix' => 'بادئة رقم الطلب',
'order-number-length' => 'طول رقم الطلب',
'order-number-suffix' => 'لاحقة رقم الطلب',
+ 'order-number-generator-class' => 'مولد رقم الطلب',
'default' => 'إفتراضي',
'sandbox' => 'صندوق الرمل',
'all-channels' => 'الكل',
diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php
index bc078db9b..881147964 100755
--- a/packages/Webkul/Admin/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php
@@ -1318,6 +1318,7 @@ return array (
'order-number-prefix' => 'Auftragsnummer Präfix',
'order-number-length' => 'Auftragsnummer Länge',
'order-number-suffix' => 'Auftragsnummer Suffix',
+ 'order-number-generator-class' => 'Bestell nummern generator',
'default' => 'Standard',
'sandbox' => 'Sandbox',
'all-channels' => 'Alle',
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 64c96b06f..ac7a8ad25 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -1309,6 +1309,7 @@ return [
'order-number-prefix' => 'Order Number Prefix',
'order-number-length' => 'Order Number Length',
'order-number-suffix' => 'Order Number Suffix',
+ 'order-number-generator-class' => 'Order Number Generator',
'default' => 'Default',
'sandbox' => 'Sandbox',
'all-channels' => 'All Channels',
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index 80eb84b1c..6f88bc54e 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -1310,6 +1310,7 @@ return [
'order-number-prefix' => 'پیش شماره شماره سفارش',
'order-number-length' => 'طول شماره سفارش',
'order-number-suffix' => 'تعداد کافی شماره سفارش',
+ 'order-number-generator-class' => 'تولید کننده شماره سفارش',
'default' => 'پیش فرض',
'sandbox' => 'Sandbox',
'all-channels' => 'همه',
diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php
index a52ec4432..580ab92d2 100644
--- a/packages/Webkul/Admin/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php
@@ -1314,6 +1314,7 @@ return [
'order-number-prefix' => 'Prefisso Numero Ordine',
'order-number-length' => 'Lunghezza Numero Ordine',
'order-number-suffix' => 'Suffisso Numero Ordine',
+ 'order-number-generator-class' => 'Generatore di numeri dordine',
'default' => 'Default',
'sandbox' => 'Sandbox',
'all-channels' => 'Tutti',
diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
index 61795fb2d..3c67966f2 100644
--- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
@@ -1310,6 +1310,7 @@ return [
'order-number-prefix' => 'Bestelnummer prefix',
'order-number-length' => 'Bestelnummer Lengte',
'order-number-suffix' => 'Achtervoegsel bestelnummer',
+ 'order-number-generator-class' => 'Ordernummer Generator',
'default' => 'Standaard',
'sandbox' => 'Sandbox',
'all-channels' => 'Alles',
diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
index b0f54b7fb..a714a24b3 100644
--- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
@@ -1312,6 +1312,7 @@ return [
'order-number-prefix' => 'Prefiks numeru zamówienia',
'order-number-length' => 'Długość numeru zamówienia',
'order-number-suffix' => 'Sufiks numeru zamówienia”',
+ 'order-number-generator-class' => 'Generator numeru zamówienia',
'default' => 'Domyślna',
'sandbox' => 'Piaskownica',
'all-channels' => 'Wszystkie kanały',
diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
index 6e75ce54b..fb31ad0dc 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -1313,6 +1313,7 @@ return [
'order-number-prefix' => 'Prefixo do Número do Pedido',
'order-number-length' => 'Tamanho do Número do Pedido',
'order-number-suffix' => 'Sufixo do Número de Pedido',
+ 'order-number-generator-class' => 'Gerador de número de pedido',
'default' => 'Padrão',
'sandbox' => 'Sandbox',
'all-channels' => 'Todos',
diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
index 9e9451a1a..b9bd5afd2 100644
--- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
@@ -1299,6 +1299,7 @@ return [
'order-number-prefix' => 'Numara Ön Eki',
'order-number-length' => 'Numara Uzunluğu',
'order-number-suffix' => 'Numara Son Eki',
+ 'order-number-generator-class' => 'Sipariş Numarası Üreticisi',
'default' => 'Varsayılan',
'sandbox' => 'Havuz',
'all-channels' => 'Tümü',
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php
index 505ccc0d0..b596ff64d 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php
@@ -94,7 +94,7 @@
-