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 #94823

Browse source 
fix test
Fixed working with users without loyalty program
This commit is contained in:
Ivan Chaplygin 2024-05-30 11:26:05 +03:00
parent 2ec18f820f
commit 9c7b5ebf60
4 changed files with 47 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/include/class-wc-retailcrm-loyalty.php
View file

@ -348,7 +348,30 @@ if (!class_exists('WC_Retailcrm_Loyalty')) :
public function isValidOrder($wcUser, $wcOrder)
{
return !(!$wcUser || (isCorporateUserActivate($this->settings) && isCorporateOrder($wcUser, $wcOrder)));
if (!$wcUser) {
return false;
}
$wcCustomer = new WC_Customer($wcUser->ID);
return !(!$wcCustomer || (isCorporateUserActivate($this->settings) && isCorporateOrder($wcCustomer, $wcOrder)));
}
public function isValidUser($wcUser)
{
if (empty($wcUser)) {
return false;
}
try {
$response = $this->getLoyaltyAccounts($wcUser->ID);
} catch (Throwable $exception) {
writeBaseLogs('Exception get loyalty accounts: ' . $exception->getMessage());
return false;
}
return isset($response['loyaltyAccounts'][0]);
}
public function applyLoyaltyDiscount($wcOrder, $createdOrder, $discountLp = 0)

18
src/include/class-wc-retailcrm-orders.php
View file

@ -100,9 +100,9 @@ if (!class_exists('WC_Retailcrm_Orders')) :
$this->order_payment->resetData();
$wcOrder = wc_get_order($orderId);
$privilegeType = 'none';
if ($this->loyalty) {
$privilegeType = 'none';
$discountLp = $this->loyalty->deleteLoyaltyCouponInOrder($wcOrder);
$wcUser = $wcOrder->get_user();
@ -112,13 +112,17 @@ if (!class_exists('WC_Retailcrm_Orders')) :
}
$discountLp = 0;
} else {
$privilegeType = 'none';
} elseif ($this->loyalty->isValidUser($wcUser)) {
$privilegeType = 'loyalty_level';
}
}
$this->processOrder($wcOrder);
$this->order['privilegeType'] = $privilegeType;
if (isset($privilegeType)) {
$this->order['privilegeType'] = $privilegeType;
}
$response = $this->retailcrm->ordersCreate($this->order);
@ -322,7 +326,13 @@ if (!class_exists('WC_Retailcrm_Orders')) :
}
if ($this->loyaltyDiscountType === 'bonus_charge') {
$this->retailcrm->cancelBonusOrder(['externalId' => $this->order['externalId']]);
$responseCancelBonus = $this->retailcrm->cancelBonusOrder(['externalId' => $this->order['externalId']]);
if (!$responseCancelBonus instanceof WC_Retailcrm_Response || !$responseCancelBonus->isSuccessful()) {
writeBaseLogs('Error when canceling bonuses');
return null;
}
}
}

4
src/include/functions.php
View file

@ -213,7 +213,7 @@ function isCorporateUserActivate($settings)
return isset($settings['corporate_enabled']) && $settings['corporate_enabled'] === WC_Retailcrm_Base::YES;
}
function isCorporateOrder($wcUser, $wcOrder)
function isCorporateOrder($wcCustomer, $wcOrder)
{
return !empty($wcUser->get_billing_company()) || !empty($wcOrder->get_billing_company());
return !empty($wcCustomer->get_billing_company()) || !empty($wcOrder->get_billing_company());
}

8
tests/test-wc-retailcrm-loyalty.php
View file

@ -121,6 +121,12 @@ class WC_Retailcrm_Loyalty_Test extends WC_Retailcrm_Test_Case_Helper
*/
public function testIsValidOrder($customer, $corporate_enabled, $expected, $orderCorporate)
{
$wp_user = null;
if ($customer) {
$wp_user = get_user_by('ID', $customer->get_id());
}
$this->loyalty = new WC_Retailcrm_Loyalty($this->apiMock, ['corporate_enabled' => $corporate_enabled]);
$wcOrder = new WC_Order();
@ -128,7 +134,7 @@ class WC_Retailcrm_Loyalty_Test extends WC_Retailcrm_Test_Case_Helper
$wcOrder->set_billing_company('OOO TEST');
}
$this->assertEquals($expected, $this->loyalty->isValidOrder($customer, $wcOrder));
$this->assertEquals($expected, $this->loyalty->isValidOrder($wp_user, $wcOrder));
}
/**