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

further fixes for tests

Browse source
This commit is contained in:
Pavel 2020-04-09 18:05:06 +03:00
parent 37106577c6
commit d62d5fe61a
5 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.docker/Dockerfile
View file

@ -22,7 +22,7 @@ RUN apt-get install -y subversion
RUN apt-get install -y wget
RUN wget -O /usr/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x /usr/bin/phpunit
RUN curl --insecure https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer
RUN curl --insecure https://getcomposer.org/download/1.9.3/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
RUN apt-get install -y nodejs

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

@ -173,14 +173,14 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
return;
}
/**
* History orders
*
* @param string $date
* @param int $since_id
*
* @return boolean
*/
/**
* History orders
*
* @param string $date
* @param int $since_id
*
* @return boolean
*/
protected function ordersHistory($date, $since_id)
{
$options = array_flip(array_filter($this->retailcrm_settings));

8
src/include/order/class-wc-retailcrm-order-payment.php
View file

@ -57,8 +57,6 @@ class WC_Retailcrm_Order_Payment extends WC_Retailcrm_Abstracts_Data
&& $this->settings['send_payment_amount'] === WC_Retailcrm_Base::YES
) {
$data['amount'] = (double) $order->get_total();
} else {
unset($data['amount']);
}
if (!$this->is_new) {
@ -105,6 +103,12 @@ class WC_Retailcrm_Order_Payment extends WC_Retailcrm_Abstracts_Data
return array();
}
if (!empty($this->settings['send_payment_amount'])
&& $this->settings['send_payment_amount'] === WC_Retailcrm_Base::NO
) {
unset($data['amount']);
}
return $data;
}

1
tests/helpers/class-wc-retailcrm-test-case-helper.php
View file

@ -20,6 +20,7 @@ class WC_Retailcrm_Test_Case_Helper extends WC_Unit_Test_Case
'p_pending' => 'no',
'p_private' => 'no',
'p_publish' => 'no',
'send_payment_amount' => 'yes',
'order_methods' => '',
'flat_rate_shipping' => 'delivery',
'free_shipping' => 'delivery2',

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

@ -251,6 +251,7 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
'call' => false,
'expired' => false,
'customer' => array(
'type' => 'customer',
'segments' => array(),
'id' => 1,
'firstName' => 'Test',