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

ref #94823

Browse source 
Removed reapplication of loyalty program bonuses.
Fixed recalculation of discount when bonuses are deleted.
This commit is contained in:
Ivan Chaplygin 2024-05-27 18:05:06 +03:00
parent 98f8650299
commit c69536d5f9
3 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -396,7 +396,7 @@ if (!class_exists('WC_Retailcrm_Loyalty')) :
$wcItem = $wcItems[(int) $externalId];
$wcItem->set_total($wcItem->get_total() - $discountLoyaltyTotal);
$wcItem->calculate_taxes();
$wcItem->save();// TODO Возможно это не нужно вводить, т.к. calculate_totals автоматом пересчитает
$wcItem->save();
}
}

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

@ -323,26 +323,9 @@ if (!class_exists('WC_Retailcrm_Orders')) :
if ($response instanceof WC_Retailcrm_Response && $response->isSuccessful()) {
$this->payment = $this->orderUpdatePaymentType($wcOrder);
/* $responseCalculate = $this->retailcrm->calculateDiscountLoyalty(
$response['order']['site'],
$this->order,
$this->appliedBonuses
);
if (!$responseCalculate instanceof WC_Retailcrm_Response || !$responseCalculate->isSuccessful()) {
$this->appliedBonuses = 0;
}*/
$result = $this->loyalty->applyLoyaltyDiscount($wcOrder, $response['order'], $this->appliedBonuses);
if (is_string($result)) {
writeBaseLogs($result);
$wcOrder->calculate_totals();
}
} else {
$wcOrder->calculate_totals();
}
$wcOrder->calculate_totals();
} else {
$response = $this->retailcrm->ordersEdit($this->order);

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

@ -136,11 +136,7 @@ class WC_Retailcrm_Order_Item extends WC_Retailcrm_Abstracts_Data
}
}
if ($item->get_total()) {
$productPrice = ($item->get_total() / $item->get_quantity()) + ($loyaltyDiscount / $crmItem['quantity']);
} else {
$productPrice = 0;
}
$productPrice = ($item->get_total() / $item->get_quantity()) + ($loyaltyDiscount / $crmItem['quantity']);
if ($this->cancelBonus && $productPrice > $price) {
$productPrice = $item->get_total() / $item->get_quantity();
@ -148,6 +144,8 @@ class WC_Retailcrm_Order_Item extends WC_Retailcrm_Abstracts_Data
$item->set_total($item->get_total() + $loyaltyDiscount);
$item->calculate_taxes();
$item->save();
$productPrice = $item->get_total() / $item->get_quantity();
} elseif ($productPrice > $price) {
$productPrice = $item->get_total() / $item->get_quantity();
}