From b076c5928f64d14a90c13d108bf92c51bef631e2 Mon Sep 17 00:00:00 2001 From: "a.bidlovskyi" Date: Fri, 4 Sep 2020 10:37:33 +0300 Subject: [PATCH 1/4] fix check new orders --- src/composer.lock | 592 ++++++++++-------- .../import_orders_automation/index.blade.php | 57 +- 2 files changed, 374 insertions(+), 275 deletions(-) diff --git a/src/composer.lock b/src/composer.lock index 1cfdbd95..935f1025 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -107,16 +107,16 @@ }, { "name": "brick/math", - "version": "0.8.15", + "version": "0.9.1", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "9b08d412b9da9455b210459ff71414de7e6241cd" + "reference": "283a40c901101e66de7061bd359252c013dcc43c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/9b08d412b9da9455b210459ff71414de7e6241cd", - "reference": "9b08d412b9da9455b210459ff71414de7e6241cd", + "url": "https://api.github.com/repos/brick/math/zipball/283a40c901101e66de7061bd359252c013dcc43c", + "reference": "283a40c901101e66de7061bd359252c013dcc43c", "shasum": "" }, "require": { @@ -155,7 +155,7 @@ "type": "tidelift" } ], - "time": "2020-04-15T15:59:35+00:00" + "time": "2020-08-18T23:57:15+00:00" }, { "name": "brotzka/laravel-dotenv-editor", @@ -464,16 +464,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.18", + "version": "2.1.19", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441" + "reference": "840d5603eb84cc81a6a0382adac3293e57c1c64c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/cfa3d44471c7f5bfb684ac2b0da7114283d78441", - "reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/840d5603eb84cc81a6a0382adac3293e57c1c64c", + "reference": "840d5603eb84cc81a6a0382adac3293e57c1c64c", "shasum": "" }, "require": { @@ -518,7 +518,7 @@ "validation", "validator" ], - "time": "2020-06-16T20:11:17+00:00" + "time": "2020-08-08T21:28:19+00:00" }, { "name": "fideloper/proxy", @@ -839,16 +839,16 @@ }, { "name": "laravel/framework", - "version": "v7.21.0", + "version": "v7.27.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "3ccdb116524de408fdc00715b6f06a1031ddace9" + "reference": "17777a92da9b3cf0026f26462d289d596420e6d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/3ccdb116524de408fdc00715b6f06a1031ddace9", - "reference": "3ccdb116524de408fdc00715b6f06a1031ddace9", + "url": "https://api.github.com/repos/laravel/framework/zipball/17777a92da9b3cf0026f26462d289d596420e6d0", + "reference": "17777a92da9b3cf0026f26462d289d596420e6d0", "shasum": "" }, "require": { @@ -954,6 +954,7 @@ "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).", "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).", "phpunit/phpunit": "Required to use assertions and run tests (^8.4|^9.0).", + "predis/predis": "Required to use the predis connector (^1.1.2).", "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).", "symfony/cache": "Required to PSR-6 cache bridge (^5.0).", @@ -992,20 +993,20 @@ "framework", "laravel" ], - "time": "2020-07-21T14:26:42+00:00" + "time": "2020-09-01T13:41:48+00:00" }, { "name": "laravel/tinker", - "version": "v2.4.1", + "version": "v2.4.2", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "3c9ef136ca59366bc1b50b7f2500a946d5149c62" + "reference": "58424c24e8aec31c3a3ac54eb3adb15e8a0a067b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/3c9ef136ca59366bc1b50b7f2500a946d5149c62", - "reference": "3c9ef136ca59366bc1b50b7f2500a946d5149c62", + "url": "https://api.github.com/repos/laravel/tinker/zipball/58424c24e8aec31c3a3ac54eb3adb15e8a0a067b", + "reference": "58424c24e8aec31c3a3ac54eb3adb15e8a0a067b", "shasum": "" }, "require": { @@ -1056,31 +1057,31 @@ "laravel", "psysh" ], - "time": "2020-07-07T15:10:00+00:00" + "time": "2020-08-11T19:28:08+00:00" }, { "name": "laravel/ui", - "version": "v2.1.0", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/laravel/ui.git", - "reference": "da9350533d0da60d5dc42fb7de9c561c72129bba" + "reference": "fb1404f04ece6eee128e3fb750d3a1e064238b33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/da9350533d0da60d5dc42fb7de9c561c72129bba", - "reference": "da9350533d0da60d5dc42fb7de9c561c72129bba", + "url": "https://api.github.com/repos/laravel/ui/zipball/fb1404f04ece6eee128e3fb750d3a1e064238b33", + "reference": "fb1404f04ece6eee128e3fb750d3a1e064238b33", "shasum": "" }, "require": { - "illuminate/console": "^7.0", - "illuminate/filesystem": "^7.0", - "illuminate/support": "^7.0", + "illuminate/console": "^7.0|^8.0", + "illuminate/filesystem": "^7.0|^8.0", + "illuminate/support": "^7.0|^8.0", "php": "^7.2.5" }, "require-dev": { "mockery/mockery": "^1.0", - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^8.0|^9.0" }, "type": "library", "extra": { @@ -1111,7 +1112,7 @@ "laravel", "ui" ], - "time": "2020-06-30T20:56:33+00:00" + "time": "2020-08-25T18:30:43+00:00" }, { "name": "laravelcollective/html", @@ -1183,16 +1184,16 @@ }, { "name": "league/commonmark", - "version": "1.5.3", + "version": "1.5.4", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "2574454b97e4103dc4e36917bd783b25624aefcd" + "reference": "21819c989e69bab07e933866ad30c7e3f32984ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2574454b97e4103dc4e36917bd783b25624aefcd", - "reference": "2574454b97e4103dc4e36917bd783b25624aefcd", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/21819c989e69bab07e933866ad30c7e3f32984ba", + "reference": "21819c989e69bab07e933866ad30c7e3f32984ba", "shasum": "" }, "require": { @@ -1274,32 +1275,33 @@ "type": "tidelift" } ], - "time": "2020-07-19T22:47:30+00:00" + "time": "2020-08-18T01:19:12+00:00" }, { "name": "league/flysystem", - "version": "1.0.69", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "7106f78428a344bc4f643c233a94e48795f10967" + "reference": "9be3b16c877d477357c015cec057548cf9b2a14a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967", - "reference": "7106f78428a344bc4f643c233a94e48795f10967", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9be3b16c877d477357c015cec057548cf9b2a14a", + "reference": "9be3b16c877d477357c015cec057548cf9b2a14a", "shasum": "" }, "require": { "ext-fileinfo": "*", - "php": ">=5.5.9" + "league/mime-type-detection": "^1.3", + "php": "^7.2.5 || ^8.0" }, "conflict": { "league/flysystem-sftp": "<1.0.6" }, "require-dev": { - "phpspec/phpspec": "^3.4", - "phpunit/phpunit": "^5.7.26" + "phpspec/prophecy": "^1.11.1", + "phpunit/phpunit": "^8.5.8" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -1364,7 +1366,58 @@ "type": "other" } ], - "time": "2020-05-18T15:13:39+00:00" + "time": "2020-08-23T07:39:11+00:00" + }, + { + "name": "league/mime-type-detection", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/mime-type-detection.git", + "reference": "fda190b62b962d96a069fcc414d781db66d65b69" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/fda190b62b962d96a069fcc414d781db66d65b69", + "reference": "fda190b62b962d96a069fcc414d781db66d65b69", + "shasum": "" + }, + "require": { + "ext-fileinfo": "*", + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^0.12.36", + "phpunit/phpunit": "^8.5.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "League\\MimeTypeDetection\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Frank de Jonge", + "email": "info@frankdejonge.nl" + } + ], + "description": "Mime-type detection for Flysystem", + "funding": [ + { + "url": "https://github.com/frankdejonge", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/league/flysystem", + "type": "tidelift" + } + ], + "time": "2020-08-09T10:34:01+00:00" }, { "name": "monolog/monolog", @@ -1459,16 +1512,16 @@ }, { "name": "nesbot/carbon", - "version": "2.36.1", + "version": "2.39.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "ee7378a36cc62952100e718bcc58be4c7210e55f" + "reference": "0a41ea7f7fedacf307b7a339800e10356a042918" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ee7378a36cc62952100e718bcc58be4c7210e55f", - "reference": "ee7378a36cc62952100e718bcc58be4c7210e55f", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/0a41ea7f7fedacf307b7a339800e10356a042918", + "reference": "0a41ea7f7fedacf307b7a339800e10356a042918", "shasum": "" }, "require": { @@ -1483,7 +1536,7 @@ "kylekatarnls/multi-tester": "^2.0", "phpmd/phpmd": "^2.8", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.30", + "phpstan/phpstan": "^0.12.35", "phpunit/phpunit": "^7.5 || ^8.0", "squizlabs/php_codesniffer": "^3.4" }, @@ -1544,20 +1597,20 @@ "type": "tidelift" } ], - "time": "2020-07-04T12:29:56+00:00" + "time": "2020-08-24T12:35:58+00:00" }, { "name": "nikic/php-parser", - "version": "v4.6.0", + "version": "v4.9.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "c346bbfafe2ff60680258b631afb730d186ed864" + "reference": "88e519766fc58bd46b8265561fb79b54e2e00b28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c346bbfafe2ff60680258b631afb730d186ed864", - "reference": "c346bbfafe2ff60680258b631afb730d186ed864", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/88e519766fc58bd46b8265561fb79b54e2e00b28", + "reference": "88e519766fc58bd46b8265561fb79b54e2e00b28", "shasum": "" }, "require": { @@ -1565,8 +1618,8 @@ "php": ">=7.0" }, "require-dev": { - "ircmaxell/php-yacc": "0.0.5", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -1574,7 +1627,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.9-dev" } }, "autoload": { @@ -1596,20 +1649,20 @@ "parser", "php" ], - "time": "2020-07-02T17:12:47+00:00" + "time": "2020-08-30T16:15:20+00:00" }, { "name": "opis/closure", - "version": "3.5.5", + "version": "3.5.6", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "dec9fc5ecfca93f45cd6121f8e6f14457dff372c" + "reference": "e8d34df855b0a0549a300cb8cb4db472556e8aa9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/dec9fc5ecfca93f45cd6121f8e6f14457dff372c", - "reference": "dec9fc5ecfca93f45cd6121f8e6f14457dff372c", + "url": "https://api.github.com/repos/opis/closure/zipball/e8d34df855b0a0549a300cb8cb4db472556e8aa9", + "reference": "e8d34df855b0a0549a300cb8cb4db472556e8aa9", "shasum": "" }, "require": { @@ -1657,7 +1710,7 @@ "serialization", "serialize" ], - "time": "2020-06-17T14:59:55+00:00" + "time": "2020-08-11T08:46:50+00:00" }, { "name": "paragonie/random_compat", @@ -2123,35 +2176,38 @@ }, { "name": "ramsey/collection", - "version": "1.0.1", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "925ad8cf55ba7a3fc92e332c58fd0478ace3e1ca" + "reference": "044184884e3c803e4cbb6451386cb71562939b18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/925ad8cf55ba7a3fc92e332c58fd0478ace3e1ca", - "reference": "925ad8cf55ba7a3fc92e332c58fd0478ace3e1ca", + "url": "https://api.github.com/repos/ramsey/collection/zipball/044184884e3c803e4cbb6451386cb71562939b18", + "reference": "044184884e3c803e4cbb6451386cb71562939b18", "shasum": "" }, "require": { - "php": "^7.2" + "php": "^7.2 || ^8" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0", + "captainhook/captainhook": "^5.3", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "ergebnis/composer-normalize": "^2.6", "fzaninotto/faker": "^1.5", - "jakub-onderka/php-parallel-lint": "^1", + "hamcrest/hamcrest-php": "^2", "jangregor/phpstan-prophecy": "^0.6", "mockery/mockery": "^1.3", "phpstan/extension-installer": "^1", - "phpstan/phpdoc-parser": "0.4.1", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-mockery": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan": "^0.12.32", + "phpstan/phpstan-mockery": "^0.12.5", + "phpstan/phpstan-phpunit": "^0.12.11", "phpunit/phpunit": "^8.5", - "slevomat/coding-standard": "^6.0", - "squizlabs/php_codesniffer": "^3.5" + "psy/psysh": "^0.10.4", + "slevomat/coding-standard": "^6.3", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^3.12.2" }, "type": "library", "autoload": { @@ -2171,7 +2227,6 @@ } ], "description": "A PHP 7.2+ library for representing and manipulating collections.", - "homepage": "https://github.com/ramsey/collection", "keywords": [ "array", "collection", @@ -2180,24 +2235,30 @@ "queue", "set" ], - "time": "2020-01-05T00:22:59+00:00" + "funding": [ + { + "url": "https://github.com/ramsey", + "type": "github" + } + ], + "time": "2020-08-11T00:57:21+00:00" }, { "name": "ramsey/uuid", - "version": "4.0.1", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "ba8fff1d3abb8bb4d35a135ed22a31c6ef3ede3d" + "reference": "cd4032040a750077205918c86049aa0f43d22947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/ba8fff1d3abb8bb4d35a135ed22a31c6ef3ede3d", - "reference": "ba8fff1d3abb8bb4d35a135ed22a31c6ef3ede3d", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/cd4032040a750077205918c86049aa0f43d22947", + "reference": "cd4032040a750077205918c86049aa0f43d22947", "shasum": "" }, "require": { - "brick/math": "^0.8", + "brick/math": "^0.8 || ^0.9", "ext-json": "*", "php": "^7.2 || ^8", "ramsey/collection": "^1.0", @@ -2208,7 +2269,7 @@ }, "require-dev": { "codeception/aspect-mock": "^3", - "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2", + "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7.0", "doctrine/annotations": "^1.8", "goaop/framework": "^2", "mockery/mockery": "^1.3", @@ -2217,8 +2278,8 @@ "php-mock/php-mock-mockery": "^1.3", "php-mock/php-mock-phpunit": "^2.5", "php-parallel-lint/php-parallel-lint": "^1.1", + "phpbench/phpbench": "^0.17.1", "phpstan/extension-installer": "^1.0", - "phpstan/phpdoc-parser": "0.4.3", "phpstan/phpstan": "^0.12", "phpstan/phpstan-mockery": "^0.12", "phpstan/phpstan-phpunit": "^0.12", @@ -2267,7 +2328,7 @@ "type": "github" } ], - "time": "2020-03-29T20:13:32+00:00" + "time": "2020-08-18T17:17:46+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -2333,16 +2394,16 @@ }, { "name": "symfony/console", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "34ac555a3627e324b660e318daa07572e1140123" + "reference": "186f395b256065ba9b890c0a4e48a91d598fa2cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/34ac555a3627e324b660e318daa07572e1140123", - "reference": "34ac555a3627e324b660e318daa07572e1140123", + "url": "https://api.github.com/repos/symfony/console/zipball/186f395b256065ba9b890c0a4e48a91d598fa2cf", + "reference": "186f395b256065ba9b890c0a4e48a91d598fa2cf", "shasum": "" }, "require": { @@ -2422,11 +2483,11 @@ "type": "tidelift" } ], - "time": "2020-06-15T12:59:21+00:00" + "time": "2020-09-02T07:07:40+00:00" }, { "name": "symfony/css-selector", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -2557,16 +2618,16 @@ }, { "name": "symfony/error-handler", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "7d0b927b9d3dc41d7d46cda38cbfcd20cdcbb896" + "reference": "525636d4b84e06c6ca72d96b6856b5b169416e6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/7d0b927b9d3dc41d7d46cda38cbfcd20cdcbb896", - "reference": "7d0b927b9d3dc41d7d46cda38cbfcd20cdcbb896", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/525636d4b84e06c6ca72d96b6856b5b169416e6a", + "reference": "525636d4b84e06c6ca72d96b6856b5b169416e6a", "shasum": "" }, "require": { @@ -2624,20 +2685,20 @@ "type": "tidelift" } ], - "time": "2020-05-30T20:35:19+00:00" + "time": "2020-08-17T10:01:29+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7" + "reference": "94871fc0a69c3c5da57764187724cdce0755899c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/cc0d059e2e997e79ca34125a52f3e33de4424ac7", - "reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/94871fc0a69c3c5da57764187724cdce0755899c", + "reference": "94871fc0a69c3c5da57764187724cdce0755899c", "shasum": "" }, "require": { @@ -2710,7 +2771,7 @@ "type": "tidelift" } ], - "time": "2020-05-20T17:43:50+00:00" + "time": "2020-08-13T14:19:42+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -2790,16 +2851,16 @@ }, { "name": "symfony/finder", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187" + "reference": "2b765f0cf6612b3636e738c0689b29aa63088d5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/4298870062bfc667cb78d2b379be4bf5dec5f187", - "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187", + "url": "https://api.github.com/repos/symfony/finder/zipball/2b765f0cf6612b3636e738c0689b29aa63088d5d", + "reference": "2b765f0cf6612b3636e738c0689b29aa63088d5d", "shasum": "" }, "require": { @@ -2849,20 +2910,20 @@ "type": "tidelift" } ], - "time": "2020-05-20T17:43:50+00:00" + "time": "2020-08-17T10:01:29+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "f93055171b847915225bd5b0a5792888419d8d75" + "reference": "41a4647f12870e9d41d9a7d72ff0614a27208558" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f93055171b847915225bd5b0a5792888419d8d75", - "reference": "f93055171b847915225bd5b0a5792888419d8d75", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/41a4647f12870e9d41d9a7d72ff0614a27208558", + "reference": "41a4647f12870e9d41d9a7d72ff0614a27208558", "shasum": "" }, "require": { @@ -2924,20 +2985,20 @@ "type": "tidelift" } ], - "time": "2020-06-15T06:52:54+00:00" + "time": "2020-08-17T07:48:54+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "a18c27ace1ef344ffcb129a5b089bad7643b387a" + "reference": "3e32676e6cb5d2081c91a56783471ff8a7f7110b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a18c27ace1ef344ffcb129a5b089bad7643b387a", - "reference": "a18c27ace1ef344ffcb129a5b089bad7643b387a", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3e32676e6cb5d2081c91a56783471ff8a7f7110b", + "reference": "3e32676e6cb5d2081c91a56783471ff8a7f7110b", "shasum": "" }, "require": { @@ -3037,20 +3098,20 @@ "type": "tidelift" } ], - "time": "2020-06-15T13:51:38+00:00" + "time": "2020-09-02T08:15:18+00:00" }, { "name": "symfony/mime", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "c0c418f05e727606e85b482a8591519c4712cf45" + "reference": "89a2c9b4cb7b5aa516cf55f5194c384f444c81dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/c0c418f05e727606e85b482a8591519c4712cf45", - "reference": "c0c418f05e727606e85b482a8591519c4712cf45", + "url": "https://api.github.com/repos/symfony/mime/zipball/89a2c9b4cb7b5aa516cf55f5194c384f444c81dc", + "reference": "89a2c9b4cb7b5aa516cf55f5194c384f444c81dc", "shasum": "" }, "require": { @@ -3114,11 +3175,11 @@ "type": "tidelift" } ], - "time": "2020-06-09T15:07:35+00:00" + "time": "2020-08-17T10:01:29+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -3194,7 +3255,7 @@ }, { "name": "symfony/polyfill-iconv", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", @@ -3271,7 +3332,7 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", @@ -3349,16 +3410,16 @@ }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe" + "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/bc6549d068d0160e0f10f7a5a23c7d1406b95ebe", - "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251", + "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251", "shasum": "" }, "require": { @@ -3430,11 +3491,11 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-08-04T06:02:08+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -3515,7 +3576,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -3592,7 +3653,7 @@ }, { "name": "symfony/polyfill-php70", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", @@ -3669,7 +3730,7 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", @@ -3742,7 +3803,7 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -3818,7 +3879,7 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", @@ -3898,16 +3959,16 @@ }, { "name": "symfony/process", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1" + "reference": "1864216226af21eb76d9477f691e7cbf198e0402" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1", - "reference": "7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1", + "url": "https://api.github.com/repos/symfony/process/zipball/1864216226af21eb76d9477f691e7cbf198e0402", + "reference": "1864216226af21eb76d9477f691e7cbf198e0402", "shasum": "" }, "require": { @@ -3958,20 +4019,20 @@ "type": "tidelift" } ], - "time": "2020-05-30T20:35:19+00:00" + "time": "2020-07-23T08:36:24+00:00" }, { "name": "symfony/routing", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "bbd0ba121d623f66d165a55a108008968911f3eb" + "reference": "47b0218344cb6af25c93ca8ee1137fafbee5005d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/bbd0ba121d623f66d165a55a108008968911f3eb", - "reference": "bbd0ba121d623f66d165a55a108008968911f3eb", + "url": "https://api.github.com/repos/symfony/routing/zipball/47b0218344cb6af25c93ca8ee1137fafbee5005d", + "reference": "47b0218344cb6af25c93ca8ee1137fafbee5005d", "shasum": "" }, "require": { @@ -4050,7 +4111,7 @@ "type": "tidelift" } ], - "time": "2020-06-10T11:49:58+00:00" + "time": "2020-08-10T08:03:57+00:00" }, { "name": "symfony/service-contracts", @@ -4130,16 +4191,16 @@ }, { "name": "symfony/string", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "ac70459db781108db7c6d8981dd31ce0e29e3298" + "reference": "0de4cc1e18bb596226c06a82e2e7e9bc6001a63a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/ac70459db781108db7c6d8981dd31ce0e29e3298", - "reference": "ac70459db781108db7c6d8981dd31ce0e29e3298", + "url": "https://api.github.com/repos/symfony/string/zipball/0de4cc1e18bb596226c06a82e2e7e9bc6001a63a", + "reference": "0de4cc1e18bb596226c06a82e2e7e9bc6001a63a", "shasum": "" }, "require": { @@ -4211,20 +4272,20 @@ "type": "tidelift" } ], - "time": "2020-06-11T12:16:36+00:00" + "time": "2020-08-17T07:48:54+00:00" }, { "name": "symfony/translation", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "d387f07d4c15f9c09439cf3f13ddbe0b2c5e8be2" + "reference": "917b02cdc5f33e0309b8e9d33ee1480b20687413" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/d387f07d4c15f9c09439cf3f13ddbe0b2c5e8be2", - "reference": "d387f07d4c15f9c09439cf3f13ddbe0b2c5e8be2", + "url": "https://api.github.com/repos/symfony/translation/zipball/917b02cdc5f33e0309b8e9d33ee1480b20687413", + "reference": "917b02cdc5f33e0309b8e9d33ee1480b20687413", "shasum": "" }, "require": { @@ -4303,7 +4364,7 @@ "type": "tidelift" } ], - "time": "2020-05-30T20:35:19+00:00" + "time": "2020-08-17T10:01:29+00:00" }, { "name": "symfony/translation-contracts", @@ -4382,16 +4443,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "46a942903059b0b05e601f00eb64179e05578c0f" + "reference": "b43a3905262bcf97b2510f0621f859ca4f5287be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/46a942903059b0b05e601f00eb64179e05578c0f", - "reference": "46a942903059b0b05e601f00eb64179e05578c0f", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b43a3905262bcf97b2510f0621f859ca4f5287be", + "reference": "b43a3905262bcf97b2510f0621f859ca4f5287be", "shasum": "" }, "require": { @@ -4468,7 +4529,7 @@ "type": "tidelift" } ], - "time": "2020-05-30T20:35:19+00:00" + "time": "2020-08-17T07:42:30+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -4728,29 +4789,30 @@ }, { "name": "barryvdh/laravel-debugbar", - "version": "v3.3.3", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "57f2219f6d9efe41ed1bc880d86701c52f261bf5" + "reference": "91ee8b3acf0d72a4937f4855bd245acbda9910ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/57f2219f6d9efe41ed1bc880d86701c52f261bf5", - "reference": "57f2219f6d9efe41ed1bc880d86701c52f261bf5", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/91ee8b3acf0d72a4937f4855bd245acbda9910ac", + "reference": "91ee8b3acf0d72a4937f4855bd245acbda9910ac", "shasum": "" }, "require": { "illuminate/routing": "^5.5|^6|^7", "illuminate/session": "^5.5|^6|^7", "illuminate/support": "^5.5|^6|^7", - "maximebf/debugbar": "^1.15.1", + "maximebf/debugbar": "^1.16.3", "php": ">=7.0", "symfony/debug": "^3|^4|^5", "symfony/finder": "^3|^4|^5" }, "require-dev": { - "laravel/framework": "5.5.x" + "orchestra/testbench": "^3.5|^4.0|^5.0", + "phpunit/phpunit": "^6.0|^7.0|^8.5|^9.0" }, "type": "library", "extra": { @@ -4798,43 +4860,46 @@ "type": "github" } ], - "time": "2020-05-05T10:53:32+00:00" + "time": "2020-08-30T07:08:17+00:00" }, { "name": "barryvdh/laravel-ide-helper", - "version": "v2.7.0", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "5f677edc14bdcfdcac36633e6eea71b2728a4dbc" + "reference": "ba95d18ef55c91295250ae8b7bfa73d8fb866b9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/5f677edc14bdcfdcac36633e6eea71b2728a4dbc", - "reference": "5f677edc14bdcfdcac36633e6eea71b2728a4dbc", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/ba95d18ef55c91295250ae8b7bfa73d8fb866b9b", + "reference": "ba95d18ef55c91295250ae8b7bfa73d8fb866b9b", "shasum": "" }, "require": { "barryvdh/reflection-docblock": "^2.0.6", - "composer/composer": "^1.6", + "composer/composer": "^1.6 || ^2.0@dev", "doctrine/dbal": "~2.3", - "illuminate/console": "^5.5|^6|^7", - "illuminate/filesystem": "^5.5|^6|^7", - "illuminate/support": "^5.5|^6|^7", - "php": ">=7.2" + "illuminate/console": "^5.5 || ^6 || ^7", + "illuminate/filesystem": "^5.5 || ^6 || ^7", + "illuminate/support": "^5.5 || ^6 || ^7", + "php": ">=7.2", + "phpdocumentor/type-resolver": "^1.1.0" }, "require-dev": { - "illuminate/config": "^5.5|^6|^7", - "illuminate/view": "^5.5|^6|^7", + "illuminate/config": "^5.5 || ^6 || ^7", + "illuminate/view": "^5.5 || ^6 || ^7", "mockery/mockery": "^1.3", - "orchestra/testbench": "^3|^4|^5", - "phpro/grumphp": "^0.17.1", - "squizlabs/php_codesniffer": "^3" + "orchestra/testbench": "^3.5 || ^4 || ^5", + "phpro/grumphp": "^0.19.0", + "spatie/phpunit-snapshot-assertions": "^1.4 || ^2.2 || ^3", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^3.12" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" }, "laravel": { "providers": [ @@ -4875,7 +4940,7 @@ "type": "github" } ], - "time": "2020-04-22T09:57:26+00:00" + "time": "2020-08-10T08:22:48+00:00" }, { "name": "barryvdh/reflection-docblock", @@ -4928,16 +4993,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.2.7", + "version": "1.2.8", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd" + "reference": "8a7ecad675253e4654ea05505233285377405215" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd", - "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/8a7ecad675253e4654ea05505233285377405215", + "reference": "8a7ecad675253e4654ea05505233285377405215", "shasum": "" }, "require": { @@ -4985,25 +5050,29 @@ "url": "https://packagist.com", "type": "custom" }, + { + "url": "https://github.com/composer", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/composer/composer", "type": "tidelift" } ], - "time": "2020-04-08T08:27:21+00:00" + "time": "2020-08-23T12:54:47+00:00" }, { "name": "composer/composer", - "version": "1.10.9", + "version": "1.10.10", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "83c3250093d5491600a822e176b107a945baf95a" + "reference": "32966a3b1d48bc01472a8321fd6472b44fad033a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/83c3250093d5491600a822e176b107a945baf95a", - "reference": "83c3250093d5491600a822e176b107a945baf95a", + "url": "https://api.github.com/repos/composer/composer/zipball/32966a3b1d48bc01472a8321fd6472b44fad033a", + "reference": "32966a3b1d48bc01472a8321fd6472b44fad033a", "shasum": "" }, "require": { @@ -5084,7 +5153,7 @@ "type": "tidelift" } ], - "time": "2020-07-16T10:57:00+00:00" + "time": "2020-08-03T09:35:19+00:00" }, { "name": "composer/semver", @@ -5223,16 +5292,16 @@ }, { "name": "composer/xdebug-handler", - "version": "1.4.2", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51" + "reference": "ebd27a9866ae8254e873866f795491f02418c5a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", - "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ebd27a9866ae8254e873866f795491f02418c5a5", + "reference": "ebd27a9866ae8254e873866f795491f02418c5a5", "shasum": "" }, "require": { @@ -5277,7 +5346,7 @@ "type": "tidelift" } ], - "time": "2020-06-04T11:16:35+00:00" + "time": "2020-08-19T10:27:58+00:00" }, { "name": "doctrine/cache", @@ -5377,16 +5446,16 @@ }, { "name": "doctrine/dbal", - "version": "2.10.2", + "version": "2.10.3", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "aab745e7b6b2de3b47019da81e7225e14dcfdac8" + "reference": "03ca23afc2ee062f5d3e32426ad37c34a4770dcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/aab745e7b6b2de3b47019da81e7225e14dcfdac8", - "reference": "aab745e7b6b2de3b47019da81e7225e14dcfdac8", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/03ca23afc2ee062f5d3e32426ad37c34a4770dcf", + "reference": "03ca23afc2ee062f5d3e32426ad37c34a4770dcf", "shasum": "" }, "require": { @@ -5396,13 +5465,14 @@ "php": "^7.2" }, "require-dev": { - "doctrine/coding-standard": "^6.0", + "doctrine/coding-standard": "^8.1", "jetbrains/phpstorm-stubs": "^2019.1", "nikic/php-parser": "^4.4", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^8.4.1", + "phpstan/phpstan": "^0.12.40", + "phpunit/phpunit": "^8.5.5", + "psalm/plugin-phpunit": "^0.10.0", "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", - "vimeo/psalm": "^3.11" + "vimeo/psalm": "^3.14.2" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -5481,24 +5551,24 @@ "type": "tidelift" } ], - "time": "2020-04-20T17:19:26+00:00" + "time": "2020-09-02T01:35:42+00:00" }, { "name": "doctrine/event-manager", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "629572819973f13486371cb611386eb17851e85c" + "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/629572819973f13486371cb611386eb17851e85c", - "reference": "629572819973f13486371cb611386eb17851e85c", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f", + "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "conflict": { "doctrine/common": "<2.9@dev" @@ -5557,7 +5627,21 @@ "event system", "events" ], - "time": "2019-11-10T09:48:07+00:00" + "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%2Fevent-manager", + "type": "tidelift" + } + ], + "time": "2020-05-29T18:28:51+00:00" }, { "name": "doctrine/instantiator", @@ -5631,21 +5715,21 @@ }, { "name": "facade/flare-client-php", - "version": "1.3.4", + "version": "1.3.5", "source": { "type": "git", "url": "https://github.com/facade/flare-client-php.git", - "reference": "0eeb0de4fc1078433f0915010bd8f41e998adcb4" + "reference": "25907a113bfc212a38d458ae365bfb902b4e7fb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/flare-client-php/zipball/0eeb0de4fc1078433f0915010bd8f41e998adcb4", - "reference": "0eeb0de4fc1078433f0915010bd8f41e998adcb4", + "url": "https://api.github.com/repos/facade/flare-client-php/zipball/25907a113bfc212a38d458ae365bfb902b4e7fb8", + "reference": "25907a113bfc212a38d458ae365bfb902b4e7fb8", "shasum": "" }, "require": { "facade/ignition-contracts": "~1.0", - "illuminate/pipeline": "^5.5|^6.0|^7.0", + "illuminate/pipeline": "^5.5|^6.0|^7.0|^8.0", "php": "^7.1", "symfony/http-foundation": "^3.3|^4.1|^5.0", "symfony/mime": "^3.4|^4.0|^5.1", @@ -5689,20 +5773,20 @@ "type": "github" } ], - "time": "2020-07-13T23:25:57+00:00" + "time": "2020-08-26T18:06:23+00:00" }, { "name": "facade/ignition", - "version": "2.3.3", + "version": "2.3.6", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "cc7df15806aad8a9915148ea4daf7f0dd0be45b5" + "reference": "d7d05dba5a0bdbf018a2cb7be268f22f5d73eb81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/cc7df15806aad8a9915148ea4daf7f0dd0be45b5", - "reference": "cc7df15806aad8a9915148ea4daf7f0dd0be45b5", + "url": "https://api.github.com/repos/facade/ignition/zipball/d7d05dba5a0bdbf018a2cb7be268f22f5d73eb81", + "reference": "d7d05dba5a0bdbf018a2cb7be268f22f5d73eb81", "shasum": "" }, "require": { @@ -5761,7 +5845,7 @@ "laravel", "page" ], - "time": "2020-07-14T11:34:42+00:00" + "time": "2020-08-10T13:50:38+00:00" }, { "name": "facade/ignition-contracts", @@ -6099,16 +6183,16 @@ }, { "name": "mockery/mockery", - "version": "1.4.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "1404386ca3410b04fe58b9517e85d702ab33b2c6" + "reference": "20cab678faed06fac225193be281ea0fddb43b93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/1404386ca3410b04fe58b9517e85d702ab33b2c6", - "reference": "1404386ca3410b04fe58b9517e85d702ab33b2c6", + "url": "https://api.github.com/repos/mockery/mockery/zipball/20cab678faed06fac225193be281ea0fddb43b93", + "reference": "20cab678faed06fac225193be281ea0fddb43b93", "shasum": "" }, "require": { @@ -6120,7 +6204,7 @@ "phpunit/phpunit": "<8.0" }, "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.0" + "phpunit/phpunit": "^8.5 || ^9.3" }, "type": "library", "extra": { @@ -6163,7 +6247,7 @@ "test double", "testing" ], - "time": "2020-07-09T08:31:54+00:00" + "time": "2020-08-11T18:10:13+00:00" }, { "name": "myclabs/deep-copy", @@ -6456,16 +6540,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.0", + "version": "5.2.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "3170448f5769fe19f456173d833734e0ff1b84df" + "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/3170448f5769fe19f456173d833734e0ff1b84df", - "reference": "3170448f5769fe19f456173d833734e0ff1b84df", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d870572532cd70bc3fab58f2e23ad423c8404c44", + "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44", "shasum": "" }, "require": { @@ -6504,7 +6588,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2020-07-20T20:05:34+00:00" + "time": "2020-08-15T11:14:08+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -6961,16 +7045,16 @@ }, { "name": "scrivo/highlight.php", - "version": "v9.18.1.1", + "version": "v9.18.1.2", "source": { "type": "git", "url": "https://github.com/scrivo/highlight.php.git", - "reference": "52fc21c99fd888e33aed4879e55a3646f8d40558" + "reference": "efb6e445494a9458aa59b0af5edfa4bdcc6809d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/52fc21c99fd888e33aed4879e55a3646f8d40558", - "reference": "52fc21c99fd888e33aed4879e55a3646f8d40558", + "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/efb6e445494a9458aa59b0af5edfa4bdcc6809d9", + "reference": "efb6e445494a9458aa59b0af5edfa4bdcc6809d9", "shasum": "" }, "require": { @@ -7032,7 +7116,7 @@ "type": "github" } ], - "time": "2020-03-02T05:59:21+00:00" + "time": "2020-08-27T03:24:44+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -7651,16 +7735,16 @@ }, { "name": "seld/jsonlint", - "version": "1.8.0", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1" + "reference": "590cfec960b77fd55e39b7d9246659e95dd6d337" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", - "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/590cfec960b77fd55e39b7d9246659e95dd6d337", + "reference": "590cfec960b77fd55e39b7d9246659e95dd6d337", "shasum": "" }, "require": { @@ -7706,7 +7790,7 @@ "type": "tidelift" } ], - "time": "2020-04-30T19:05:18+00:00" + "time": "2020-08-25T06:56:57+00:00" }, { "name": "seld/phar-utils", @@ -7754,16 +7838,16 @@ }, { "name": "symfony/debug", - "version": "v4.4.10", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "28f92d08bb6d1fddf8158e02c194ad43870007e6" + "reference": "aeb73aca16a8f1fe958230fe44e6cf4c84cbb85e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/28f92d08bb6d1fddf8158e02c194ad43870007e6", - "reference": "28f92d08bb6d1fddf8158e02c194ad43870007e6", + "url": "https://api.github.com/repos/symfony/debug/zipball/aeb73aca16a8f1fe958230fe44e6cf4c84cbb85e", + "reference": "aeb73aca16a8f1fe958230fe44e6cf4c84cbb85e", "shasum": "" }, "require": { @@ -7821,20 +7905,20 @@ "type": "tidelift" } ], - "time": "2020-05-24T08:33:35+00:00" + "time": "2020-08-10T07:47:39+00:00" }, { "name": "symfony/filesystem", - "version": "v5.1.2", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "6e4320f06d5f2cce0d96530162491f4465179157" + "reference": "f7b9ed6142a34252d219801d9767dedbd711da1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/6e4320f06d5f2cce0d96530162491f4465179157", - "reference": "6e4320f06d5f2cce0d96530162491f4465179157", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/f7b9ed6142a34252d219801d9767dedbd711da1a", + "reference": "f7b9ed6142a34252d219801d9767dedbd711da1a", "shasum": "" }, "require": { @@ -7885,7 +7969,7 @@ "type": "tidelift" } ], - "time": "2020-05-30T20:35:19+00:00" + "time": "2020-08-21T17:19:47+00:00" }, { "name": "theseer/tokenizer", diff --git a/src/resources/views/business_cases/import_orders_automation/index.blade.php b/src/resources/views/business_cases/import_orders_automation/index.blade.php index e0c1ca84..373d4f0e 100644 --- a/src/resources/views/business_cases/import_orders_automation/index.blade.php +++ b/src/resources/views/business_cases/import_orders_automation/index.blade.php @@ -222,28 +222,35 @@ function addOrder() }) .then(function (presponse) { - // console.log( presponse ); + console.log( presponse ); - let st = stores.find(el => el.store_key === store_key); - let newItem = presponse.data.item; + Swal.fire( + 'OK!', + 'New order created succesfully! ', + 'success' + ) - newItem.cart_id = st; - items.push( newItem ); - var datatable = $( '#dtable' ).dataTable().api(); - datatable.clear(); - datatable.rows.add( items ); - datatable.order([ 1, "desc" ]).draw(); - - datatable.rows().every(function(){ - var tobj = this; - var tnode = tobj.node(); - var tdata = tobj.data(); - - if ( tdata.cart_id.store_key == st.store_key && tdata.id == newItem.id ){ - $(tnode).addClass('table-info'); - } - }); + // let st = stores.find(el => el.store_key === store_key); + // let newItem = presponse.data.item; + // + // newItem.cart_id = st; + // items.push( newItem ); + // + // var datatable = $( '#dtable' ).dataTable().api(); + // datatable.clear(); + // datatable.rows.add( items ); + // datatable.order([ 1, "desc" ]).draw(); + // + // datatable.rows().every(function(){ + // var tobj = this; + // var tnode = tobj.node(); + // var tdata = tobj.data(); + // + // if ( tdata.cart_id.store_key == st.store_key && tdata.id == newItem.id ){ + // $(tnode).addClass('table-info'); + // } + // }); // let lobj = $( '#dtable' ).find('.'+store_key+':'+newItem.order_id); @@ -398,12 +405,16 @@ function checkNewOrders() // console.log('check for new orders'); blockUiStyled('

Loading new orders.

'); + let oldItems = items; let scount = 0; + let isNew = false; let datatable = $( '#dtable' ).dataTable().api(); let last_order = datatable.column( 1,{order:'applied'} ).data()[0].create_at.value; + $('#dtable tr').removeClass('table-info'); + $.each( stores , function( i, stor ) { blockUiStyled('

Loading '+ stor.url +' information.

'); @@ -458,6 +469,7 @@ function checkNewOrders() } }); + isNew = true; } @@ -470,9 +482,12 @@ function checkNewOrders() if ( scount == stores.length ){ //lastone store finished - compare - console.log( JSON.stringify( items ) === JSON.stringify( oldItems ) ); + // console.log( items ); + // console.log( oldItems ); + // + // console.log( JSON.stringify( items ) === JSON.stringify( oldItems ) ); - if ( JSON.stringify( items ) === JSON.stringify( oldItems ) ){ + if ( JSON.stringify( items ) === JSON.stringify( oldItems ) && isNew == false ){ Swal.fire( 'Info!', From 9d9f7fe1ce222e01a9932dbf4cbb93fa7bb2c570 Mon Sep 17 00:00:00 2001 From: "a.bidlovskyi" Date: Fri, 4 Sep 2020 13:38:42 +0300 Subject: [PATCH 2/4] fix check new orders --- .../import_orders_automation/index.blade.php | 358 ++++++++---------- 1 file changed, 162 insertions(+), 196 deletions(-) diff --git a/src/resources/views/business_cases/import_orders_automation/index.blade.php b/src/resources/views/business_cases/import_orders_automation/index.blade.php index 373d4f0e..91073e47 100644 --- a/src/resources/views/business_cases/import_orders_automation/index.blade.php +++ b/src/resources/views/business_cases/import_orders_automation/index.blade.php @@ -5,7 +5,7 @@ var curentProducts = []; - function loadData(created_from=null){ + function loadData(created_from = null) { items = []; @@ -20,14 +20,14 @@ function loadData(created_from=null){ stores = response.data.data; - if ( response.data.log ){ - for (let k=0; kLoading '+ stores[i].url +' information.'); + blockUiStyled('

Loading ' + stores[i].url + ' information.

'); axios({ method: 'post', - url: '{{ route('orders.list') }}/'+stores[i].store_key, + url: '{{ route('orders.list') }}/' + stores[i].store_key, data: { length: 10, start: 0, @@ -55,33 +55,30 @@ function loadData(created_from=null){ } }).then(function (rep) { - //console.log( stores[i] ); - let orders = rep.data.data; let logs = rep.data.log; - blockUiStyled('

Adding '+ stores[i].url +' orders.

'); + blockUiStyled('

Adding ' + stores[i].url + ' orders.

'); - $.each( orders , function( index, value ) { + $.each(orders, function (index, value) { value.cart_id = stores[i]; - items.push( value ); + items.push(value); }); //update log count - if ( rep.data.log ){ - for (let k=0; k 0 ){ - let price = curentProducts.find(el => el.id === $(check).val() )['price']; - total += price *quantity; + if (quantity > 0) { + let price = curentProducts.find(el => el.id === $(check).val())['price']; + total += price * quantity; } }); - $('#product_total').val( total ); + $('#product_total').val(total); } - function addOrder() - { + function addOrder() { let action = "{{ route('orders.create') }}"; - axios.get( action ) + axios.get(action) .then(function (response) { // handle success // console.log(response); @@ -192,21 +181,21 @@ function addOrder() confirmButtonText: 'Create', width: '70%', allowOutsideClick: false, - preConfirm: ( pconfirm ) => { + preConfirm: (pconfirm) => { $('.swal2-content').find('.is-invalid').removeClass('is-invalid'); - $( $(document.getElementById('_form_errors')).parent() ).hide(); + $($(document.getElementById('_form_errors')).parent()).hide(); let fact = $('.swal2-content form')[0].action; let store_key = $('#cart_id').val(); - var formData = getFormData( $('.swal2-content form') ); + var formData = getFormData($('.swal2-content form')); - $.each( $('.product_quantity'), function(key, value) { + $.each($('.product_quantity'), function (key, value) { let check = $(this).parent().parent().parent().find('.d-none'); let quantity = $(this).val(); - if ( quantity == 0 ){ + if (quantity == 0) { $(check).prop('checked', false); } else { $(check).prop('checked', true); @@ -214,15 +203,14 @@ function addOrder() }); - - return axios.post( fact , formData , { + return axios.post(fact, formData, { headers: { 'Content-Type': 'multipart/form-data' } }) .then(function (presponse) { - console.log( presponse ); + // console.log(presponse); Swal.fire( 'OK!', @@ -231,57 +219,26 @@ function addOrder() ) - // let st = stores.find(el => el.store_key === store_key); - // let newItem = presponse.data.item; - // - // newItem.cart_id = st; - // items.push( newItem ); - // - // var datatable = $( '#dtable' ).dataTable().api(); - // datatable.clear(); - // datatable.rows.add( items ); - // datatable.order([ 1, "desc" ]).draw(); - // - // datatable.rows().every(function(){ - // var tobj = this; - // var tnode = tobj.node(); - // var tdata = tobj.data(); - // - // if ( tdata.cart_id.store_key == st.store_key && tdata.id == newItem.id ){ - // $(tnode).addClass('table-info'); - // } - // }); - - - // let lobj = $( '#dtable' ).find('.'+store_key+':'+newItem.order_id); - // - // console.log( lobj ); - // - // if ( typeof lobj != 'undefined'){ - // $(lobj).parent().parent().addClass('table-info'); - // } - - return true; }) .catch(function (error) { // console.log( error.response.data.errors.checked_id ); - if( typeof error.response.data.errors.checked_id != 'undefined' ){ - $('#_form_errors').empty().append( error.response.data.errors.checked_id[0] ) - $( $(document.getElementById('_form_errors')).parent() ).show(); - $( $(document.getElementById('_form_errors')).parent() ).fadeOut(9000); + if (typeof error.response.data.errors.checked_id != 'undefined') { + $('#_form_errors').empty().append(error.response.data.errors.checked_id[0]) + $($(document.getElementById('_form_errors')).parent()).show(); + $($(document.getElementById('_form_errors')).parent()).fadeOut(9000); } - if ( typeof error.response.data.errors != 'undefined'){ + if (typeof error.response.data.errors != 'undefined') { - $.each(error.response.data.errors, function(index, value) { - if (typeof index !== 'undefined' || typeof value !== 'undefined'){ + $.each(error.response.data.errors, function (index, value) { + if (typeof index !== 'undefined' || typeof value !== 'undefined') { - let obj = $( document.getElementById(index) ); + let obj = $(document.getElementById(index)); let err = $(obj).parent().parent().find('.invalid-feedback'); - $(err).empty().append( value.shift() ); + $(err).empty().append(value.shift()); $(obj).addClass('is-invalid') } @@ -297,65 +254,67 @@ function addOrder() }, }); - $('#cart_id').change(function(e){ + $('#cart_id').change(function (e) { let selected = this.value; - let item = Object.values( selectItems ).find( obj =>{ return obj.store_key === selected } ); + let item = Object.values(selectItems).find(obj => { + return obj.store_key === selected + }); $('#addItemFields').empty(); $('#customer_id').empty(); $('#productsList').empty(); $('#status_id').empty(); - $('#customer_id').prop( "disabled", true ); + $('#customer_id').prop("disabled", true); blockUiStyled('

Loading store customers and products.

'); - axios.all([ loadCustomers( item.store_key ), loadProducts( item.store_key ), loadStatuses( item.store_key ) ]) - .then(axios.spread(function ( users, products, statuses) { + axios.all([loadCustomers(item.store_key), loadProducts(item.store_key), loadStatuses(item.store_key)]) + .then(axios.spread(function (users, products, statuses) { // Both requests are now complete - if (users.data.data.length){ - $.each(users.data.data, function(key, value) { + if (users.data.data.length) { + $.each(users.data.data, function (key, value) { $('#customer_id') .append($("") - .attr("value", value.id ) - .text( value.first_name +' '+ value.last_name +'[ ' + value.email +' ]' )); + .attr("value", value.id) + .text(value.first_name + ' ' + value.last_name + '[ ' + value.email + ' ]')); }); - $('#customer_id').prop( "disabled", false ); + $('#customer_id').prop("disabled", false); } // console.log( statuses ); - if (statuses.data.data.length){ - $.each(statuses.data.data, function(key, value) { + if (statuses.data.data.length) { + $.each(statuses.data.data, function (key, value) { $('#status_id') .append($("") - .attr("value", value.id ) - .text( value.name )); + .attr("value", value.id) + .text(value.name)); }); - $('#status_id').prop( "disabled", false ); + $('#status_id').prop("disabled", false); } - if ( products.data.data.length ){ + if (products.data.data.length) { curentProducts = products.data.data; - $.each(curentProducts, function(key, value) { + $.each(curentProducts, function (key, value) { let html = ''; - $('#productsList').append( html ); + $('#productsList').append(html); }); @@ -370,15 +329,15 @@ function addOrder() }); - $('#cart_id').change(function(){ + $('#cart_id').change(function () { $(this).removeClass('is-invalid'); $('#customer_id,#status_id').removeClass('is-invalid'); }); //update log count - if ( response.data.log ){ - for (let k=0; kLoading new orders.'); @@ -410,17 +368,17 @@ function checkNewOrders() let scount = 0; let isNew = false; - let datatable = $( '#dtable' ).dataTable().api(); - let last_order = datatable.column( 1,{order:'applied'} ).data()[0].create_at.value; + let datatable = $('#dtable').dataTable().api(); + let last_order = datatable.column(1, {order: 'applied'}).data()[0].create_at.value; $('#dtable tr').removeClass('table-info'); - $.each( stores , function( i, stor ) { - blockUiStyled('

Loading '+ stor.url +' information.

'); + $.each(stores, function (i, stor) { + blockUiStyled('

Loading ' + stor.url + ' information.

'); axios({ method: 'post', - url: '{{ route('orders.list') }}/'+stor.store_key, + url: '{{ route('orders.list') }}/' + stor.store_key, data: { length: 10, start: 0, @@ -437,34 +395,34 @@ function checkNewOrders() let orders = rep.data.data; let logs = rep.data.log; - if ( rep.data.log ){ - for (let k=0; k el.id == order.id && el.cart_id.store_key == stor.store_key ); + let elexist = items.find(el => el.id == order.id && el.cart_id.store_key == stor.store_key); - if ( typeof elexist == 'undefined' ){ + if (typeof elexist == 'undefined') { // add new order to table and highlight it - items.push( order ); + items.push(order); datatable.clear(); - datatable.rows.add( items ); - datatable.order([ 1, "desc" ]).draw(); + datatable.rows.add(items); + datatable.order([1, "desc"]).draw(); - datatable.rows().every(function(){ - var tobj = this; + datatable.rows().every(function () { + var tobj = this; var tnode = tobj.node(); var tdata = tobj.data(); - if ( tdata.cart_id.store_key == stor.store_key && tdata.id == order.id ){ + if (tdata.cart_id.store_key == stor.store_key && tdata.id == order.id) { $(tnode).addClass('table-info'); } }); @@ -479,15 +437,10 @@ function checkNewOrders() $.unblockUI(); $.growlUI('Notification', stor.url + ' data loaded successfull!', 500); - if ( scount == stores.length ){ + if (scount == stores.length) { //lastone store finished - compare - // console.log( items ); - // console.log( oldItems ); - // - // console.log( JSON.stringify( items ) === JSON.stringify( oldItems ) ); - - if ( JSON.stringify( items ) === JSON.stringify( oldItems ) && isNew == false ){ + if (isNew == false && JSON.stringify(items) === JSON.stringify(oldItems)) { Swal.fire( 'Info!', @@ -509,14 +462,13 @@ function checkNewOrders() }); - // $.unblockUI(); } var table; - $(document).ready(function() { + $(document).ready(function () { $.ajaxSetup({ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') @@ -527,7 +479,7 @@ function checkNewOrders() loadData(); - table = $('#dtable').DataTable( { + table = $('#dtable').DataTable({ processing: true, serverSide: false, // ordering: false, @@ -536,7 +488,7 @@ function checkNewOrders() buttons: [ { text: 'Reload', - action: function ( e, dt, node, config ) { + action: function (e, dt, node, config) { window.location.reload(); @@ -549,85 +501,90 @@ function checkNewOrders() initComplete: function () { $('#dtable_filter input').focus(); }, - order: [[ 1, "desc" ]], + order: [[1, "desc"]], // iDisplayLength: 10, // bLengthChange: false, columns: [ - { data: null, render: - function ( data, type, row, meta ){ - return data.order_id + ''; - }, orderable : false + { + data: null, render: + function (data, type, row, meta) { + return data.order_id + ''; + }, orderable: false }, - { data: null, render: - function ( data, type, row, meta ){ + { + data: null, render: + function (data, type, row, meta) { return type === 'sort' ? data.create_at.value : moment(data.create_at.value).format('lll'); // return moment(data.create_at.value).format('D/MM/YYYY HH:mm'); - }, orderable : false + }, orderable: false }, - { data: null, render: - function ( data, type, row, meta ){ - let imgName = data.cart_id.cart_info.cart_name.toLowerCase().replace(/ /g,"_"); - return '
' + - ''+data.cart_id.url+'
'+ - ''+data.cart_id.stores_info.store_owner_info.owner+'
'+ - ''+data.cart_id.stores_info.store_owner_info.email+''; - }, orderable : false + { + data: null, render: + function (data, type, row, meta) { + let imgName = data.cart_id.cart_info.cart_name.toLowerCase().replace(/ /g, "_"); + return '
' + + '' + data.cart_id.url + '
' + + '' + data.cart_id.stores_info.store_owner_info.owner + '
' + + '' + data.cart_id.stores_info.store_owner_info.email + ''; + }, orderable: false }, - { data: null, render: - function ( data, type, row, meta ){ - return data.customer.email + '
'+data.customer.first_name +' '+data.customer.last_name+''; - }, orderable : false + { + data: null, render: + function (data, type, row, meta) { + return data.customer.email + '
' + data.customer.first_name + ' ' + data.customer.last_name + ''; + }, orderable: false }, - { data: null, render: - function ( data, type, row, meta ){ + { + data: null, render: + function (data, type, row, meta) { let state = (data.shipping_address.state) ? data.shipping_address.state.code : ''; let country = (data.shipping_address.country) ? data.shipping_address.country.name : ''; - return data.shipping_address.first_name +' '+data.shipping_address.last_name +'
'+ - data.shipping_address.address1+'
'+ - data.shipping_address.city+', '+state+'
'+ + return data.shipping_address.first_name + ' ' + data.shipping_address.last_name + '
' + + data.shipping_address.address1 + '
' + + data.shipping_address.city + ', ' + state + '
' + country; - }, orderable : false + }, orderable: false }, - { data: null, render: 'status.name' }, - { data: null, render: function ( data, type, row, meta ){ + {data: null, render: 'status.name'}, + { + data: null, render: function (data, type, row, meta) { let total = (data.totals) ? data.totals.total : ''; let currency = (data.currency) ? data.currency['iso3'] : ''; return total + ' ' + currency; - }, orderable : false + }, orderable: false }, { - data: null, render: function ( data, type, row, meta ){ - return ' '+ - ' '; - }, orderable : false + data: null, render: function (data, type, row, meta) { + return ' ' + + ' '; + }, orderable: false } ], - drawCallback: function( settings ) { + drawCallback: function (settings) { $('[data-toggle="popover"]').popover('hide'); $('[data-toggle="popover"]').popover({ html: true }); reinitActions(); } - } ); + }); - $('#_btnCreateOrder').click(function(){ + $('#_btnCreateOrder').click(function () { addOrder(); return false; }); - $('#_btnCheckNewOrder').click(function(){ + $('#_btnCheckNewOrder').click(function () { checkNewOrders(); return false; }); - - } ); + }); @endsection @@ -645,9 +602,17 @@ function ( data, type, row, meta ){

Import order automation workflow

-

Example: import customer orders from multiple stores and marketplaces into your platform

-

Setting automated order import from e-stores is probably the main challenge of ERP, shipping, warehouse, order and inventory software owners. With API2Cart order.list method and webhook for order.add event you can do it easily!

-

+

Example: import customer orders from multiple stores and marketplaces into your + platform

+

Setting automated order import from e-stores is probably the main challenge of ERP, + shipping, warehouse, order and inventory software owners. With API2Cart order.list + method and webhook for order.add + event you can do it easily!

+

@@ -660,7 +625,8 @@ function ( data, type, row, meta ){
- Performed 0 requests with API2Cart. Click to see details...
+ Performed 0 requests with API2Cart. Click to + see details...
From 9ba8dce6fda199ea6ded2c316375afe5ee59400b Mon Sep 17 00:00:00 2001 From: "a.bidlovskyi" Date: Mon, 7 Sep 2020 09:56:24 +0300 Subject: [PATCH 3/4] fix check new orders --- src/app/Http/Controllers/OrdersController.php | 17 +++++++--- src/app/Services/Api2Cart.php | 4 ++- src/composer.lock | 33 ++++++++++--------- .../import_orders_automation/index.blade.php | 3 +- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/src/app/Http/Controllers/OrdersController.php b/src/app/Http/Controllers/OrdersController.php index 2e6a29ed..6a8b1d0b 100644 --- a/src/app/Http/Controllers/OrdersController.php +++ b/src/app/Http/Controllers/OrdersController.php @@ -4,6 +4,7 @@ use App\Http\Requests\OrderRequest; use App\Services\Api2Cart; +use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; @@ -26,7 +27,7 @@ public function index() public function orderList($store_id=null,Request $request) { \Debugbar::disable(); - +// Log::debug($request->all()); /** * get account carts & extract exact store info @@ -36,17 +37,23 @@ public function orderList($store_id=null,Request $request) $sort_by = ($request->get('sort_by')) ? $request->get('sort_by') : null; $sort_direct = ($request->get('sort_direct')) ? true : false; - $created_from = ($request->get('created_from')) ? $request->get('created_from') : null; + $created_from = ($request->get('created_from')) ? Carbon::parse($request->get('created_from'))->format("Y-m-d\TH:i:sO") : null; $limit = ($request->get('limit')) ? $request->get('limit') : null; $totalOrders = $this->api2cart->getOrderCount( $store_id ); $orders = collect([]); - + //Log::debug( $created_from ); if ( $totalOrders ){ - $result = $this->api2cart->getOrderList( $store_id, null, null, null, $created_from ); + $result = $this->api2cart->getOrderList( + $store_id, + null, + null, + null, + $created_from, + ); $newOrders = (isset($result['result']['orders_count'])) ? collect( $result['result']['order'] ) : collect([]); // put additional information @@ -81,7 +88,7 @@ public function orderList($store_id=null,Request $request) // $result = $this->api2cart->getOrderList( $store_id , 'create_at.value', null,$limit); // Log::debug('raw api result'); -// Log::debug( print_r($result,1) ); +// if ( $store_id == '4730d110180d4b67449f00b44608cb9d' ) Log::debug( print_r($result,1) ); if ( $sort_by ){ switch ($sort_by){ diff --git a/src/app/Services/Api2Cart.php b/src/app/Services/Api2Cart.php index b789c4da..0dfd9a78 100644 --- a/src/app/Services/Api2Cart.php +++ b/src/app/Services/Api2Cart.php @@ -11,7 +11,6 @@ use GuzzleHttp\HandlerStack; use GuzzleHttp\Handler\CurlHandler; - use App\Models\User; use App\Models\Log as Logger; @@ -669,6 +668,9 @@ public function getOrderList( $store_id=null , $sort_by=null, $sort_direct=null, null ); + +//if ( $store_id == '4730d110180d4b67449f00b44608cb9d' ) Log::debug(print_r($result,1)); + $this->logApiCall( 'order.list.json', $result->getReturnCode(), $this->order->getConfig(), null, null, null, $result->getReturnMessage(), [ 'sort_by' => $sort_by, 'sort_direct' => $sort_direct, 'limit' => $limit, 'created_from' => $created_from] ); if ( $result->getReturnCode() == 0 ){ diff --git a/src/composer.lock b/src/composer.lock index 935f1025..e5c7b0df 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -464,16 +464,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.19", + "version": "2.1.20", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "840d5603eb84cc81a6a0382adac3293e57c1c64c" + "reference": "f46887bc48db66c7f38f668eb7d6ae54583617ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/840d5603eb84cc81a6a0382adac3293e57c1c64c", - "reference": "840d5603eb84cc81a6a0382adac3293e57c1c64c", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/f46887bc48db66c7f38f668eb7d6ae54583617ff", + "reference": "f46887bc48db66c7f38f668eb7d6ae54583617ff", "shasum": "" }, "require": { @@ -518,7 +518,7 @@ "validation", "validator" ], - "time": "2020-08-08T21:28:19+00:00" + "time": "2020-09-06T13:44:32+00:00" }, { "name": "fideloper/proxy", @@ -1512,16 +1512,16 @@ }, { "name": "nesbot/carbon", - "version": "2.39.0", + "version": "2.39.1", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "0a41ea7f7fedacf307b7a339800e10356a042918" + "reference": "7af467873250583cc967a59ee9df29fabab193c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/0a41ea7f7fedacf307b7a339800e10356a042918", - "reference": "0a41ea7f7fedacf307b7a339800e10356a042918", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7af467873250583cc967a59ee9df29fabab193c1", + "reference": "7af467873250583cc967a59ee9df29fabab193c1", "shasum": "" }, "require": { @@ -1534,7 +1534,7 @@ "doctrine/orm": "^2.7", "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", "kylekatarnls/multi-tester": "^2.0", - "phpmd/phpmd": "^2.8", + "phpmd/phpmd": "^2.9", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^0.12.35", "phpunit/phpunit": "^7.5 || ^8.0", @@ -1597,7 +1597,7 @@ "type": "tidelift" } ], - "time": "2020-08-24T12:35:58+00:00" + "time": "2020-09-04T13:11:37+00:00" }, { "name": "nikic/php-parser", @@ -1653,16 +1653,16 @@ }, { "name": "opis/closure", - "version": "3.5.6", + "version": "3.5.7", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "e8d34df855b0a0549a300cb8cb4db472556e8aa9" + "reference": "4531e53afe2fc660403e76fb7644e95998bff7bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/e8d34df855b0a0549a300cb8cb4db472556e8aa9", - "reference": "e8d34df855b0a0549a300cb8cb4db472556e8aa9", + "url": "https://api.github.com/repos/opis/closure/zipball/4531e53afe2fc660403e76fb7644e95998bff7bf", + "reference": "4531e53afe2fc660403e76fb7644e95998bff7bf", "shasum": "" }, "require": { @@ -1710,7 +1710,7 @@ "serialization", "serialize" ], - "time": "2020-08-11T08:46:50+00:00" + "time": "2020-09-06T17:02:15+00:00" }, { "name": "paragonie/random_compat", @@ -6948,6 +6948,7 @@ "keywords": [ "tokenizer" ], + "abandoned": true, "time": "2019-09-17T06:23:10+00:00" }, { diff --git a/src/resources/views/business_cases/import_orders_automation/index.blade.php b/src/resources/views/business_cases/import_orders_automation/index.blade.php index 91073e47..c09d6b41 100644 --- a/src/resources/views/business_cases/import_orders_automation/index.blade.php +++ b/src/resources/views/business_cases/import_orders_automation/index.blade.php @@ -439,7 +439,8 @@ function checkNewOrders() { if (scount == stores.length) { //lastone store finished - compare - + console.log( items ); + console.log( oldItems ); if (isNew == false && JSON.stringify(items) === JSON.stringify(oldItems)) { Swal.fire( From 0f227151ac0de9c82b71a762c25f835d39a9aebc Mon Sep 17 00:00:00 2001 From: "a.bidlovskyi" Date: Mon, 7 Sep 2020 10:06:47 +0300 Subject: [PATCH 4/4] fix dates --- .../business_cases/import_orders_automation/index.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resources/views/business_cases/import_orders_automation/index.blade.php b/src/resources/views/business_cases/import_orders_automation/index.blade.php index c09d6b41..333fd364 100644 --- a/src/resources/views/business_cases/import_orders_automation/index.blade.php +++ b/src/resources/views/business_cases/import_orders_automation/index.blade.php @@ -439,8 +439,8 @@ function checkNewOrders() { if (scount == stores.length) { //lastone store finished - compare - console.log( items ); - console.log( oldItems ); + // console.log( items ); + // console.log( oldItems ); if (isNew == false && JSON.stringify(items) === JSON.stringify(oldItems)) { Swal.fire(