Skip to content

Commit

Permalink
fix: minori
Browse files Browse the repository at this point in the history
  • Loading branch information
@MatteoPistorello
MatteoPistorello committed Nov 15, 2024
1 parent 3114db9 commit 4233658
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions modules/anagrafiche/edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ function risolviConto(tipo){
<div class="tab-pane '.(!$is_cliente ? 'hide' : 'active').'" id="cliente">
<div class="row">
<div class="col-md-6">
{[ "type": "select", "label": "'.tr('Provenienza cliente').'", "name": "id_provenienza", "ajax-source": "provenienze", "value": "$id_provenienza$", "icon-after": "add|'.Module::where('name', 'Provenienze')->first()->id.'" ]}
{[ "type": "select", "label": "'.tr('Provenienza').'", "name": "id_provenienza", "ajax-source": "provenienze", "value": "$id_provenienza$", "icon-after": "add|'.Module::where('name', 'Provenienze')->first()->id.'" ]}
</div>
<div class="col-md-6">
Expand All @@ -517,7 +517,7 @@ function risolviConto(tipo){
<div class="row">
<div class="col-md-6">
{[ "type": "select", "label": "'.tr('Banca predefinita per accrediti').'", "name": "idbanca_vendite", "ajax-source": "banche", "select-options": '.json_encode(['id_anagrafica' => $anagrafica_azienda->id]).', "value": "$idbanca_vendite$", "help": "'.tr("Banca predefinita dell'Azienda su cui accreditare i pagamenti").'" ]}
{[ "type": "select", "label": "'.tr('Banca predefinita azienda per accrediti').'", "name": "idbanca_vendite", "ajax-source": "banche", "select-options": '.json_encode(['id_anagrafica' => $anagrafica_azienda->id]).', "value": "$idbanca_vendite$", "help": "'.tr("Banca predefinita dell'Azienda su cui accreditare i pagamenti").'" ]}
</div>
<div class="col-md-6">
Expand Down Expand Up @@ -588,7 +588,7 @@ function risolviConto(tipo){
</div>
<div class="col-md-6">
{[ "type": "select", "label": "'.tr('Banca predefinita per addebiti').'", "name": "idbanca_acquisti", "ajax-source": "banche", "select-options": '.json_encode(['id_anagrafica' => $anagrafica_azienda->id]).', "value": "$idbanca_acquisti$", "help": "'.tr("Banca predefinita dell'Azienda da cui addebitare i pagamenti").'" ]}
{[ "type": "select", "label": "'.tr('Banca predefinita azienda per addebiti').'", "name": "idbanca_acquisti", "ajax-source": "banche", "select-options": '.json_encode(['id_anagrafica' => $anagrafica_azienda->id]).', "value": "$idbanca_acquisti$", "help": "'.tr("Banca predefinita dell'Azienda da cui addebitare i pagamenti").'" ]}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion modules/segmenti/add.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<div class="row">
<div class="col-md-6">
{[ "type": "checkbox", "label": "<?php echo tr('Sezionale'); ?>", "help": "<?php echo tr('Se attivo verrà utilizzato il contatore'); ?>", "name": "is_sezionale_add", "value": "$is_sezionale$" ]}
{[ "type": "checkbox", "label": "<?php echo tr('Tipologia'); ?>", "help": "<?php echo tr('Se attivo verrà utilizzato il contatore'); ?>", "name": "is_sezionale_add", "value": "$is_sezionale$", "values": "Sezionale,Segmento" ]}
</div>
<div class="col-md-6">
{[ "type": "select", "label": "<?php echo tr('Modulo'); ?>", "name": "module", "required": 1, "values": "query=SELECT `zz_modules`.`id`, IF(`title`!='', `title`, `title`) AS descrizione FROM `zz_modules` LEFT JOIN `zz_modules_lang` ON (`zz_modules`.`id` = `zz_modules_lang`.`id_record` AND `zz_modules_lang`.`id_lang` = <?php echo prepare(Models\Locale::getDefault()->id); ?>) WHERE `enabled` = 1 AND `options` != 'custom' ORDER BY `title` ASC", "value": "" ]}
Expand Down
2 changes: 1 addition & 1 deletion modules/segmenti/ajax/select.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
$predefined_addebito = Segmento::where('predefined_addebito', 1)->where('id_module', $id_module)->first();

if (isset($id_module)) {
$query = 'SELECT `zz_segments`.`id`, `zz_segments_lang`.`title` AS descrizione FROM `zz_segments` LEFT JOIN `zz_segments_lang` ON (`zz_segments`.`id` = `zz_segments_lang`.`id_record` AND `zz_segments_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') INNER JOIN `zz_group_segment` ON `zz_segments`.`id` = `zz_group_segment`.`id_segment` |where| ORDER BY `title` ASC';
$query = 'SELECT `zz_segments`.`id`, CONCAT(`zz_segments_lang`.`title`, " ", IF(`zz_segments`.`is_sezionale` = 1, "(Sezionale)", "(Segmento)")) AS descrizione FROM `zz_segments` LEFT JOIN `zz_segments_lang` ON (`zz_segments`.`id` = `zz_segments_lang`.`id_record` AND `zz_segments_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') INNER JOIN `zz_group_segment` ON `zz_segments`.`id` = `zz_group_segment`.`id_segment` |where| ORDER BY `title` ASC';

$where[] = '`zz_segments`.`id_module` = '.prepare($id_module);
$where[] = '`zz_group_segment`.`id_gruppo` = '.prepare($user->idgruppo);
Expand Down
2 changes: 1 addition & 1 deletion modules/segmenti/edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</div>

<div class="col-md-2">
{[ "type": "checkbox", "label": "<?php echo tr('Sezionale'); ?>", "help": "<?php echo tr('Se attivo verrà utilizzato il contatore'); ?>", "name": "is_sezionale", "value": "$is_sezionale$", "extra": "readonly" ]}
{[ "type": "checkbox", "label": "<?php echo tr('Tipologia'); ?>", "help": "<?php echo tr('Se sezionale verrà utilizzato il contatore'); ?>", "name": "is_sezionale", "value": "$is_sezionale$", "extra": "readonly", "values": "Sezionale,Segmento" ]}
</div>

<div class="col-md-2">
Expand Down

0 comments on commit 4233658

Please sign in to comment.