RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2024-11-22 13:26:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #95 from Evgeniy-Goroh/fix_discount

Browse Source 
поправлена передача скидки
This commit is contained in:
Alex Lushpai 2020-02-20 15:07:06 +03:00 committed by GitHub
commit bc64f8e1bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 937 additions and 819 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intaro.retailcrm/classes/general/events/RetailCrmEvent.php
View File

@ -91,7 +91,9 @@ class RetailCrmEvent
* @param $event
*
* @return bool
* @throws InvalidArgumentException
* @throws \Bitrix\Main\ObjectPropertyException
* @throws \Bitrix\Main\SystemException
* @throws \Bitrix\Main\ArgumentException
*/
function orderSave($event)
{

130
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_CANSEL_ORDER = 'cansel_order';
public static $CRM_CURRENCY = 'currency';
public static $CRM_DISCOUNT_ROUND = 'discount_round';
const CANCEL_PROPERTY_CODE = 'INTAROCRM_IS_CANCELED';
@ -433,7 +434,7 @@ class RetailCrmHistory
}
}
if ($newOrder === null) {
if (!isset($newOrder) || $newOrder === null) {
RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'Bitrix\Sale\Order::load', 'Error order load number=' . $order['number']);
continue;
@ -648,26 +649,68 @@ class RetailCrmHistory
if (isset($order['items'])) {
$itemUpdate = true;
$response = RCrmActions::apiMethod($api, 'orderGet', __METHOD__, $order['id']);
if (isset($response['order'])) {
$orderTemp = $response['order'];
$ditems = [];
$duplicateItems = [];
foreach ($orderTemp['items'] as $item) {
$ditems[$item['offer']['externalId']]['quantity'] += $item['quantity'];
$ditems[$item['offer']['externalId']]['discountTotal'] += $item['quantity'] * $item['discountTotal'];
$ditems[$item['offer']['externalId']]['initialPrice'] = (float)$item['initialPrice'];
$ditems[$item['offer']['externalId']]['price_sum'] = $ditems[$item['offer']['externalId']]['initialPrice'] * $ditems[$item['offer']['externalId']]['quantity'] - $ditems[$item['offer']['externalId']]['discountTotal'];
$ditems[$item['offer']['externalId']]['price_item'] = $ditems[$item['offer']['externalId']]['price_sum'] / $ditems[$item['offer']['externalId']]['quantity'];
}
unset($orderTemp);
$duplicateItems[$item['id']]['externalId'] += $item['offer']['externalId'];
$duplicateItems[$item['id']]['quantity'] += $item['quantity'];
$duplicateItems[$item['id']]['discountTotal'] +=
$item['quantity'] * $item['discountTotal'];
$duplicateItems[$item['id']]['initialPrice'] = (float) $item['initialPrice'];
$duplicateItems[$item['id']]['price_sum'] = ($item['quantity'] * $item['initialPrice'])
- ($item['quantity'] * $item['discountTotal']);
}
$log->write($ditems, 'duplicateItemsOrderHistory');
unset($orderTemp);
} else {
continue;
}
$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'];
if (isset($collectItems[$it['externalId']]['initialPrice_max'])) {
if ($collectItems[$it['externalId']]['initialPrice_max'] < $it['initialPrice']) {
$collectItems[$it['externalId']]['initialPrice_max'] = $it['initialPrice'];
}
} else {
$collectItems[$it['externalId']]['initialPrice_max'] = $it['initialPrice'];
}
$collectItems[$it['externalId']]['initialPricesList'][] = $it['initialPrice'];
}
foreach ($collectItems as $key => $itemData) {
if (count($itemData['initialPricesList']) > 1) {
$discountDelta = 0;
foreach ($itemData['initialPrices'] as $initialPriceItem) {
$delta = $itemData['initialPrice_max'] - (float) $initialPriceItem;
if ($delta !== 0) {
$discountDelta += $delta;
}
}
$collectItems[$key]['discountTotal_sum'] += $discountDelta;
}
}
$log->write($duplicateItems, 'duplicateItemsOrderHistory');
$log->write($collectItems, 'collectItemsOrderHistory');
$optionDiscRound = COption::GetOptionString(self::$MODULE_ID, self::$CRM_DISCOUNT_ROUND, 0);
foreach ($order['items'] as $product) {
if($ditems[$product['offer']['externalId']]['quantity']){
$product['quantity'] = $ditems[$product['offer']['externalId']]['quantity'];
if ($collectItems[$product['offer']['externalId']]['quantity']) {
$product['quantity'] = $collectItems[$product['offer']['externalId']]['quantity'];
}
$item = self::getExistsItem($basket, 'catalog', $product['offer']['externalId']);
@ -682,10 +725,11 @@ class RetailCrmHistory
if ($item instanceof \Bitrix\Sale\BasketItem) {
$elem = self::getInfoElement($product['offer']['externalId']);
$item->setFields(array(
'CURRENCY' => $newOrder->getCurrency(),
'LID' => $site,
'BASE_PRICE' => $product['initialPrice'],
'BASE_PRICE' => $collectItems[$product['offer']['externalId']]['initialPrice_max'],
'NAME' => $product['offer']['name'] ? RCrmActions::fromJSON($product['offer']['name']) : $elem['NAME'],
'DETAIL_PAGE_URL' => $elem['URL'],
'PRODUCT_PROVIDER_CLASS' => 'CCatalogProductProvider',
@ -703,7 +747,7 @@ class RetailCrmHistory
}
if ($product['delete']) {
if ($ditems[$product['offer']['externalId']]['quantity'] <= 0) {
if ($collectItems[$product['offer']['externalId']]['quantity'] <= 0) {
$item->delete();
continue;
@ -714,34 +758,29 @@ class RetailCrmHistory
$item->setFieldNoDemand('QUANTITY', $product['quantity']);
}
if (array_key_exists('discountTotal', $product)) {
$itemCost = $item->getField('PRICE');
if (empty($itemCost)) {
$itemCost = $item->getField('BASE_PRICE');
}
$discount = (double) $item->getField('DISCOUNT_PRICE');
if (isset($itemCost) && $itemCost >= 0) {
if ($discount < 0) {
$resultDiscount = $product['discountTotal'] + $discount;
} else {
$resultDiscount = $product['discountTotal'];
if (array_key_exists('initialPrice_max', $collectItems[$product['offer']['externalId']])) {
$item->setField(
'BASE_PRICE',
$collectItems[$product['offer']['externalId']]['initialPrice_max']
);
}
if (array_key_exists('discountTotal_sum', $collectItems[$product['offer']['externalId']])) {
$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', '');
}
// Полную цену позиции с учётом скидок делим на количество - получаем цену каждой единицы
// товара с учётом скидок.
$price = $collectItems[
$product['offer']['externalId']
]['price_sum'] / $collectItems[$product['offer']['externalId']]['quantity'];
if ('Y' == $optionDiscRound) {
$price = self::truncate($price, 2);
}
$item->setField('PRICE', $price);
}
}
}
@ -1378,6 +1417,25 @@ class RetailCrmHistory
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

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

@ -32,9 +32,14 @@ class RetailCrmOrder
* @param array $arFields
* @param $api
* @param $arParams
* @param $send
* @param bool $send
* @param null $site
* @param string $methodApi
*
* @return boolean
* @return array - array('order' = $order, 'customer' => $customer)
* @throws \Bitrix\Main\ArgumentException
* @throws \Bitrix\Main\ObjectPropertyException
* @throws \Bitrix\Main\SystemException
*/
public static function orderSend($arFields, $api, $arParams, $send = false, $site = null, $methodApi = 'ordersEdit')
{
@ -200,17 +205,15 @@ class RetailCrmOrder
}
$discount = (double) $product['DISCOUNT_PRICE'];
$dpItem = $product['BASE_PRICE'] - $product['PRICE'];
if ($discount < 0) {
$item['discountManualAmount'] = 0;
$initialPrice = (double) $product['PRICE'];
} else {
$item['discountManualAmount'] = (double) $product['DISCOUNT_PRICE'];
$initialPrice = (double) $product['PRICE'] + (double) $product['DISCOUNT_PRICE'];
if ( $dpItem > 0 && $discount <= 0) {
$discount = $dpItem;
}
$item['discountManualPercent'] = 0;
$item['initialPrice'] = $initialPrice;
$item['discountManualAmount'] = $discount;
$item['initialPrice'] = (double) $product['BASE_PRICE'];
$order['items'][] = $item;
@ -298,9 +301,16 @@ class RetailCrmOrder
/**
* Mass order uploading, without repeating; always returns true, but writes error log
* @param $pSize
* @param $failed -- flag to export failed orders
*
* @param int $pSize
* @param bool $failed -- flag to export failed orders
* @param bool $orderList
*
* @return boolean
* @throws \Bitrix\Main\ArgumentNullException
* @throws \Bitrix\Main\ObjectPropertyException
* @throws \Bitrix\Main\SystemException
* @throws \Bitrix\Main\ArgumentException
*/
public static function uploadOrders($pSize = 50, $failed = false, $orderList = false)
{
@ -440,6 +450,14 @@ class RetailCrmOrder
return true;
}
/**
* Converts order object to array
*
* @param \Bitrix\Sale\Order $obOrder
*
* @return array
* @throws \Bitrix\Main\SystemException
*/
public static function orderObjToArr($obOrder)
{
$culture = new \Bitrix\Main\Context\Culture(array("FORMAT_DATETIME" => "Y-m-d HH:i:s"));

88
intaro.retailcrm/options.php
View File

@ -45,6 +45,8 @@ $CRM_ADDRESS_OPTIONS = 'address_options';
$CRM_DIMENSIONS = 'order_dimensions';
$PROTOCOL = 'protocol';
$CRM_DISCOUNT_ROUND = 'discount_round';
if(!CModule::IncludeModule('intaro.retailcrm') || !CModule::IncludeModule('sale') || !CModule::IncludeModule('iblock') || !CModule::IncludeModule('catalog'))
return;
@ -440,6 +442,15 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
UnRegisterModuleDependences("main", "OnBeforeProlog", $mid, "RetailCrmUa", "add");
}
//discount_round
if (htmlspecialchars(trim($_POST['discount_round'])) == 'Y') {
$discount_round = 'Y';
RegisterModuleDependences("main", "OnBeforeProlog", $mid, "RetailCrmDc", "add");
} else {
$discount_round = 'N';
UnRegisterModuleDependences("main", "OnBeforeProlog", $mid, "RetailCrmDc", "add");
}
//version
$version = COption::GetOptionString($mid, $CRM_API_VERSION);
@ -514,6 +525,8 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
COption::SetOptionString($mid, $CRM_UA_KEYS, serialize(RCrmActions::clearArr($uaKeys)));
COption::SetOptionString($mid, $CRM_DIMENSIONS, $orderDimensions);
COption::SetOptionString($mid, $CRM_DISCOUNT_ROUND, $discount_round);
$request = \Bitrix\Main\Application::getInstance()->getContext()->getRequest();
if ($request->isHttps() === true) {
@ -620,6 +633,8 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
$optionUa = COption::GetOptionString($mid, $CRM_UA, 0);
$optionUaKeys = unserialize(COption::GetOptionString($mid, $CRM_UA_KEYS));
$optionDiscRound = COption::GetOptionString($mid, $CRM_DISCOUNT_ROUND, 0);
$version = COption::GetOptionString($mid, $CRM_API_VERSION, 0);
//currency
@ -658,9 +673,9 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
);
$tabControl = new CAdminTabControl("tabControl", $aTabs);
$tabControl->Begin();
?>
<?php $APPLICATION->AddHeadString('<script type="text/javascript" src="/bitrix/js/main/jquery/jquery-1.7.min.js"></script>'); ?>
<script type="text/javascript">
?>
<?php $APPLICATION->AddHeadString('<script type="text/javascript" src="/bitrix/js/main/jquery/jquery-1.7.min.js"></script>'); ?>
<script type="text/javascript">
$(document).ready(function() {
$('input.addr').change(function(){
splitName = $(this).attr('name').split('-');
@ -727,6 +742,16 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
return true;
});
$('.r-dc-button label').change(function(){
if($(this).find('input').is(':checked') === true){
$('tr.r-dc').show('slow');
} else if($(this).find('input').is(':checked') === false){
$('tr.r-dc').hide('slow');
}
return true;
});
});
$('input[name="update-delivery-services"]').live('click', function() {
@ -760,8 +785,8 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
return false;
});
</script>
<style type="text/css">
</script>
<style type="text/css">
.option-other-bottom {
border-bottom: 0px !important;
}
@ -786,12 +811,12 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
color: #4b6267;
}
</style>
<form method="POST" action="<?php echo $uri; ?>" id="FORMACTION">
<?php
</style>
<form method="POST" action="<?php echo $uri; ?>" id="FORMACTION">
<?php
echo bitrix_sessid_post();
$tabControl->BeginNextTab();
?>
?>
<input type="hidden" name="tab" value="catalog">
<tr class="heading">
<td colspan="2"><b><?php echo GetMessage('ICRM_CONN_SETTINGS'); ?></b></td>
@ -826,8 +851,8 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
</tr>
<?php endforeach; ?>
<?php endif;?>
<?php if(!$badKey && !$badJson):?>
<?php $tabControl->BeginNextTab(); ?>
<?php if(!$badKey && !$badJson):?>
<?php $tabControl->BeginNextTab(); ?>
<input type="hidden" name="tab" value="catalog">
<tr class="option-head">
<td colspan="2"><b><?php echo GetMessage('INFO_1'); ?></b></td>
@ -970,7 +995,7 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
</td>
</tr>
<?php endforeach; ?>
<?php $tabControl->BeginNextTab(); ?>
<?php $tabControl->BeginNextTab(); ?>
<input type="hidden" name="tab" value="catalog">
<tr class="option-head">
<td colspan="2"><b><?php echo GetMessage('INFO_2'); ?></b></td>
@ -1072,7 +1097,7 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
<?php endforeach; ?>
<?php endforeach; ?>
<?php $tabControl->BeginNextTab(); ?>
<?php $tabControl->BeginNextTab(); ?>
<input type="hidden" name="tab" value="catalog">
<tr class="heading">
<td colspan="2" class="option-other-bottom"><b><?php echo GetMessage('ORDERS_OPTIONS'); ?></b></td>
@ -1263,6 +1288,21 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
</td>
</tr>
<?php endforeach;?>
<tr class="heading r-dc-button">
<td colspan="2" class="option-other-heading">
<b>
<label><input class="addr" type="checkbox" name="discount_round" value="Y" <?php if($optionDiscRound === 'Y') echo "checked"; ?>><?php echo "Округление цены товара при сборе одинаковых товарных позиций" ?></label>
</b>
</td>
</tr>
<tr class="r-dc" <?php if($optionDiscRound !== 'Y') echo 'style="display: none;"'; ?>>
<td class="option-head" colspan="2">
<b><?php echo "При включенной опции округление будет происходить в меньшую сторону" ?></b>
</td>
</tr>
<tr class="heading r-ua-button">
<td colspan="2" class="option-other-heading">
<b>
@ -1289,17 +1329,17 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
</td>
</tr>
<?php endforeach;?>
<?php endif;?>
<?php $tabControl->Buttons(); ?>
<?php endif;?>
<?php $tabControl->Buttons(); ?>
<input type="hidden" name="Update" value="Y" />
<input type="submit" title="<?php echo GetMessage('ICRM_OPTIONS_SUBMIT_TITLE'); ?>" value="<?php echo GetMessage('ICRM_OPTIONS_SUBMIT_VALUE'); ?>" name="btn-update" class="adm-btn-save" />
<?php $tabControl->End(); ?>
</form>
<?php $tabControl->End(); ?>
</form>
<?php } ?>
<?php //order upload?>
<?php if($_GET['upl'] == 1){?>
<style type="text/css">
<style type="text/css">
.instal-load-label {
color: #000;
margin-bottom: 15px;
@ -1370,9 +1410,9 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
position:relative;
visible: none;
}
</style>
</style>
<script type="text/javascript">
<script type="text/javascript">
$(document).ready(function() {
$('#percent').width($('.instal-progress-bar-outer').width());
@ -1426,9 +1466,9 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
return false;
});
});
</script>
<br>
<form id="upload-orders" action="<?php echo $uri; ?>" method="POST">
</script>
<br>
<form id="upload-orders" action="<?php echo $uri; ?>" method="POST">
<input type="hidden" name="step" value="0">
<div class="adm-detail-content-item-block">
<table class="adm-detail-content-table edit-table" id="edit1_edit_table">
@ -1460,5 +1500,5 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
</div>
</div>
</div>
</form>
</form>
<?php }?>