RetailCRM-Mirror/prestashop-module
1
0
Fork 0
mirror of https://github.com/retailcrm/prestashop-module.git synced 2025-04-11 12:50:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix mistake

Browse source
This commit is contained in:
uryvskiy-dima 2023-01-26 11:39:08 +03:00
parent 75b7badff2
commit 7e71737b14
5 changed files with 1 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
.github/workflows/presta.yml vendored
View file

@ -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

2
CHANGELOG.md
View file

@ -1,5 +1,5 @@
## v3.5.0
* Изменена логика работы с брошенными корзинами.
* Реализована поддержка новой логики работы с брошенными корзинами.
## v3.4.14
* Исправлен баг при передаче брошенных корзин.

1
retailcrm/lib/RetailcrmCartUploader.php
View file

@ -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) {

13
tests/helpers/RetailcrmTestHelper.php
View file

@ -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);
}
}

15
tests/lib/RetailcrmCartUploaderTest.php
View file

@ -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)