merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into issue-4510

This commit is contained in:
devansh bawari 2021-01-29 19:15:59 +05:30
parent 04a28f50f0 e1a32a2f83
commit 2e03a4dde4
23 changed files with 331 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

261
composer.lock generated
View File

@ -167,16 +167,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.172.1",
"version": "3.172.2",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "28a0929598be6e9e0b652091712068d37acd9d0a"
"reference": "47a4f005e51ffe158526f7ef7b5723b4313f823c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/28a0929598be6e9e0b652091712068d37acd9d0a",
"reference": "28a0929598be6e9e0b652091712068d37acd9d0a",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/47a4f005e51ffe158526f7ef7b5723b4313f823c",
"reference": "47a4f005e51ffe158526f7ef7b5723b4313f823c",
"shasum": ""
},
"require": {
@ -251,9 +251,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.172.1"
"source": "https://github.com/aws/aws-sdk-php/tree/3.172.2"
},
"time": "2021-01-26T19:11:49+00:00"
"time": "2021-01-27T19:14:10+00:00"
},
{
"name": "babenkoivan/elastic-adapter",
@ -4254,7 +4254,6 @@
"issues": "https://github.com/paypal/paypalhttp_php/issues",
"source": "https://github.com/paypal/paypalhttp_php/tree/1.0.0"
},
"abandoned": true,
"time": "2019-11-06T21:27:12+00:00"
},
{
@ -5464,16 +5463,16 @@
},
{
"name": "symfony/console",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "47c02526c532fb381374dab26df05e7313978976"
"reference": "d62ec79478b55036f65e2602e282822b8eaaff0a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/47c02526c532fb381374dab26df05e7313978976",
"reference": "47c02526c532fb381374dab26df05e7313978976",
"url": "https://api.github.com/repos/symfony/console/zipball/d62ec79478b55036f65e2602e282822b8eaaff0a",
"reference": "d62ec79478b55036f65e2602e282822b8eaaff0a",
"shasum": ""
},
"require": {
@ -5532,7 +5531,7 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Console Component",
"description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com",
"keywords": [
"cli",
@ -5541,7 +5540,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v5.2.1"
"source": "https://github.com/symfony/console/tree/v5.2.2"
},
"funding": [
{
@ -5557,20 +5556,20 @@
"type": "tidelift"
}
],
"time": "2020-12-18T08:03:05+00:00"
"time": "2021-01-27T10:15:41+00:00"
},
{
"name": "symfony/css-selector",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "f789e7ead4c79e04ca9a6d6162fc629c89bd8054"
"reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/f789e7ead4c79e04ca9a6d6162fc629c89bd8054",
"reference": "f789e7ead4c79e04ca9a6d6162fc629c89bd8054",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/f65f217b3314504a1ec99c2d6ef69016bb13490f",
"reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f",
"shasum": ""
},
"require": {
@ -5603,10 +5602,10 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony CssSelector Component",
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/css-selector/tree/v5.2.1"
"source": "https://github.com/symfony/css-selector/tree/v5.2.2"
},
"funding": [
{
@ -5622,20 +5621,20 @@
"type": "tidelift"
}
],
"time": "2020-12-08T17:02:38+00:00"
"time": "2021-01-27T10:01:46+00:00"
},
{
"name": "symfony/debug",
"version": "v4.4.18",
"version": "v4.4.19",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "5dfc7825f3bfe9bb74b23d8b8ce0e0894e32b544"
"reference": "af4987aa4a5630e9615be9d9c3ed1b0f24ca449c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/5dfc7825f3bfe9bb74b23d8b8ce0e0894e32b544",
"reference": "5dfc7825f3bfe9bb74b23d8b8ce0e0894e32b544",
"url": "https://api.github.com/repos/symfony/debug/zipball/af4987aa4a5630e9615be9d9c3ed1b0f24ca449c",
"reference": "af4987aa4a5630e9615be9d9c3ed1b0f24ca449c",
"shasum": ""
},
"require": {
@ -5672,10 +5671,10 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Debug Component",
"description": "Provides tools to ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/debug/tree/v4.4.18"
"source": "https://github.com/symfony/debug/tree/v4.4.19"
},
"funding": [
{
@ -5691,7 +5690,7 @@
"type": "tidelift"
}
],
"time": "2020-12-10T16:34:26+00:00"
"time": "2021-01-27T09:09:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@ -5762,16 +5761,16 @@
},
{
"name": "symfony/error-handler",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
"reference": "59b190ce16ddf32771a22087b60f6dafd3407147"
"reference": "4fd4a377f7b7ec7c3f3b40346a1411e0a83f9d40"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/59b190ce16ddf32771a22087b60f6dafd3407147",
"reference": "59b190ce16ddf32771a22087b60f6dafd3407147",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/4fd4a377f7b7ec7c3f3b40346a1411e0a83f9d40",
"reference": "4fd4a377f7b7ec7c3f3b40346a1411e0a83f9d40",
"shasum": ""
},
"require": {
@ -5808,10 +5807,10 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony ErrorHandler Component",
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/error-handler/tree/v5.2.1"
"source": "https://github.com/symfony/error-handler/tree/v5.2.2"
},
"funding": [
{
@ -5827,20 +5826,20 @@
"type": "tidelift"
}
],
"time": "2020-12-09T18:54:12+00:00"
"time": "2021-01-27T10:15:41+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "1c93f7a1dff592c252574c79a8635a8a80856042"
"reference": "4f9760f8074978ad82e2ce854dff79a71fe45367"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1c93f7a1dff592c252574c79a8635a8a80856042",
"reference": "1c93f7a1dff592c252574c79a8635a8a80856042",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4f9760f8074978ad82e2ce854dff79a71fe45367",
"reference": "4f9760f8074978ad82e2ce854dff79a71fe45367",
"shasum": ""
},
"require": {
@ -5893,10 +5892,10 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony EventDispatcher Component",
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/event-dispatcher/tree/v5.2.1"
"source": "https://github.com/symfony/event-dispatcher/tree/v5.2.2"
},
"funding": [
{
@ -5912,7 +5911,7 @@
"type": "tidelift"
}
],
"time": "2020-12-18T08:03:05+00:00"
"time": "2021-01-27T10:36:42+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@ -5995,16 +5994,16 @@
},
{
"name": "symfony/finder",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "0b9231a5922fd7287ba5b411893c0ecd2733e5ba"
"reference": "196f45723b5e618bf0e23b97e96d11652696ea9e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/0b9231a5922fd7287ba5b411893c0ecd2733e5ba",
"reference": "0b9231a5922fd7287ba5b411893c0ecd2733e5ba",
"url": "https://api.github.com/repos/symfony/finder/zipball/196f45723b5e618bf0e23b97e96d11652696ea9e",
"reference": "196f45723b5e618bf0e23b97e96d11652696ea9e",
"shasum": ""
},
"require": {
@ -6033,10 +6032,10 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Finder Component",
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v5.2.1"
"source": "https://github.com/symfony/finder/tree/v5.2.2"
},
"funding": [
{
@ -6052,7 +6051,7 @@
"type": "tidelift"
}
],
"time": "2020-12-08T17:02:38+00:00"
"time": "2021-01-27T10:01:46+00:00"
},
{
"name": "symfony/http-client-contracts",
@ -6135,16 +6134,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "a1f6218b29897ab52acba58cfa905b83625bef8d"
"reference": "16dfa5acf8103f0394d447f8eea3ea49f9e50855"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/a1f6218b29897ab52acba58cfa905b83625bef8d",
"reference": "a1f6218b29897ab52acba58cfa905b83625bef8d",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/16dfa5acf8103f0394d447f8eea3ea49f9e50855",
"reference": "16dfa5acf8103f0394d447f8eea3ea49f9e50855",
"shasum": ""
},
"require": {
@ -6185,10 +6184,10 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony HttpFoundation Component",
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-foundation/tree/v5.2.1"
"source": "https://github.com/symfony/http-foundation/tree/v5.2.2"
},
"funding": [
{
@ -6204,20 +6203,20 @@
"type": "tidelift"
}
],
"time": "2020-12-18T10:00:10+00:00"
"time": "2021-01-27T11:19:04+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "1feb619286d819180f7b8bc0dc44f516d9c62647"
"reference": "831b51e9370ece0febd0950dd819c63f996721c7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/1feb619286d819180f7b8bc0dc44f516d9c62647",
"reference": "1feb619286d819180f7b8bc0dc44f516d9c62647",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/831b51e9370ece0febd0950dd819c63f996721c7",
"reference": "831b51e9370ece0febd0950dd819c63f996721c7",
"shasum": ""
},
"require": {
@ -6246,7 +6245,7 @@
"symfony/translation": "<5.0",
"symfony/twig-bridge": "<5.0",
"symfony/validator": "<5.0",
"twig/twig": "<2.4"
"twig/twig": "<2.13"
},
"provide": {
"psr/log-implementation": "1.0"
@ -6266,7 +6265,7 @@
"symfony/stopwatch": "^4.4|^5.0",
"symfony/translation": "^4.4|^5.0",
"symfony/translation-contracts": "^1.1|^2",
"twig/twig": "^2.4|^3.0"
"twig/twig": "^2.13|^3.0.4"
},
"suggest": {
"symfony/browser-kit": "",
@ -6297,10 +6296,10 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony HttpKernel Component",
"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.2.1"
"source": "https://github.com/symfony/http-kernel/tree/v5.2.2"
},
"funding": [
{
@ -6316,20 +6315,20 @@
"type": "tidelift"
}
],
"time": "2020-12-18T13:49:39+00:00"
"time": "2021-01-27T14:45:46+00:00"
},
{
"name": "symfony/mime",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "de97005aef7426ba008c46ba840fc301df577ada"
"reference": "37bade585ea100d235c031b258eff93b5b6bb9a9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/de97005aef7426ba008c46ba840fc301df577ada",
"reference": "de97005aef7426ba008c46ba840fc301df577ada",
"url": "https://api.github.com/repos/symfony/mime/zipball/37bade585ea100d235c031b258eff93b5b6bb9a9",
"reference": "37bade585ea100d235c031b258eff93b5b6bb9a9",
"shasum": ""
},
"require": {
@ -6340,6 +6339,8 @@
"symfony/polyfill-php80": "^1.15"
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.2.2",
"phpdocumentor/type-resolver": "<1.4.0",
"symfony/mailer": "<4.4"
},
"require-dev": {
@ -6373,14 +6374,14 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "A library to manipulate MIME messages",
"description": "Allows manipulating MIME messages",
"homepage": "https://symfony.com",
"keywords": [
"mime",
"mime-type"
],
"support": {
"source": "https://github.com/symfony/mime/tree/v5.2.1"
"source": "https://github.com/symfony/mime/tree/v5.2.2"
},
"funding": [
{
@ -6396,7 +6397,7 @@
"type": "tidelift"
}
],
"time": "2020-12-09T18:54:12+00:00"
"time": "2021-01-25T14:08:25+00:00"
},
{
"name": "symfony/polyfill-ctype",
@ -7197,16 +7198,16 @@
},
{
"name": "symfony/process",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "bd8815b8b6705298beaa384f04fabd459c10bedd"
"reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/bd8815b8b6705298beaa384f04fabd459c10bedd",
"reference": "bd8815b8b6705298beaa384f04fabd459c10bedd",
"url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
"reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
"shasum": ""
},
"require": {
@ -7236,10 +7237,10 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Process Component",
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v5.2.1"
"source": "https://github.com/symfony/process/tree/v5.2.2"
},
"funding": [
{
@ -7255,20 +7256,20 @@
"type": "tidelift"
}
],
"time": "2020-12-08T17:03:37+00:00"
"time": "2021-01-27T10:15:41+00:00"
},
{
"name": "symfony/routing",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "934ac2720dcc878a47a45c986b483a7ee7193620"
"reference": "348b5917e56546c6d96adbf21d7f92c9ef563661"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/934ac2720dcc878a47a45c986b483a7ee7193620",
"reference": "934ac2720dcc878a47a45c986b483a7ee7193620",
"url": "https://api.github.com/repos/symfony/routing/zipball/348b5917e56546c6d96adbf21d7f92c9ef563661",
"reference": "348b5917e56546c6d96adbf21d7f92c9ef563661",
"shasum": ""
},
"require": {
@ -7282,7 +7283,7 @@
"symfony/yaml": "<4.4"
},
"require-dev": {
"doctrine/annotations": "^1.7",
"doctrine/annotations": "^1.10.4",
"psr/log": "~1.0",
"symfony/config": "^5.0",
"symfony/dependency-injection": "^4.4|^5.0",
@ -7320,7 +7321,7 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Routing Component",
"description": "Maps an HTTP request to a set of configuration variables",
"homepage": "https://symfony.com",
"keywords": [
"router",
@ -7329,7 +7330,7 @@
"url"
],
"support": {
"source": "https://github.com/symfony/routing/tree/v5.2.1"
"source": "https://github.com/symfony/routing/tree/v5.2.2"
},
"funding": [
{
@ -7345,7 +7346,7 @@
"type": "tidelift"
}
],
"time": "2020-12-08T17:03:37+00:00"
"time": "2021-01-27T10:15:41+00:00"
},
{
"name": "symfony/service-contracts",
@ -7428,16 +7429,16 @@
},
{
"name": "symfony/string",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed"
"reference": "c95468897f408dd0aca2ff582074423dd0455122"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed",
"reference": "5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed",
"url": "https://api.github.com/repos/symfony/string/zipball/c95468897f408dd0aca2ff582074423dd0455122",
"reference": "c95468897f408dd0aca2ff582074423dd0455122",
"shasum": ""
},
"require": {
@ -7480,7 +7481,7 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony String component",
"description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
"homepage": "https://symfony.com",
"keywords": [
"grapheme",
@ -7491,7 +7492,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v5.2.1"
"source": "https://github.com/symfony/string/tree/v5.2.2"
},
"funding": [
{
@ -7507,20 +7508,20 @@
"type": "tidelift"
}
],
"time": "2020-12-05T07:33:16+00:00"
"time": "2021-01-25T15:14:59+00:00"
},
{
"name": "symfony/translation",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "a04209ba0d1391c828e5b2373181dac63c52ee70"
"reference": "c021864d4354ee55160ddcfd31dc477a1bc77949"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/a04209ba0d1391c828e5b2373181dac63c52ee70",
"reference": "a04209ba0d1391c828e5b2373181dac63c52ee70",
"url": "https://api.github.com/repos/symfony/translation/zipball/c021864d4354ee55160ddcfd31dc477a1bc77949",
"reference": "c021864d4354ee55160ddcfd31dc477a1bc77949",
"shasum": ""
},
"require": {
@ -7581,10 +7582,10 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Translation Component",
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/translation/tree/v5.2.1"
"source": "https://github.com/symfony/translation/tree/v5.2.2"
},
"funding": [
{
@ -7600,7 +7601,7 @@
"type": "tidelift"
}
],
"time": "2020-12-08T17:03:37+00:00"
"time": "2021-01-27T10:15:41+00:00"
},
{
"name": "symfony/translation-contracts",
@ -7682,16 +7683,16 @@
},
{
"name": "symfony/var-dumper",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "13e7e882eaa55863faa7c4ad7c60f12f1a8b5089"
"reference": "72ca213014a92223a5d18651ce79ef441c12b694"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/13e7e882eaa55863faa7c4ad7c60f12f1a8b5089",
"reference": "13e7e882eaa55863faa7c4ad7c60f12f1a8b5089",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/72ca213014a92223a5d18651ce79ef441c12b694",
"reference": "72ca213014a92223a5d18651ce79ef441c12b694",
"shasum": ""
},
"require": {
@ -7707,7 +7708,7 @@
"ext-iconv": "*",
"symfony/console": "^4.4|^5.0",
"symfony/process": "^4.4|^5.0",
"twig/twig": "^2.4|^3.0"
"twig/twig": "^2.13|^3.0.4"
},
"suggest": {
"ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
@ -7743,14 +7744,14 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony mechanism for exploring and dumping PHP variables",
"description": "Provides mechanisms for walking through any arbitrary PHP variable",
"homepage": "https://symfony.com",
"keywords": [
"debug",
"dump"
],
"support": {
"source": "https://github.com/symfony/var-dumper/tree/v5.2.1"
"source": "https://github.com/symfony/var-dumper/tree/v5.2.2"
},
"funding": [
{
@ -7766,7 +7767,7 @@
"type": "tidelift"
}
],
"time": "2020-12-16T17:02:19+00:00"
"time": "2021-01-27T10:15:41+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@ -10619,16 +10620,16 @@
},
{
"name": "symfony/browser-kit",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
"reference": "87d6f0a7436b03a57d4cf9a6a9cd0c83a355c49a"
"reference": "b03b2057ed53ee4eab2e8f372084d7722b7b8ffd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/87d6f0a7436b03a57d4cf9a6a9cd0c83a355c49a",
"reference": "87d6f0a7436b03a57d4cf9a6a9cd0c83a355c49a",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/b03b2057ed53ee4eab2e8f372084d7722b7b8ffd",
"reference": "b03b2057ed53ee4eab2e8f372084d7722b7b8ffd",
"shasum": ""
},
"require": {
@ -10667,10 +10668,10 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony BrowserKit Component",
"description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/browser-kit/tree/v5.2.1"
"source": "https://github.com/symfony/browser-kit/tree/v5.2.2"
},
"funding": [
{
@ -10686,20 +10687,20 @@
"type": "tidelift"
}
],
"time": "2020-12-18T08:03:05+00:00"
"time": "2021-01-27T12:56:27+00:00"
},
{
"name": "symfony/dom-crawler",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "ee7cf316fb0de786cfe5ae32ee79502b290c81ea"
"reference": "5d89ceb53ec65e1973a555072fac8ed5ecad3384"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ee7cf316fb0de786cfe5ae32ee79502b290c81ea",
"reference": "ee7cf316fb0de786cfe5ae32ee79502b290c81ea",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/5d89ceb53ec65e1973a555072fac8ed5ecad3384",
"reference": "5d89ceb53ec65e1973a555072fac8ed5ecad3384",
"shasum": ""
},
"require": {
@ -10741,10 +10742,10 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony DomCrawler Component",
"description": "Eases DOM navigation for HTML and XML documents",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/dom-crawler/tree/v5.2.1"
"source": "https://github.com/symfony/dom-crawler/tree/v5.2.2"
},
"funding": [
{
@ -10760,20 +10761,20 @@
"type": "tidelift"
}
],
"time": "2020-12-18T08:02:46+00:00"
"time": "2021-01-27T10:01:46+00:00"
},
{
"name": "symfony/yaml",
"version": "v5.2.1",
"version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "290ea5e03b8cf9b42c783163123f54441fb06939"
"reference": "6bb8b36c6dea8100268512bf46e858c8eb5c545e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/290ea5e03b8cf9b42c783163123f54441fb06939",
"reference": "290ea5e03b8cf9b42c783163123f54441fb06939",
"url": "https://api.github.com/repos/symfony/yaml/zipball/6bb8b36c6dea8100268512bf46e858c8eb5c545e",
"reference": "6bb8b36c6dea8100268512bf46e858c8eb5c545e",
"shasum": ""
},
"require": {
@ -10816,10 +10817,10 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Yaml Component",
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/yaml/tree/v5.2.1"
"source": "https://github.com/symfony/yaml/tree/v5.2.2"
},
"funding": [
{
@ -10835,7 +10836,7 @@
"type": "tidelift"
}
],
"time": "2020-12-08T17:02:38+00:00"
"time": "2021-01-27T10:01:46+00:00"
},
{
"name": "theseer/tokenizer",

15
packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
View File

@ -30,10 +30,17 @@ class SliderDataGrid extends DataGrid
{
parent::__construct();
$this->locale = request()->get('locale') ?? 'all';
$this->channel = request()->get('channel')
? Channel::find(request()->get('channel'))->code
: 'all';
/* locale */
$this->locale = request()->get('locale') ?? app()->getLocale();
/* channel */
$this->channel = request()->get('channel') ?? (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
/* finding channel code */
if ($this->channel !== 'all') {
$this->channel = Channel::query()->find($this->channel);
$this->channel = $this->channel ? $this->channel->code : 'all';
}
}
public function prepareQueryBuilder()

9
packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
View File

@ -38,7 +38,7 @@
<div class="control-group">
<select class="control" id="locale-switcher" name="locale">
@foreach (core()->getAllLocales() as $localeModel)
@foreach (app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales as $localeModel)
<option
value="{{ $localeModel->code }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
@ -199,6 +199,13 @@
$(document).ready(function () {
$('#channel-switcher, #locale-switcher').on('change', function (e) {
$('#channel-switcher').val()
if (event.target.id == 'channel-switcher') {
let locale = "{{ app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales->first()->code }}";
$('#locale-switcher').val(locale);
}
var query = '?channel=' + $('#channel-switcher').val() + '&locale=' + $('#locale-switcher').val();
window.location.href = "{{ route('admin.catalog.products.edit', $product->id) }}" + query;

24
packages/Webkul/Product/src/Helpers/Toolbar.php
View File

@ -46,7 +46,7 @@ class Toolbar extends AbstractProduct
{
$keys = explode('-', $key);
return request()->fullUrlWithQuery([
return $this->fullUrlWithQuery([
'sort' => current($keys),
'order' => end($keys),
]);
@ -60,7 +60,7 @@ class Toolbar extends AbstractProduct
*/
public function getLimitUrl($limit)
{
return request()->fullUrlWithQuery([
return $this->fullUrlWithQuery([
'limit' => $limit,
]);
}
@ -73,7 +73,7 @@ class Toolbar extends AbstractProduct
*/
public function getModeUrl($mode)
{
return request()->fullUrlWithQuery([
return $this->fullUrlWithQuery([
'mode' => $mode,
]);
}
@ -185,4 +185,22 @@ class Toolbar extends AbstractProduct
/* if still default config is not set from the admin then in last needed hardcoded value */
return $viewOption ?? 'grid';
}
/**
* Returns the query string. As request built in method does not able to handle the
* multiple question marks, this method will check the query string and append the query string.
*
* @param array $additionalQuery
* @return string
*/
public function fullUrlWithQuery($additionalQuery)
{
$queryString = request()->getQueryString();
$additionalQueryString = http_build_query($additionalQuery);
return $queryString
? url()->current() . '?' . $queryString . '&' . $additionalQueryString
: url()->current() . '?' . $additionalQueryString;
}
}

68
packages/Webkul/Product/src/Type/AbstractType.php
View File

@ -924,4 +924,72 @@ abstract class AbstractType
return false;
}
/**
* Get more offers for customer group pricing.
*
* @return array
*/
public function getCustomerGroupPricingOffers() {
$offerLines = [];
$haveOffers = true;
$customerGroupId = null;
if (Cart::getCurrentCustomer()->check()) {
$customerGroupId = Cart::getCurrentCustomer()->user()->customer_group_id;
} else {
$customerGroupRepository = app('Webkul\Customer\Repositories\CustomerGroupRepository');
if ($customerGuestGroup = $customerGroupRepository->findOneByField('code', 'guest')) {
$customerGroupId = $customerGuestGroup->id;
}
}
$customerGroupPrices = $this->product->customer_group_prices()->where(function ($query) use ($customerGroupId) {
$query->where('customer_group_id', $customerGroupId)
->orWhereNull('customer_group_id');
}
)->groupBy('qty')->get()->sortBy('qty')->values()->all();
if ($this->haveSpecialPrice()) {
$rulePrice = app('Webkul\CatalogRule\Helpers\CatalogRuleProductPrice')->getRulePrice($this->product);
if ($rulePrice && $rulePrice->price < $this->product->special_price) {
$haveOffers = false;
}
if ($haveOffers) {
foreach ($customerGroupPrices as $key => $customerGroupPrice) {
if ($key > 0) {
array_push($offerLines, $this->getOfferLines($customerGroupPrice));
}
}
}
} else {
if (count($customerGroupPrices) > 0) {
foreach ($customerGroupPrices as $key => $customerGroupPrice) {
array_push($offerLines, $this->getOfferLines($customerGroupPrice));
}
}
}
return $offerLines;
}
/**
* Get offers lines.
*
* @param array $customerGroupPrice
*
* @return array
*/
public function getOfferLines($customerGroupPrice) {
$price = $this->getCustomerGroupPrice($this->product, $customerGroupPrice->qty);
$discount = (($this->product->price - $price) * 100) / ($this->product->price);
$offerLines = trans('shop::app.products.offers', ['qty' => $customerGroupPrice->qty,
'price' => core()->currency($price), 'discount' => $discount]);
return $offerLines;
}
}

18
packages/Webkul/Product/src/Type/Configurable.php
View File

@ -96,7 +96,7 @@ class Configurable extends AbstractType
{
$product = parent::update($data, $id, $attribute);
$route = request()->route() ? request()->route()->getName() : '';
if ($route != 'admin.catalog.products.massupdate') {
$previousVariantIds = $product->variants->pluck('id');
@ -355,7 +355,7 @@ class Configurable extends AbstractType
*/
public function getMinimalPrice($qty = null)
{
$minPrices = [];
$minPrices = $rulePrices = $customerGroupPrices = [];
/* method is calling many time so using variable */
$tablePrefix = DB::getTablePrefix();
@ -373,11 +373,21 @@ class Configurable extends AbstractType
$minPrices[] = $price->min_price;
}
foreach ($this->product->variants as $variant) {
$rulePrice = app('Webkul\CatalogRule\Helpers\CatalogRuleProductPrice')->getRulePrice($variant);
if ($rulePrice) {
$rulePrices[] = $rulePrice->price;
}
$customerGroupPrices[] = $this->getCustomerGroupPrice($variant, 1);
}
if (empty($minPrices)) {
return 0;
}
return min($minPrices);
return min(array_merge(array_merge($minPrices, $rulePrices), $customerGroupPrices));
}
/**
@ -540,7 +550,7 @@ class Configurable extends AbstractType
$product = $item->child->product;
} else {
$product = $item->product;
}
}
}
}

3
packages/Webkul/Shop/src/Resources/lang/ar/app.php
View File

@ -442,7 +442,8 @@ return [
'available-for-order' => 'متوفر لطلب الشراء',
'settings' => 'Settings',
'compare_options' => 'قارن الخيارات',
'wishlist-options' => 'Wishlist Options'
'wishlist-options' => 'Wishlist Options',
'offers' => 'Buy :qty for :price each and save :discount%',
],
// 'reviews' => [

3
packages/Webkul/Shop/src/Resources/lang/de/app.php
View File

@ -439,7 +439,8 @@ return [
'available' => 'Verfügbar',
'settings' => 'Settings',
'compare_options' => 'Compare Options',
'wishlist-options' => 'Wishlist Options'
'wishlist-options' => 'Wishlist Options',
'offers' => 'Buy :qty for :price each and save :discount%',
],
// 'reviews' => [

3
packages/Webkul/Shop/src/Resources/lang/en/app.php
View File

@ -443,7 +443,8 @@ return [
'available-for-order' => 'Available for Order',
'settings' => 'Settings',
'compare_options' => 'Compare Options',
'wishlist-options' => 'Wishlist Options'
'wishlist-options' => 'Wishlist Options',
'offers' => 'Buy :qty for :price each and save :discount%',
],
// 'reviews' => [

3
packages/Webkul/Shop/src/Resources/lang/es/app.php
View File

@ -412,7 +412,8 @@ return [
'available-for-order' => 'Disponible para ordenar',
'settings' => 'Settings',
'compare_options' => 'Compare Options',
'wishlist-options' => 'Wishlist Options'
'wishlist-options' => 'Wishlist Options',
'offers' => 'Buy :qty for :price each and save :discount%',
],
// 'reviews' => [

3
packages/Webkul/Shop/src/Resources/lang/fa/app.php
View File

@ -441,7 +441,8 @@ return [
'available-for-order' => 'Available for Order',
'settings' => 'Settings',
'compare_options' => 'Compare Options',
'wishlist-options' => 'Wishlist Options'
'wishlist-options' => 'Wishlist Options',
'offers' => 'Buy :qty for :price each and save :discount%',
],
// 'reviews' => [

3
packages/Webkul/Shop/src/Resources/lang/it/app.php
View File

@ -439,7 +439,8 @@ return [
'available-for-order' => 'Disponibile per lordine',
'settings' => 'Settings',
'compare_options' => 'Compare Options',
'wishlist-options' => 'Wishlist Options'
'wishlist-options' => 'Wishlist Options',
'offers' => 'Buy :qty for :price each and save :discount%',
],
// 'reviews' => [

3
packages/Webkul/Shop/src/Resources/lang/ja/app.php
View File

@ -408,7 +408,8 @@ return [
'available-for-order' => '注文可能',
'settings' => 'Settings',
'compare_options' => 'Compare Options',
'wishlist-options' => 'Wishlist Options'
'wishlist-options' => 'Wishlist Options',
'offers' => 'Buy :qty for :price each and save :discount%',
],
'buynow' => [

3
packages/Webkul/Shop/src/Resources/lang/nl/app.php
View File

@ -446,7 +446,8 @@ return [
'available-for-order' => 'Beschikbaar voor bestelling',
'settings' => 'Settings',
'compare_options' => 'Compare Options',
'wishlist-options' => 'Wishlist Options'
'wishlist-options' => 'Wishlist Options',
'offers' => 'Buy :qty for :price each and save :discount%',
],
// 'reviews' => [

3
packages/Webkul/Shop/src/Resources/lang/pl/app.php
View File

@ -439,7 +439,8 @@ return [
'available-for-order' => 'Dostępne na zamówienie',
'settings' => 'Settings',
'compare_options' => 'Compare Options',
'wishlist-options' => 'Wishlist Options'
'wishlist-options' => 'Wishlist Options',
'offers' => 'Buy :qty for :price each and save :discount%',
],
// 'reviews' => [

3
packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
View File

@ -429,7 +429,8 @@ return [
'available-for-order' => 'Disponível para encomenda',
'settings' => 'Settings',
'compare_options' => 'Compare Options',
'wishlist-options' => 'Wishlist Options'
'wishlist-options' => 'Wishlist Options',
'offers' => 'Buy :qty for :price each and save :discount%',
],
// 'reviews' => [

3
packages/Webkul/Shop/src/Resources/lang/tr/app.php
View File

@ -439,7 +439,8 @@ return [
'available-for-order' => 'Sipariş İçin Uygun',
'settings' => 'Settings',
'compare_options' => 'Compare Options',
'wishlist-options' => 'Wishlist Options'
'wishlist-options' => 'Wishlist Options',
'offers' => 'Buy :qty for :price each and save :discount%',
],
// 'reviews' => [

8
packages/Webkul/Shop/src/Resources/views/products/view.blade.php
View File

@ -63,6 +63,14 @@
@include ('shop::products.price', ['product' => $product])
@if (count($product->getTypeInstance()->getCustomerGroupPricingOffers()) > 0)
<div class="regular-price">
@foreach ($product->getTypeInstance()->getCustomerGroupPricingOffers() as $offers)
<p> {{ $offers }} </p>
@endforeach
</div>
@endif
@include ('shop::products.view.stock', ['product' => $product])
{!! view_render_event('bagisto.shop.products.view.short_description.before', ['product' => $product]) !!}

3
packages/Webkul/Ui/src/DataGrid/DataGrid.php
View File

@ -818,8 +818,7 @@ abstract class DataGrid
private function getRouteNameFromUrl($action, $method)
{
return app('router')->getRoutes()
->match(app('request')
->create(str_replace(config('app.url'), '', $action), $method))
->match(app('request')->create(str_replace(url('/'), '', $action), $method))
->getName();
}
}

14
packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
View File

@ -2,6 +2,12 @@
$locale = request()->get('locale') ?: app()->getLocale();
$channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
$customer_group = request()->get('customer_group');
if ($channel == 'all') {
$locales = core()->getAllLocales();
} else {
$locales = app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales;
}
@endphp
<div class="table">
@ -27,8 +33,8 @@
</option>
@foreach ($results['extraFilters']['channels'] as $channelModel)
<option
value="{{ $channelModel->id }}"
{{ (isset($channel) && ($channelModel->id) == $channel) ? 'selected' : '' }}>
value="{{ $channelModel->code }}"
{{ (isset($channel) && ($channelModel->code) == $channel) ? 'selected' : '' }}>
{{ $channelModel->name }}
</option>
@endforeach
@ -45,7 +51,7 @@
<option value="all" {{ ! isset($locale) ? 'selected' : '' }}>
{{ __('admin::app.admin.system.all-locales') }}
</option>
@foreach ($results['extraFilters']['locales'] as $localeModel)
@foreach ($locales as $localeModel)
<option
value="{{ $localeModel->code }}" {{ (isset($locale) && ($localeModel->code) == $locale) ? 'selected' : '' }}>
{{ $localeModel->name }}
@ -715,7 +721,7 @@
case "channel":
obj.label = "Channel";
if ('channels' in this.extraFilters) {
obj.prettyValue = this.extraFilters['channels'].find(channel => channel.id == obj.val).name
obj.prettyValue = this.extraFilters['channels'].find(channel => channel.code == obj.val).name
}
break;
case "locale":

36
packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
View File

@ -33,11 +33,12 @@
<input type="hidden" name="channel" value="{{ $channel }}" />
<div class="control-group">
<select class="control" id="channel-switcher" onChange="window.location.href = this.value">
@foreach (core()->getAllChannels() as $ch)
<select class="control" id="channel-switcher" name="channel">
@foreach (core()->getAllChannels() as $channelModel)
<option value="{{ route('velocity.admin.meta-data') . '?channel=' . $ch->code . '&locale=' . $locale }}" {{ ($ch->code) == $channel ? 'selected' : '' }}>
{{ $ch->name }}
<option
value="{{ $channelModel->code }}" {{ ($channelModel->code) == $channel ? 'selected' : '' }}>
{{ $channelModel->name }}
</option>
@endforeach
@ -45,10 +46,11 @@
</div>
<div class="control-group">
<select class="control" id="locale-switcher" onChange="window.location.href = this.value">
@foreach (core()->getAllLocales() as $localeModel)
<select class="control" id="locale-switcher" name="locale">
@foreach (app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales as $localeModel)
<option value="{{ route('velocity.admin.meta-data') . '?locale=' . $localeModel->code . '&channel=' . $channel }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
<option
value="{{ $localeModel->code }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
{{ $localeModel->name }}
</option>
@ -105,9 +107,9 @@
value="{{ $metaData ? $metaData->header_content_count : '5' }}" />
</div>
<div class="control-group">
<label style="width:100%;">
{{ __('velocity::app.admin.meta-data.home-page-content') }}
@ -181,7 +183,7 @@
'url' => asset('/themes/velocity/assets/images/kids.webp'),
];
@endphp
<image-wrapper
:multiple="true"
input-name="images[4]"
@ -351,6 +353,20 @@
plugins: 'image imagetools media wordcount save fullscreen code',
toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor | link | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat | code',
});
$('#channel-switcher, #locale-switcher').on('change', function (e) {
$('#channel-switcher').val()
if (event.target.id == 'channel-switcher') {
let locale = "{{ app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales->first()->code }}";
$('#locale-switcher').val(locale);
}
var query = '?channel=' + $('#channel-switcher').val() + '&locale=' + $('#locale-switcher').val();
window.location.href = "{{ route('velocity.admin.meta-data') }}" + query;
})
});
</script>
@endpush

4
packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
View File

@ -113,7 +113,9 @@
@endif
<div class="row col-12 no-padding no-margin">
@include ('shop::products.price', ['product' => $product])
<div class="product-price">
<span>{{ core()->currency($item->base_price) }}</span>
</div>
</div>
@php

8
packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
View File

@ -123,6 +123,14 @@
@include ('shop::products.price', ['product' => $product])
</div>
@if (count($product->getTypeInstance()->getCustomerGroupPricingOffers()) > 0)
<div class="col-12">
@foreach ($product->getTypeInstance()->getCustomerGroupPricingOffers() as $offers)
{{ $offers }} </br>
@endforeach
</div>
@endif
<div class="product-actions">
@if (core()->getConfigData('catalog.products.storefront.buy_now_button_display'))
@include ('shop::products.buy-now', [