RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-01-31 15:22:01 +03:00
Code Issues Projects Releases Wiki Activity

Setup fix (#254)

Browse Source
This commit is contained in:
Smiley48 2022-06-14 12:00:14 +03:00 committed by GitHub
parent 60e818e793
commit 9cf274ec66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
intaro.retailcrm/export/export_setup.php
View File

@ -52,8 +52,6 @@ $iblockFieldsName = $settingsService->getIblockFieldsNames();
$iblockPropertiesHint = $settingsService->getHintProps(); $iblockPropertiesHint = $settingsService->getHintProps();
$units = $settingsService->getUnitsNames(); $units = $settingsService->getUnitsNames();
$hintUnit = $settingsService->getHintUnit(); $hintUnit = $settingsService->getHintUnit();
$SETUP_FILE_NAME = $settingsService->setupFileName;
$SETUP_PROFILE_NAME = $settingsService->setupProfileName;
//highloadblock //highloadblock
if (CModule::IncludeModule('highloadblock')) { if (CModule::IncludeModule('highloadblock')) {
@ -62,6 +60,9 @@ if (CModule::IncludeModule('highloadblock')) {
} }
if (($ACTION === 'EXPORT' || $ACTION === 'EXPORT_EDIT' || $ACTION === 'EXPORT_COPY') && $STEP === 1) { if (($ACTION === 'EXPORT' || $ACTION === 'EXPORT_EDIT' || $ACTION === 'EXPORT_COPY') && $STEP === 1) {
$SETUP_FILE_NAME = $settingsService->setupFileName;
$SETUP_PROFILE_NAME = $settingsService->setupProfileName;
$iblockProperties = $settingsService->getIblockPropsPreset(); $iblockProperties = $settingsService->getIblockPropsPreset();
$loadPurchasePrice = $settingsService->loadPurchasePrice; $loadPurchasePrice = $settingsService->loadPurchasePrice;
$iblockExport = $settingsService->iblockExport; $iblockExport = $settingsService->iblockExport;
@ -357,7 +358,6 @@ if ($STEP === 1) {
$arIBlock['OLD_PROPERTY_SKU_SELECT'], $arIBlock['OLD_PROPERTY_SKU_SELECT'],
$propertyKey $propertyKey
); );
echo $isSelected ? ' selected' : ''; echo $isSelected ? ' selected' : '';
?> ?>
> >
@ -377,7 +377,6 @@ if ($STEP === 1) {
<option value="<?=$prop['CODE']?>" <option value="<?=$prop['CODE']?>"
<?php <?php
echo $settingsService->getOptionClass($prop, false); echo $settingsService->getOptionClass($prop, false);
if (!$productSelected) { if (!$productSelected) {
$isSelected = $settingsService->isOptionSelected( $isSelected = $settingsService->isOptionSelected(
$prop, $prop,
@ -488,7 +487,8 @@ if ($STEP === 1) {
<br> <br>
<h3><?=GetMessage('SETTINGS_EXPORT')?></h3> <h3><?=GetMessage('SETTINGS_EXPORT')?></h3>
<span class="text"><?=GetMessage('FILENAME')?><br><br></span> <span class="text"><?=GetMessage('FILENAME')?><br><br></span>
<input type="text" name="SETUP_FILE_NAME" value="<?=$settingsService->setupFileName?>" size="50"><br><br> <input type="text" name="SETUP_FILE_NAME" value="<?=htmlspecialcharsbx(strlen($SETUP_FILE_NAME) > 0 ?
$SETUP_FILE_NAME : $settingsService->setupFileName); ?>" size="50"><br><br>
<span class="text"><?=GetMessage('LOAD_PURCHASE_PRICE')?>&nbsp;</span> <span class="text"><?=GetMessage('LOAD_PURCHASE_PRICE')?>&nbsp;</span>
<input type="checkbox" name="loadPurchasePrice" value="Y" <?=$loadPurchasePrice === 'Y' ? 'checked' : ''?>> <input type="checkbox" name="loadPurchasePrice" value="Y" <?=$loadPurchasePrice === 'Y' ? 'checked' : ''?>>
<br><br><br> <br><br><br>
@ -535,11 +535,13 @@ if ($STEP === 1) {
<input <input
type="text" type="text"
name="SETUP_PROFILE_NAME" name="SETUP_PROFILE_NAME"
value="<?=htmlspecialchars($SETUP_PROFILE_NAME)?>" value="<?=htmlspecialchars(strlen($SETUP_PROFILE_NAME) > 0 ?
$SETUP_PROFILE_NAME : $settingsService->setupProfileName)?>"
size="50"> size="50">
</label><br><br><br> </label><br><br><br>
<?php <?php
} ?> }
?>
<?=bitrix_sessid_post()?> <?=bitrix_sessid_post()?>
<?php <?php
if ($isSetupModulePage) { ?> if ($isSetupModulePage) { ?>
@ -776,7 +778,6 @@ if ($STEP === 1) {
//Сохранение и выход //Сохранение и выход
if ($STEP === 2) { if ($STEP === 2) {
RetailcrmConfigProvider::setProfileBasePrice($_REQUEST['PROFILE_ID'], $_POST['price-types']); RetailcrmConfigProvider::setProfileBasePrice($_REQUEST['PROFILE_ID'], $_POST['price-types']);
$FINITE = true; $FINITE = true;
} }
?> ?>