RetailCRM-Mirror/woocommerce-module
1
0
Fork 0
mirror of synced 2025-04-03 22:03:34 +03:00
Code Issues Projects Releases Wiki Activity

ref #88866 добавлена проверка на пустоту, удалено жесткое указание типа, добавлены тесты

Browse source
This commit is contained in:
Ivan Chaplygin 2023-05-16 17:34:29 +03:00
parent 9a533b97dd
commit 8a5b16cbd2
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/include/class-wc-retailcrm-history.php
View file

@ -997,12 +997,16 @@ if (!class_exists('WC_Retailcrm_History')) :
/**
* Returns data for address_1 and address_2(if exist data for this field) for WC order.
*
* @param string $addressLine
* @param string|null $addressLine
*
* @return mixed
*/
private function getAddressLines(string $addressLine)
private function getAddressLines($addressLine)
{
if ($addressLine === null) {
return null;
}
if (strpos($addressLine, WC_Retailcrm_Abstracts_Address::ADDRESS_LINE_DIVIDER) !== false) {
$addressLines = explode(WC_Retailcrm_Abstracts_Address::ADDRESS_LINE_DIVIDER, $addressLine);
@ -1183,6 +1187,7 @@ if (!class_exists('WC_Retailcrm_History')) :
$result->save();
$handled = true;
// @codeCoverageIgnoreStart
} catch (\Exception $exception) {
$errorMessage = sprintf(
'Error switching order externalId=%s to customer id=%s (new company: id=%s %s). Reason: %s',
@ -1201,6 +1206,7 @@ if (!class_exists('WC_Retailcrm_History')) :
));
$handled = false;
}
// @codeCoverageIgnoreEnd
}
return $handled;

21
tests/test-wc-retailcrm-history.php
View file

@ -105,6 +105,27 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
}
}
public function test_history_order_create_with_empty_address_delivery()
{
$product = WC_Helper_Product::create_simple_product();
$order = DataHistoryRetailCrm::get_history_data_new_order($product->get_id());
$order['history'][0]['order']['delivery']['address'] = null;
$this->mockHistory(true, DataHistoryRetailCrm::empty_history(), $order);
$retailcrm_history = new WC_Retailcrm_History($this->apiMock);
$retailcrm_history->getHistory();
$orders = wc_get_orders(['numberposts' => -1]);
$wcOrder = end($orders);
if (!$wcOrder) {
$this->fail('$order_added is null - no orders were added after receiving history');
}
$this->assertNotEmpty($wcOrder->get_date_created());
}
public function test_history_order_create_statuses()
{
$product = WC_Helper_Product::create_simple_product();