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

ref #88945 улучшение настроек модуля (#281)

Browse Source 
* Автоматическое соотношение контрагентов по умолчанию, фильтр активности значений
* Добавлен фильтр активных складов и типов цен
This commit is contained in:
Kocmonavtik 2023-03-29 10:39:52 +03:00 committed by GitHub
parent c7aad78e5f
commit b4f4aaa023
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 76 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 2023-03-27 v.6.2.2
- Добавление значения по умолчанию у элемента выбора контрагента
- Добавлена фильтрация полей по активности
## 2023-03-17 v.6.2.1 ## 2023-03-17 v.6.2.1
- Добавлена передача менеджера при изменении заказа по истории - Добавлена передача менеджера при изменении заказа по истории

3
intaro.retailcrm/description.ru
View File

@ -1 +1,2 @@
- Добавлена передача менеджера при изменении заказа по истории - Добавление значения по умолчанию у элемента выбора контрагента
- Добавлена фильтрация полей по активности

20
intaro.retailcrm/install/step2.php
View File

@ -222,10 +222,12 @@ if (isset($arResult['PAYMENT'])) {
<select name="delivery-type-<?php echo $bitrixDeliveryType['ID']; ?>" class="typeselect"> <select name="delivery-type-<?php echo $bitrixDeliveryType['ID']; ?>" class="typeselect">
<option value=""></option> <option value=""></option>
<?php foreach($arResult['deliveryTypesList'] as $deliveryType): ?> <?php foreach($arResult['deliveryTypesList'] as $deliveryType): ?>
<option value="<?php echo $deliveryType['code']; ?>" <?php if ($deliveryType['active'] === true): ?>
<?php if($defaultDelivTypes[$bitrixDeliveryType['ID']] == $deliveryType['code']) echo 'selected'; ?>> <option value="<?php echo $deliveryType['code']; ?>"
<?php echo $APPLICATION->ConvertCharset($deliveryType['name'], 'utf-8', SITE_CHARSET); ?> <?php if($defaultDelivTypes[$bitrixDeliveryType['ID']] == $deliveryType['code']) echo 'selected'; ?>>
</option> <?php echo $APPLICATION->ConvertCharset($deliveryType['name'], 'utf-8', SITE_CHARSET); ?>
</option>
<?php endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</td> </td>
@ -244,7 +246,7 @@ if (isset($arResult['PAYMENT'])) {
<select name="payment-type-<?php echo $bitrixPaymentType['ID']; ?>" class="typeselect"> <select name="payment-type-<?php echo $bitrixPaymentType['ID']; ?>" class="typeselect">
<option value=""></option> <option value=""></option>
<?php foreach($arResult['paymentTypesList'] as $paymentType): ?> <?php foreach($arResult['paymentTypesList'] as $paymentType): ?>
<?php if($paymentType['active'] == 1): ?> <?php if($paymentType['active'] === true): ?>
<option value="<?php echo $paymentType['code']; ?>" <option value="<?php echo $paymentType['code']; ?>"
<?php if($defaultPayTypes[$bitrixPaymentType['ID']] == $paymentType['code']) echo 'selected'; ?>> <?php if($defaultPayTypes[$bitrixPaymentType['ID']] == $paymentType['code']) echo 'selected'; ?>>
<?php <?php
@ -293,11 +295,11 @@ if (isset($arResult['PAYMENT'])) {
<select name="payment-status-<?php echo $bitrixStatus['ID']; ?>" class="typeselect"> <select name="payment-status-<?php echo $bitrixStatus['ID']; ?>" class="typeselect">
<option value="" selected=""></option> <option value="" selected=""></option>
<?php foreach($arResult['paymentGroupList'] as $orderStatusGroup): if(!empty($orderStatusGroup['statuses'])) : ?> <?php foreach($arResult['paymentGroupList'] as $orderStatusGroup): if(!empty($orderStatusGroup['statuses'])) : ?>
<?php if($orderStatusGroup['active'] == 1) : ?> <?php if($orderStatusGroup['active'] === true) : ?>
<optgroup label="<?php echo $APPLICATION->ConvertCharset($orderStatusGroup['name'], 'utf-8', SITE_CHARSET); ?>"> <optgroup label="<?php echo $APPLICATION->ConvertCharset($orderStatusGroup['name'], 'utf-8', SITE_CHARSET); ?>">
<?php foreach($orderStatusGroup['statuses'] as $payment): ?> <?php foreach($orderStatusGroup['statuses'] as $payment): ?>
<?php if(isset($arResult['paymentList'][$payment])): ?> <?php if(isset($arResult['paymentList'][$payment])): ?>
<?php if($arResult['paymentList'][$payment]['active'] == 1): ?> <?php if($arResult['paymentList'][$payment]['active'] === true): ?>
<option value="<?php echo $arResult['paymentList'][$payment]['code']; ?>" <option value="<?php echo $arResult['paymentList'][$payment]['code']; ?>"
<?php if ($defaultPayStatuses[$bitrixStatus['ID']] == $arResult['paymentList'][$payment]['code']) echo 'selected'; ?>> <?php if ($defaultPayStatuses[$bitrixStatus['ID']] == $arResult['paymentList'][$payment]['code']) echo 'selected'; ?>>
<?php echo $APPLICATION->ConvertCharset($arResult['paymentList'][$payment]['name'], 'utf-8', SITE_CHARSET); ?> <?php echo $APPLICATION->ConvertCharset($arResult['paymentList'][$payment]['name'], 'utf-8', SITE_CHARSET); ?>
@ -330,7 +332,7 @@ if (isset($arResult['PAYMENT'])) {
<select name="payment-<?php echo $bitrixPayment['ID']; ?>" class="typeselect"> <select name="payment-<?php echo $bitrixPayment['ID']; ?>" class="typeselect">
<option value=""></option> <option value=""></option>
<?php foreach($arResult['paymentStatusesList'] as $paymentStatus): ?> <?php foreach($arResult['paymentStatusesList'] as $paymentStatus): ?>
<?php if($paymentStatus['active'] == 1): ?> <?php if($paymentStatus['active'] === true): ?>
<option value="<?php echo $paymentStatus['code']; ?>" <option value="<?php echo $paymentStatus['code']; ?>"
<?php if($defaultPayment[$bitrixPayment['ID']] == $paymentStatus['code']) echo 'selected'; ?>> <?php if($defaultPayment[$bitrixPayment['ID']] == $paymentStatus['code']) echo 'selected'; ?>>
<?php echo $APPLICATION->ConvertCharset($paymentStatus['name'], 'utf-8', SITE_CHARSET); ?> <?php echo $APPLICATION->ConvertCharset($paymentStatus['name'], 'utf-8', SITE_CHARSET); ?>
@ -353,7 +355,7 @@ if (isset($arResult['PAYMENT'])) {
<select name="order-type-<?php echo $bitrixOrderType['ID']; ?>" class="typeselect"> <select name="order-type-<?php echo $bitrixOrderType['ID']; ?>" class="typeselect">
<option value=""></option> <option value=""></option>
<?php foreach($arResult['orderTypesList'] as $orderType): ?> <?php foreach($arResult['orderTypesList'] as $orderType): ?>
<?php if($orderType['active'] == 1): ?> <?php if($orderType['active'] === true): ?>
<option value="<?php echo $orderType['code']; ?>" <option value="<?php echo $orderType['code']; ?>"
<?php if($defaultOrderTypes[$bitrixOrderType['ID']] == $orderType['code']) echo 'selected'; ?>> <?php if($defaultOrderTypes[$bitrixOrderType['ID']] == $orderType['code']) echo 'selected'; ?>>
<?php echo $APPLICATION->ConvertCharset($orderType['name'], 'utf-8', SITE_CHARSET); ?> <?php echo $APPLICATION->ConvertCharset($orderType['name'], 'utf-8', SITE_CHARSET); ?>

19
intaro.retailcrm/install/step3.php
View File

@ -38,6 +38,18 @@ if (!isset($arResult['LEGAL_DETAILS'])) {
if (!isset($arResult['CONTRAGENT_TYPES'])) { if (!isset($arResult['CONTRAGENT_TYPES'])) {
$arResult['CONTRAGENT_TYPES'] = unserialize(COption::GetOptionString($MODULE_ID, $CRM_CONTRAGENT_TYPE, 0)); $arResult['CONTRAGENT_TYPES'] = unserialize(COption::GetOptionString($MODULE_ID, $CRM_CONTRAGENT_TYPE, 0));
if ($arResult['CONTRAGENT_TYPES'] === false) {
foreach ($arResult['contragentType'] as $crmContrAgentType) {
if ($crmContrAgentType['ID'] === 'individual') {
$arResult['CONTRAGENT_TYPES']['1'] = 'individual';
}
if ($crmContrAgentType['ID'] === 'legal-entity') {
$arResult['CONTRAGENT_TYPES']['2'] = 'legal-entity';
}
}
}
} }
if (isset($arResult['ORDER_PROPS'])) { if (isset($arResult['ORDER_PROPS'])) {
@ -167,13 +179,12 @@ if (isset($arResult['ORDER_PROPS'])) {
<b> <b>
<label> <label>
<input class="addr" type="radio" name="address-detail-<?= $bitrixOrderType['ID']?>" value="0" <input class="addr" type="radio" name="address-detail-<?= $bitrixOrderType['ID']?>" value="0"
<?= (count($defaultOrderProps[$bitrixOrderType['ID']]) < 6) ? 'checked' : '' ?>> <?= (is_array($defaultOrderProps[$bitrixOrderType['ID']]) && count($defaultOrderProps[$bitrixOrderType['ID']]) < 6) ? 'checked' : '' ?>>
<?= GetMessage('ADDRESS_SHORT')?> <?= GetMessage('ADDRESS_SHORT')?>
</label> </label>
<label> <label>
<input class="addr" type="radio" name="address-detail-<?= $bitrixOrderType['ID']?>" value="1" <input class="addr" type="radio" name="address-detail-<?= $bitrixOrderType['ID']?>" value="1"
<?= (count($defaultOrderProps[$bitrixOrderType['ID']]) > 5) ? 'checked' : '' ?> <?= (is_array($defaultOrderProps[$bitrixOrderType['ID']]) && count($defaultOrderProps[$bitrixOrderType['ID']]) > 5) ? 'checked' : '' ?>>
>
<?= GetMessage('ADDRESS_FULL')?> <?= GetMessage('ADDRESS_FULL')?>
</label> </label>
</b> </b>
@ -182,7 +193,7 @@ if (isset($arResult['ORDER_PROPS'])) {
<?php endif; ?> <?php endif; ?>
<tr <?= ($countProps > 3) ? 'class="address-detail-' . $bitrixOrderType['ID'] . '"' : ''?> <tr <?= ($countProps > 3) ? 'class="address-detail-' . $bitrixOrderType['ID'] . '"' : ''?>
<?= (($countProps > 3) && (count($defaultOrderProps[$bitrixOrderType['ID']]) < 6)) <?= (is_array($defaultOrderProps[$bitrixOrderType['ID']] && ($countProps > 3) && (count($defaultOrderProps[$bitrixOrderType['ID']]) < 6)))
? 'style="display:none;"' ? 'style="display:none;"'
: '' : ''
?> ?>

4
intaro.retailcrm/install/version.php
View File

@ -1,6 +1,6 @@
<?php <?php
$arModuleVersion = [ $arModuleVersion = [
'VERSION' => '6.2.1', 'VERSION' => '6.2.2',
'VERSION_DATE' => '2023-03-17 18:00:00' 'VERSION_DATE' => '2023-03-27 14:00:00'
]; ];

72
intaro.retailcrm/options.php
View File

@ -1373,11 +1373,13 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
<select name="payment-type-<?php echo $bitrixPaymentType['ID']; ?>" class="typeselect"> <select name="payment-type-<?php echo $bitrixPaymentType['ID']; ?>" class="typeselect">
<option value="" selected=""></option> <option value="" selected=""></option>
<?php foreach ($arResult['paymentTypesList'] as $paymentType): ?> <?php foreach ($arResult['paymentTypesList'] as $paymentType): ?>
<option value="<?php echo $paymentType['code']; ?>" <?php if ($optionsPayTypes[$bitrixPaymentType['ID']] === $paymentType['code']) { <?php if($paymentType['active'] === true): ?>
echo 'selected'; <option value="<?php echo $paymentType['code']; ?>" <?php if ($optionsPayTypes[$bitrixPaymentType['ID']] === $paymentType['code']) {
} ?>> echo 'selected';
<?php echo $APPLICATION->ConvertCharset($paymentType['name'], 'utf-8', SITE_CHARSET); ?> } ?>>
</option> <?php echo $APPLICATION->ConvertCharset($paymentType['name'], 'utf-8', SITE_CHARSET); ?>
</option>
<?php endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</label> </label>
@ -1422,12 +1424,14 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
<optgroup label="<?php echo $APPLICATION->ConvertCharset($orderStatusGroup['name'], 'utf-8', SITE_CHARSET); ?>"> <optgroup label="<?php echo $APPLICATION->ConvertCharset($orderStatusGroup['name'], 'utf-8', SITE_CHARSET); ?>">
<?php foreach ($orderStatusGroup['statuses'] as $payment): ?> <?php foreach ($orderStatusGroup['statuses'] as $payment): ?>
<?php if (isset($arResult['paymentList'][$payment])): ?> <?php if (isset($arResult['paymentList'][$payment])): ?>
<option value="<?php echo $arResult['paymentList'][$payment]['code']; ?>" <?php if ($optionsPayStatuses[$bitrixPaymentStatus['ID']] <?php if($arResult['paymentList'][$payment]['active'] === true): ?>
=== $arResult['paymentList'][$payment]['code']) { <option value="<?php echo $arResult['paymentList'][$payment]['code']; ?>" <?php if ($optionsPayStatuses[$bitrixPaymentStatus['ID']]
echo 'selected'; === $arResult['paymentList'][$payment]['code']) {
} ?>> echo 'selected';
<?php echo $APPLICATION->ConvertCharset($arResult['paymentList'][$payment]['name'], 'utf-8', SITE_CHARSET); ?> } ?>>
</option> <?php echo $APPLICATION->ConvertCharset($arResult['paymentList'][$payment]['name'], 'utf-8', SITE_CHARSET); ?>
</option>
<?php endif; ?>
<?php endif; ?> <?php endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</optgroup> </optgroup>
@ -1458,11 +1462,13 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
<select name="payment-<?php echo $bitrixPayment['ID']; ?>" class="typeselect"> <select name="payment-<?php echo $bitrixPayment['ID']; ?>" class="typeselect">
<option value=""></option> <option value=""></option>
<?php foreach ($arResult['paymentStatusesList'] as $paymentStatus): ?> <?php foreach ($arResult['paymentStatusesList'] as $paymentStatus): ?>
<option value="<?php echo $paymentStatus['code']; ?>" <?php if ($optionsPayment[$bitrixPayment['ID']] === $paymentStatus['code']) { <?php if($paymentStatus['active'] === true): ?>
echo 'selected'; <option value="<?php echo $paymentStatus['code']; ?>" <?php if ($optionsPayment[$bitrixPayment['ID']] === $paymentStatus['code']) {
} ?>> echo 'selected';
<?php echo $APPLICATION->ConvertCharset($paymentStatus['name'], 'utf-8', SITE_CHARSET); ?> } ?>>
</option> <?php echo $APPLICATION->ConvertCharset($paymentStatus['name'], 'utf-8', SITE_CHARSET); ?>
</option>
<?php endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</td> </td>
@ -1485,14 +1491,16 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
<select name="order-type-<?php echo $bitrixOrderType['ID']; ?>" class="typeselect"> <select name="order-type-<?php echo $bitrixOrderType['ID']; ?>" class="typeselect">
<option value=""></option> <option value=""></option>
<?php foreach ($arResult['orderTypesList'] as $orderType): ?> <?php foreach ($arResult['orderTypesList'] as $orderType): ?>
<option value="<?php echo $orderType['code']; ?>" <?php if($orderType['active'] === true): ?>
<?php if ($optionsOrderTypes[$bitrixOrderType['ID']] === $orderType['code']) { <option value="<?php echo $orderType['code']; ?>"
echo 'selected'; <?php if ($optionsOrderTypes[$bitrixOrderType['ID']] === $orderType['code']) {
} ?>> echo 'selected';
<?= $APPLICATION } ?>>
->ConvertCharset($orderType['name'], 'utf-8', SITE_CHARSET) <?= $APPLICATION
?> ->ConvertCharset($orderType['name'], 'utf-8', SITE_CHARSET)
</option> ?>
</option>
<?php endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</td> </td>
@ -2093,9 +2101,11 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
<select class="typeselect" name="stores-export-<?php echo $catalogExportStore['ID'] ?>"> <select class="typeselect" name="stores-export-<?php echo $catalogExportStore['ID'] ?>">
<option value=""></option> <option value=""></option>
<?php foreach ($arResult['inventoriesList'] as $inventoriesList): ?> <?php foreach ($arResult['inventoriesList'] as $inventoriesList): ?>
<option value="<?php echo $inventoriesList['code'] ?>" <?php if ($optionStores[$catalogExportStore['ID']] === $inventoriesList['code']) { <?php if ($inventoriesList['active'] === true): ?>
echo 'selected="selected"'; <option value="<?php echo $inventoriesList['code'] ?>" <?php if ($optionStores[$catalogExportStore['ID']] === $inventoriesList['code']) {
} ?>><?php echo $inventoriesList['name'] ?></option> echo 'selected="selected"';
} ?>><?php echo $inventoriesList['name'] ?></option>
<?php endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</td> </td>
@ -2171,9 +2181,11 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
<select class="typeselect" name="price-type-export-<?php echo $catalogExportPrice['ID']; ?>"> <select class="typeselect" name="price-type-export-<?php echo $catalogExportPrice['ID']; ?>">
<option value=""></option> <option value=""></option>
<?php foreach ($arResult['priceTypeList'] as $priceTypeList): ?> <?php foreach ($arResult['priceTypeList'] as $priceTypeList): ?>
<option value="<?php echo $priceTypeList['code'] ?>" <?php if ($optionPrices[$catalogExportPrice['ID']] === $priceTypeList['code']) { <?php if ($priceTypeList['active'] === true): ?>
echo 'selected="selected"'; <option value="<?php echo $priceTypeList['code'] ?>" <?php if ($optionPrices[$catalogExportPrice['ID']] === $priceTypeList['code']) {
} ?>><?php echo $priceTypeList['name'] ?></option> echo 'selected="selected"';
} ?>><?php echo $priceTypeList['name'] ?></option>
<?php endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</td> </td>