RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2024-11-25 14:56:09 +03:00
Code Issues Projects Releases Wiki Activity

fix discount

Browse Source
This commit is contained in:
gorokh 2020-02-18 10:54:42 +03:00
parent 686548ab63
commit 594feae948
3 changed files with 869 additions and 811 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
View File

@ -23,6 +23,7 @@ class RetailCrmHistory
public static $CRM_ORDER_NUMBERS = 'order_numbers'; public static $CRM_ORDER_NUMBERS = 'order_numbers';
public static $CRM_CANSEL_ORDER = 'cansel_order'; public static $CRM_CANSEL_ORDER = 'cansel_order';
public static $CRM_CURRENCY = 'currency'; public static $CRM_CURRENCY = 'currency';
public static $CRM_DISCOUNT_ROUND = 'discount_round';
const CANCEL_PROPERTY_CODE = 'INTAROCRM_IS_CANCELED'; const CANCEL_PROPERTY_CODE = 'INTAROCRM_IS_CANCELED';
@ -652,22 +653,34 @@ class RetailCrmHistory
$response = RCrmActions::apiMethod($api, 'orderGet', __METHOD__, $order['id']); $response = RCrmActions::apiMethod($api, 'orderGet', __METHOD__, $order['id']);
if (isset($response['order'])) { if (isset($response['order'])) {
$orderTemp = $response['order']; $orderTemp = $response['order'];
$ditems = [];
$duplicateItems = [];
foreach ($orderTemp['items'] as $item) { foreach ($orderTemp['items'] as $item) {
$ditems[$item['offer']['externalId']]['quantity'] += $item['quantity']; $duplicateItems[$item['id']]['externalId'] += $item['offer']['externalId'];
$ditems[$item['offer']['externalId']]['discountTotal'] += $item['quantity'] * $item['discountTotal']; $duplicateItems[$item['id']]['quantity'] += $item['quantity'];
$ditems[$item['offer']['externalId']]['initialPrice'] = (float)$item['initialPrice']; $duplicateItems[$item['id']]['discountTotal'] += $item['quantity'] * $item['discountTotal'];
$ditems[$item['offer']['externalId']]['price_sum'] = $ditems[$item['offer']['externalId']]['initialPrice'] * $ditems[$item['offer']['externalId']]['quantity'] - $ditems[$item['offer']['externalId']]['discountTotal']; $duplicateItems[$item['id']]['initialPrice'] = (float)$item['initialPrice'];
$ditems[$item['offer']['externalId']]['price_item'] = $ditems[$item['offer']['externalId']]['price_sum'] / $ditems[$item['offer']['externalId']]['quantity']; $duplicateItems[$item['id']]['price_sum'] = ($item['quantity'] * $item['initialPrice']) - ($item['quantity'] * $item['discountTotal']);
} }
unset($orderTemp); unset($orderTemp);
} }
$log->write($ditems, 'duplicateItemsOrderHistory'); $collectItems = [];
foreach ($duplicateItems as $it) {
$collectItems[$it['externalId']]['quantity'] += $it['quantity'];
$collectItems[$it['externalId']]['price_sum'] += $it['price_sum'];
$collectItems[$it['externalId']]['discountTotal_sum'] += $it['discountTotal'];
$collectItems[$it['externalId']]['initialPrice_sum'] += $it['quantity'] * $it['initialPrice'];
}
$log->write($duplicateItems, 'duplicateItemsOrderHistory');
$log->write($collectItems, 'collectItemsOrderHistory');
$optionDiscRound = COption::GetOptionString(self::$MODULE_ID, self::$CRM_DISCOUNT_ROUND, 0);
foreach ($order['items'] as $product) { foreach ($order['items'] as $product) {
if($ditems[$product['offer']['externalId']]['quantity']){ if ($collectItems[$product['offer']['externalId']]['quantity']) {
$product['quantity'] = $ditems[$product['offer']['externalId']]['quantity']; $product['quantity'] = $collectItems[$product['offer']['externalId']]['quantity'];
} }
$item = self::getExistsItem($basket, 'catalog', $product['offer']['externalId']); $item = self::getExistsItem($basket, 'catalog', $product['offer']['externalId']);
@ -685,7 +698,7 @@ class RetailCrmHistory
$item->setFields(array( $item->setFields(array(
'CURRENCY' => $newOrder->getCurrency(), 'CURRENCY' => $newOrder->getCurrency(),
'LID' => $site, 'LID' => $site,
'BASE_PRICE' => $product['initialPrice'], 'BASE_PRICE' => $collectItems[$product['offer']['externalId']]['initialPrice_sum'] / $collectItems[$product['offer']['externalId']]['quantity'],
'NAME' => $product['offer']['name'] ? RCrmActions::fromJSON($product['offer']['name']) : $elem['NAME'], 'NAME' => $product['offer']['name'] ? RCrmActions::fromJSON($product['offer']['name']) : $elem['NAME'],
'DETAIL_PAGE_URL' => $elem['URL'], 'DETAIL_PAGE_URL' => $elem['URL'],
'PRODUCT_PROVIDER_CLASS' => 'CCatalogProductProvider', 'PRODUCT_PROVIDER_CLASS' => 'CCatalogProductProvider',
@ -703,7 +716,7 @@ class RetailCrmHistory
} }
if ($product['delete']) { if ($product['delete']) {
if ($ditems[$product['offer']['externalId']]['quantity'] <= 0) { if ($collectItems[$product['offer']['externalId']]['quantity'] <= 0) {
$item->delete(); $item->delete();
continue; continue;
@ -712,36 +725,22 @@ class RetailCrmHistory
if ($product['quantity']) { if ($product['quantity']) {
$item->setFieldNoDemand('QUANTITY', $product['quantity']); $item->setFieldNoDemand('QUANTITY', $product['quantity']);
$item->setField('PRICE', $collectItems[$product['offer']['externalId']]['initialPrice_sum'] / $collectItems[$product['offer']['externalId']]['quantity']);
} }
if (array_key_exists('discountTotal', $product)) { if (array_key_exists('discountTotal_sum', $collectItems[$product['offer']['externalId']])) {
$itemCost = $item->getField('PRICE'); $item->setField('CUSTOM_PRICE', 'Y');
$item->setField('DISCOUNT_NAME', '');
$item->setField('DISCOUNT_VALUE', '');
$item->setField('DISCOUNT_PRICE', $product['discountTotal_sum']);
if (empty($itemCost)) { $price = $collectItems[$product['offer']['externalId']]['price_sum'] / $collectItems[$product['offer']['externalId']]['quantity'];
$itemCost = $item->getField('BASE_PRICE');
if ('Y' == $optionDiscRound) {
$price = self::truncate($price, 2);
} }
$discount = (double) $item->getField('DISCOUNT_PRICE'); $item->setField('PRICE', $price);
if (isset($itemCost) && $itemCost >= 0) {
if ($discount < 0) {
$resultDiscount = $product['discountTotal'] + $discount;
} else {
$resultDiscount = $product['discountTotal'];
}
$item->setField('CUSTOM_PRICE', 'Y');
$item->setField('DISCOUNT_NAME', '');
$item->setField('DISCOUNT_VALUE', '');
$item->setField('DISCOUNT_PRICE', $resultDiscount);
$item->setField('PRICE', $itemCost - $resultDiscount);
//set price dublicate item
if ($ditems[$product['offer']['externalId']]['price_item']) {
$item->setField('PRICE', $ditems[$product['offer']['externalId']]['price_item']);
$item->setField('DISCOUNT_PRICE', '');
}
}
} }
} }
} }
@ -1378,6 +1377,25 @@ class RetailCrmHistory
return false; return false;
} }
} }
/**
* Truncate a float number
*
* @param float $val
* @param int f Number of precision
*
* @return float
*/
public static function truncate($val, $precision = "0")
{
if(($p = strpos($val, '.')) !== false
|| ($p = strpos($val, ',')) !== false
) {
$val = floatval(substr($val, 0, $p + 1 + $precision));
}
return $val;
}
} }
class RetailUser extends CUser class RetailUser extends CUser

