Skip to content

Miglioria: aggiunta Note e Link support su Marche #1912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maulapi wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −2
Open

Miglioria: aggiunta Note e Link support su Marche #1912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions modules/marche/actions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
case 'update':
$nome = filter('name');
$link = filter('link');
$link_support = filter('link_support');
$note_marche = filter('note_marche');
$id_original = filter('id_original') ?: null;
$is_articolo = (filter('is_articolo_add') ?: filter('is_articolo')) ?: 0;
$is_impianto = (filter('is_impianto_add') ?: filter('is_impianto')) ?: 0;
Expand All @@ -53,6 +55,8 @@
if (isset($nome)) {
$marca->link = $link;
$marca->name = $nome;
$marca->link_support = $link_support;
$marca->note_marche = $note_marche;
$marca->parent = $id_original ?: null;
$marca->is_articolo = $is_articolo;
$marca->is_impianto = $is_impianto;
Expand Down Expand Up @@ -116,6 +120,8 @@
case 'add':
$nome = filter('name');
$link = filter('link');
$link_support = filter('link_support');
$note_marche = filter('note_marche');
$id_original = filter('id_original') ?: null;
$is_articolo = (filter('is_articolo_add') ?: filter('is_articolo')) ?: 0;
$is_impianto = (filter('is_impianto_add') ?: filter('is_impianto')) ?: 0;
Expand Down Expand Up @@ -149,6 +155,8 @@
}
$marca = Marca::build($nome);
$marca->parent = $id_original;
$marca->link_support = $link_support;
$marca->note_marche = $note_marche;
$marca->is_articolo = $is_articolo;
$marca->is_impianto = $is_impianto;
$marca->link = $link;
Expand Down
10 changes: 9 additions & 1 deletion modules/marche/add.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@
{[ "type": "checkbox", "label": "<?php echo tr('Impianto'); ?>", "name": "is_impianto_add", "value": "<?php echo $marca ? $marca->is_impianto : ($id_original ? Marca::find($id_original)->is_impianto : 0); ?>", "disabled": "<?php echo !empty($id_original) ? 1 : 0; ?>" ]}
</div>
</div>
<div class="row">
<div class="col-md-3">
{[ "type": "text", "label": "<?php echo tr('Link support'); ?>", "name": "link_support", "value":"$link_support$"]}
</div>
<div class="col-md-9">
{[ "type": "text", "label": "<?php echo tr('Note'); ?>", "name": "note_marche", "value":"$note_marche$"]}
</div>
</div>

<!-- PULSANTI -->
<div class="modal-footer">
Expand All @@ -74,4 +82,4 @@
?>
</div>
</div>
</form>
</form>
8 changes: 8 additions & 0 deletions modules/marche/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@
{[ "type": "checkbox", "label": "<?php echo tr('Impianto'); ?>", "name": "is_impianto", "value": "<?php echo $marca->is_impianto; ?>" ]}
</div>
</div>
<div class="row">
<div class="col-md-3">
{[ "type": "text", "label": "<?php echo tr('Link support'); ?>", "name": "link_support", "value":"$link_support$" ]}
</div>
<div class="col-md-9">
{[ "type": "text", "label": "<?php echo tr('Note'); ?>", "name": "note_marche", "value":"$note_marche$" ]}
</div>
</div>
</div>
</div>
</form>
Expand Down
7 changes: 6 additions & 1 deletion update/2_12.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,9 @@ INSERT INTO `zz_settings_lang` (`id_lang`, `id_record`, `title`, `help`) VALUES

-- Aggiunto sconto combinato
ALTER TABLE `co_righe_promemoria` CHANGE `tipo_sconto` `tipo_sconto` ENUM('UNT','PRC','PRC+') NOT NULL DEFAULT 'UNT';
ALTER TABLE `co_righe_promemoria` ADD `sconto_percentuale_combinato` VARCHAR(255) NULL AFTER `sconto_percentuale`;
ALTER TABLE `co_righe_promemoria` ADD `sconto_percentuale_combinato` VARCHAR(255) NULL AFTER `sconto_percentuale`;

--Aggiunto campo note_marche e link_support su Marche
ALTER TABLE `zz_marche` ADD `note_marche` VARCHAR(255) NULL AFTER `parent`;
ALTER TABLE `zz_marche` ADD `link_support` VARCHAR(255) NULL AFTER `link`;

Loading