loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Aggiunto ckeditor full 

Fix distribuite
This commit is contained in:
Luca 2021-02-17 17:10:23 +01:00
parent 15c776ab14
commit 41181c4de7
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -55,7 +55,8 @@
"symfony/polyfill-php70": "^1.8", "symfony/polyfill-php70": "^1.8",
"symfony/translation": "^3.3", "symfony/translation": "^3.3",
"symfony/var-dumper": "^3.3", "symfony/var-dumper": "^3.3",
"willdurand/geocoder": "^3.3" "willdurand/geocoder": "^3.3",
"ckeditor/ckeditor": "dev-full/stable"
}, },
"require-dev": { "require-dev": {
"codeception/codeception": "^3.0", "codeception/codeception": "^3.0",

6
gulpfile.js
View File

@ -274,8 +274,8 @@ function srcFonts() {
function ckeditor() { function ckeditor() {
return gulp.src([ return gulp.src([
config.nodeDirectory + '/ckeditor4/{adapters,lang,skins,plugins}/**/*.{js,json,css,png}', './vendor/ckeditor/ckeditor/{adapters,lang,skins,plugins}/**/*.{js,json,css,png}',
config.nodeDirectory + '/ckeditor4/*.{js,css}', './vendor/ckeditor/ckeditor/*.{js,css}',
]) ])
.pipe(gulp.dest(config.production + '/' + config.paths.js + '/ckeditor')); .pipe(gulp.dest(config.production + '/' + config.paths.js + '/ckeditor'));
} }
@ -345,7 +345,7 @@ function i18n() {
config.nodeDirectory + '/**/{i18n,lang,locale,locales}/*.{js,json}', config.nodeDirectory + '/**/{i18n,lang,locale,locales}/*.{js,json}',
config.development + '/' + config.paths.js + '/i18n/**/*.{js,json}', config.development + '/' + config.paths.js + '/i18n/**/*.{js,json}',
'!' + config.nodeDirectory + '/**/{src,plugins}/**', '!' + config.nodeDirectory + '/**/{src,plugins}/**',
'!' + config.nodeDirectory + '/ckeditor4/**', '!./vendor/ckeditor/ckeditor/**',
'!' + config.nodeDirectory + '/summernote/**', '!' + config.nodeDirectory + '/summernote/**',
'!' + config.nodeDirectory + '/jquery-ui/**', '!' + config.nodeDirectory + '/jquery-ui/**',
]) ])

15
modules/fatture/edit.php
View File

@ -70,14 +70,14 @@ if ($dir == 'entrata' && !empty($fattura->dichiarazione) && $fattura->stato->des
}else{ }else{
//TODO link ad impostazioni con nuova ricerca rapida
echo ' echo '
<div class="alert alert-warning"> <div class="alert alert-warning">
<i class="fa fa-warning"></i> '.tr("Attenzione nessuna aliq. IVA definita per la dichiarazione d'intento. Selezionala dalle impostazioni \"_SETTING_\"", [ <i class="fa fa-warning"></i> '.tr("Attenzione nessuna aliq. IVA definita per la dichiarazione d'intento. _SETTING_", [
'_SETTING_' => "Iva per lettere d'intento", '_SETTING_' => Modules::link("Impostazioni", $dbo->fetchOne("SELECT `id` FROM `zz_settings` WHERE nome=\"Iva per lettere d'intento\"")['id'], tr('Selezionala dalle impostazioni')),
]).'.</b> ]).'
</div>'; </div>';
} }
} }
@ -381,7 +381,12 @@ elseif ($record['stato'] == 'Bozza') {
} }
if ($dir == 'entrata') { if ($dir == 'entrata') {
echo ' echo '
<div class="col-md-3"> <div class="col-md-3">';
if (!empty($record['id_dichiarazione_intento'])) {
echo Plugins::link("Dichiarazioni d'Intento", $record['idanagrafica'], null, null, 'class="pull-right"');
}
echo '
{[ "type": "select", "label": "'.tr("Dichiarazione d'intento").'", "name": "id_dichiarazione_intento", "ajax-source": "dichiarazioni_intento", "select-options": {"idanagrafica": '.$record['idanagrafica'].', "data": "'.$record['data'].'"},"value": "$id_dichiarazione_intento$" ]} {[ "type": "select", "label": "'.tr("Dichiarazione d'intento").'", "name": "id_dichiarazione_intento", "ajax-source": "dichiarazioni_intento", "select-options": {"idanagrafica": '.$record['idanagrafica'].', "data": "'.$record['data'].'"},"value": "$id_dichiarazione_intento$" ]}
</div>'; </div>';
} }

2
package.json
View File

@ -9,7 +9,7 @@
"bootstrap-colorpicker": "2.5.1", "bootstrap-colorpicker": "2.5.1",
"bootstrap-daterangepicker": "^2.1.25", "bootstrap-daterangepicker": "^2.1.25",
"chart.js": "^2.7.0", "chart.js": "^2.7.0",
"ckeditor4": "^4.14.1", "ckeditor4": "^4.16.0",
"components-jqueryui": "^1.12.1", "components-jqueryui": "^1.12.1",
"datatables.net-bs": "^1.10.15", "datatables.net-bs": "^1.10.15",
"datatables.net-buttons-bs": "^1.3.1", "datatables.net-buttons-bs": "^1.3.1",

2
src/Plugins.php
View File

@ -135,7 +135,7 @@ class Plugins
if (!empty($plugin) && in_array($plugin->permission, ['r', 'rw'])) { if (!empty($plugin) && in_array($plugin->permission, ['r', 'rw'])) {
$anchor = 'tab_'.$plugin->id; $anchor = 'tab_'.$plugin->id;
return Modules::link($plugin->originalModule->id, $id_record, $testo, $alternativo, $extra, $blank, $anchor); return Modules::link($plugin->module->id, $id_record, $testo, $alternativo, $extra, $blank, $anchor);
} }
return $alternativo; return $alternativo;