18
intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php
View File

@ -201,23 +201,23 @@ class RetailCrmOrder
$discount = (double) $product['DISCOUNT_PRICE']; $discount = (double) $product['DISCOUNT_PRICE'];
if ($discount < 0) { //discount
$dpItem = $product['BASE_PRICE'] - $product['PRICE'];
if ( $dpItem > 0 && $discount <= 0) {
$discount = $dpItem;
}
if ($discount <= 0) {
$item['discountManualAmount'] = 0; $item['discountManualAmount'] = 0;
$initialPrice = (double) $product['PRICE']; $initialPrice = (double) $product['PRICE'];
} else { } else {
$item['discountManualAmount'] = (double) $product['DISCOUNT_PRICE']; $item['discountManualAmount'] = $discount;
$initialPrice = (double) $product['PRICE'] + (double) $product['DISCOUNT_PRICE']; $initialPrice = (double) $product['PRICE'] + $discount;
} }
$item['discountManualPercent'] = 0; $item['discountManualPercent'] = 0;
$item['initialPrice'] = $initialPrice; $item['initialPrice'] = $initialPrice;
$dpItem = $product['BASE_PRICE'] - $product['PRICE'];
if ( $dpItem > 0) {
$item['discountManualAmount'] = $dpItem;
$item['initialPrice'] = (double)$product['BASE_PRICE'];
}
$order['items'][] = $item; $order['items'][] = $item;
if ($send && $dimensionsSetting == 'Y') { if ($send && $dimensionsSetting == 'Y') {

1572
intaro.retailcrm/options.php
View File

File diff suppressed because it is too large Load Diff