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

Fix ricevute FE

This commit is contained in:
valentina 2024-09-06 17:19:40 +02:00
parent 2f7ebc9c6b
commit 3c4e2dbaa7
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/adattatori_archiviazione/src/OSMFilesystem.php
View File

@ -61,8 +61,9 @@ class OSMFilesystem extends Filesystem
} while ($this->fileExists($directory.'/'.$filename));
$this->write($directory.'/'.$filename, $contents);
$size = $this->fileSize($directory.'/'.$filename);
return ['filename' => $filename, 'extension' => $extension];
return ['filename' => $filename, 'extension' => $extension, 'size' => $size];
}
protected static function isSupportedType($extension)

10
plugins/receiptFE/edit.php
View File

@ -211,12 +211,18 @@ function upload(btn) {
function importMessage(data) {
data = JSON.parse(data);
var ricevuta = "<br>'.tr('Ricevuta').': " + data.file;
var ricevuta = "<br><h5>'.tr('Ricevuta').': " + data.file+ "</h5>";
if(data.fattura) {
data_fattura = new Date(data.fattura.data);
data_fattura = data_fattura.toLocaleDateString("it-IT", {
year: "numeric",
month: "2-digit",
day: "2-digit"
}).replace(",", "/");
swal({
title: "'.tr('Importazione completata!').'",
html: "'.tr('Fattura aggiornata correttamente').':" + data.fattura + ricevuta,
html: "'.tr('Fattura aggiornata correttamente').': <h4>" + data.fattura.numero_esterno + " '.tr('del').' " + data_fattura + "</h4>" + ricevuta,
type: "success",
});
} else {

7
src/Models/Upload.php
View File

@ -75,8 +75,8 @@ class Upload extends Model
// Informazioni di base
$name = $data['name'] ?? $name;
$name ??= basename($source['name']);
$original_name = $source['name'] ?? $name;
$name ??= basename($source);
$original_name = basename($source) ?? $name;
$category = $data['category'] ?? $category;
// Nome e categoria dell'allegato
@ -122,7 +122,8 @@ class Upload extends Model
} else {
// Caricamento con l'interfaccia di upload
try {
$file = $filesystem->upload($model->directory, $original_name, $source);
$file = $filesystem->upload($model->directory, $original_name, file_get_contents($source));
$model->size = $file['size'];
} catch (\Exception) {
flash()->error(tr('Impossibile creare il file!'));