From 7e71737b14d58b56807e973f86f3369b42d88189 Mon Sep 17 00:00:00 2001 From: uryvskiy-dima Date: Thu, 26 Jan 2023 11:39:08 +0300 Subject: [PATCH] Fix mistake --- .github/workflows/presta.yml | 74 ------------------------- CHANGELOG.md | 2 +- retailcrm/lib/RetailcrmCartUploader.php | 1 - tests/helpers/RetailcrmTestHelper.php | 13 ----- tests/lib/RetailcrmCartUploaderTest.php | 15 ----- 5 files changed, 1 insertion(+), 104 deletions(-) diff --git a/.github/workflows/presta.yml b/.github/workflows/presta.yml index ef57d86..cbf3a80 100644 --- a/.github/workflows/presta.yml +++ b/.github/workflows/presta.yml @@ -14,76 +14,6 @@ jobs: strategy: matrix: include: - - php-version: '5.6' - branch: '1.6.1.18' - phpunit-version: 'phpunit:5.7.23' - - php-version: '7.0' - branch: '1.6.1.18' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - branch: '1.6.1.18' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.6' - branch: '1.6.1.19' - phpunit-version: 'phpunit:5.7.23' - - php-version: '7.0' - branch: '1.6.1.19' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - branch: '1.6.1.19' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.6' - branch: '1.6.1.20' - phpunit-version: 'phpunit:5.7.23' - - php-version: '7.0' - branch: '1.6.1.20' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - branch: '1.6.1.20' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.6' - branch: '1.6.1.21' - phpunit-version: 'phpunit:5.7.23' - - php-version: '7.0' - branch: '1.6.1.21' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - branch: '1.6.1.21' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.6' - branch: '1.6.1.22' - phpunit-version: 'phpunit:5.7.23' - - php-version: '7.0' - branch: '1.6.1.22' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - branch: '1.6.1.22' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.6' - branch: '1.6.1.23' - phpunit-version: 'phpunit:5.7.23' - - php-version: '7.0' - branch: '1.6.1.23' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - branch: '1.6.1.23' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.6' - branch: '1.6.1.24' - phpunit-version: 'phpunit:5.7.23' - - php-version: '7.0' - branch: '1.6.1.24' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - branch: '1.6.1.24' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' branch: '1.7.4.4' composerv1: 1 @@ -107,10 +37,6 @@ jobs: composerv1: 1 phpunit-version: 'phpunit:6.4.3' - php-version: '7.2' - branch: '1.7.7.8' - composerv1: 1 - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.3' branch: '1.7.7.8' composerv1: 1 coverage: 1 diff --git a/CHANGELOG.md b/CHANGELOG.md index c8464bb..15d35b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ## v3.5.0 -* Изменена логика работы с брошенными корзинами. +* Реализована поддержка новой логики работы с брошенными корзинами. ## v3.4.14 * Исправлен баг при передаче брошенных корзин. diff --git a/retailcrm/lib/RetailcrmCartUploader.php b/retailcrm/lib/RetailcrmCartUploader.php index 26d4e66..559517b 100644 --- a/retailcrm/lib/RetailcrmCartUploader.php +++ b/retailcrm/lib/RetailcrmCartUploader.php @@ -257,7 +257,6 @@ class RetailcrmCartUploader 'customer' => ['externalId' => $cart->id_customer], 'clearAt' => null, 'createdAt' => $cart->date_add, - 'droppedAt' => date('Y-m-d H:i:s'), ]; if (!$isExistExternalId) { diff --git a/tests/helpers/RetailcrmTestHelper.php b/tests/helpers/RetailcrmTestHelper.php index 32e2f6b..877ac3d 100644 --- a/tests/helpers/RetailcrmTestHelper.php +++ b/tests/helpers/RetailcrmTestHelper.php @@ -73,17 +73,4 @@ class RetailcrmTestHelper 'SELECT MAX(id_customer) FROM `' . _DB_PREFIX_ . 'customer`' ); } - - public static function getAbandonedCartLastSync($cartId) - { - $sql = 'SELECT `last_uploaded` FROM `' . _DB_PREFIX_ . 'retailcrm_abandonedcarts` - WHERE `id_cart` = \'' . pSQL((int) $cartId) . '\''; - $when = Db::getInstance()->getValue($sql); - - if (empty($when)) { - return null; - } - - return DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $when); - } } diff --git a/tests/lib/RetailcrmCartUploaderTest.php b/tests/lib/RetailcrmCartUploaderTest.php index c655e77..bbd5fc5 100644 --- a/tests/lib/RetailcrmCartUploaderTest.php +++ b/tests/lib/RetailcrmCartUploaderTest.php @@ -78,11 +78,6 @@ class RetailcrmCartUploaderTest extends RetailcrmTestCase $this->assertNotEquals(empty($cart->date_upd), true); $this->assertInternalType('string', $cart->date_upd); - // Because for PHP 7.0 and PrestaShop 1.6.x there is a floating bug with tests - if (version_compare(_PS_VERSION_, '1.7', '>')) { - $this->assertNull(RetailcrmTestHelper::getAbandonedCartLastSync($cart->id)); - } - return $cart; } @@ -117,11 +112,6 @@ class RetailcrmCartUploaderTest extends RetailcrmTestCase $this->assertNotEquals(empty($cart->date_upd), true); $this->assertInternalType('string', $cart->date_upd); - - // Because for PHP 7.0 and PrestaShop 1.6.x there is a floating bug with tests - if (version_compare(_PS_VERSION_, '1.7', '>')) { - $this->assertNotNull(RetailcrmTestHelper::getAbandonedCartLastSync($cart->id)); - } } public function testClearCart() @@ -154,11 +144,6 @@ class RetailcrmCartUploaderTest extends RetailcrmTestCase $this->assertEquals($cartUpdate, $cart->date_upd); $this->assertNotEquals(empty($cart->date_upd), true); $this->assertInternalType('string', $cart->date_upd); - - // Because for PHP 7.0 and PrestaShop 1.6.x there is a floating bug with tests - if (version_compare(_PS_VERSION_, '1.7', '>')) { - $this->assertNull(RetailcrmTestHelper::getAbandonedCartLastSync($cart->id)); - } } private function createCart(int $customerId)