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

Merge branch 'master' of https://github.com/devcode-it/openstamanager

This commit is contained in:
MatteoPistorello 2023-06-16 16:07:24 +02:00
parent b9184eac0a 598f9bbaa7
commit 393fad63ed
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/anagrafiche/edit.php
View File

@ -365,7 +365,7 @@ echo '
shadowSize: [41, 41]
});
L.tileLayer("'.setting("Tile layer OpenStreetMap").'", {
L.tileLayer("'.setting("Tile server OpenStreetMap").'", {
maxZoom: 17,
attribution: "© OpenStreetMap"
}).addTo(map);

2
modules/anagrafiche/modals/posizione.php
View File

@ -109,7 +109,7 @@ function caricaMappa() {
shadowSize: [41, 41]
});
L.tileLayer("'.setting("Tile layer OpenStreetMap").'", {
L.tileLayer("'.setting("Tile server OpenStreetMap").'", {
maxZoom: 17,
attribution: "© OpenStreetMap"
}).addTo(map);

4
modules/fatture/src/Fattura.php
View File

@ -358,12 +358,12 @@ class Fattura extends Document
*/
public function getRitenutaAccontoAttribute()
{
return $this->calcola('ritenuta_acconto');
return $this->getRigheContabili()->sum('ritenuta_acconto');
}
public function getTotaleRitenutaContributiAttribute()
{
return $this->calcola('ritenuta_contributi');
return $this->getRigheContabili()->sum('ritenuta_contributi');
}
/**

2
modules/mappa/edit.php
View File

@ -88,7 +88,7 @@ include_once __DIR__.'/../../core.php';
gestureHandling: true
});
L.tileLayer("<?php echo setting("Tile layer OpenStreetMap"); ?>", {
L.tileLayer("<?php echo setting("Tile server OpenStreetMap"); ?>", {
maxZoom: 17,
attribution: "© OpenStreetMap"
}).addTo(map);

4
package.json
View File

@ -12,7 +12,7 @@
"bootstrap-daterangepicker": "^2.1.25",
"bootstrap-maxlength": "^1.10.1",
"chart.js": "^3.8.0",
"ckeditor4": "^4.21.0",
"ckeditor4": "ckeditor/ckeditor4-releases#full/latest",
"components-jqueryui": "^1.12.1",
"datatables.net-bs": "^1.10.15",
"datatables.net-buttons-bs": "^1.3.1",
@ -35,7 +35,7 @@
"moment": "^2.18.1",
"numeral": "^2.0.6",
"parsleyjs": "^2.7.2",
"pdfjs-viewer-element": "^2.3.1",
"pdf.js": "alekswebnet/pdfjs-viewer-element",
"pwstrength-bootstrap": "^3.0.4",
"select2": "^4.0.3",
"select2-bootstrap-theme": "^0.1.0-beta.10",

2
update/2_4_47.sql
View File

@ -15,4 +15,4 @@ UPDATE `zz_settings` SET `help` = "Valore espresso in Giga superato il quale vie
-- Rimozione google maps
DELETE FROM `zz_settings` WHERE `zz_settings`.`nome` = 'Google Maps API key';
INSERT INTO `zz_settings` (`id`, `nome`, `valore`, `tipo`, `editable`, `sezione`, `created_at`, `order`, `help`) VALUES (NULL, 'Tile layer OpenStreetMap', 'https://{s}.tile.openstreetmap.de/{z}/{x}/{y}.png', 'string', '1', 'Generali', NULL, NULL, '')
INSERT INTO `zz_settings` (`id`, `nome`, `valore`, `tipo`, `editable`, `sezione`, `created_at`, `order`, `help`) VALUES (NULL, 'Tile server OpenStreetMap', 'https://{s}.tile.openstreetmap.de/{z}/{x}/{y}.png', 'string', '1', 'Generali', NULL, NULL, '')