Allineamento devel con Master

messo in .gitignore la cartella storage
sistemato import file csv per ING Direct
2024-05-25 08:56:11 +00:00 · 2024-05-25 08:46:59 +00:00 · 2024-05-07 18:26:29 +02:00
6 changed files with 338 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -14,10 +14,27 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
-*.sql
-/.idea
-/.vscode
-resources/views/tmp/*
+
+# Laravel 4 specific
+bootstrap/compiled.php
+app/storage/
+
+# Laravel 5 & Lumen specific
+public/storage
+public/hot
+
+# Laravel 5 & Lumen specific with changed public path
+public_html/storage
+public_html/hot
+
+storage/*.key
+storage/app/*
+storage/logs
+.env
+Homestead.yaml
+Homestead.json
+/.vagrant
+.phpunit.result.cache

 public/ovpn_config.ovpn
 *.txt
--- a/app/Models/Movimenti.php
+++ b/app/Models/Movimenti.php
@@ -187,11 +187,17 @@ JOIN categories as c ON a.mov_fk_categoria=c.id';
        $outputPath='/var/www/html/bubofamily/public/'.$filename;
        rename($inputPath,$outputPath);

-        $collection = (new FastExcel)->import($filename, function ($line){
+        $collection = (new FastExcel)->import($outputPath, function ($line){
            if($line['Data valuta'])
            {
+                list($giorno,$mese,$anno) = explode('/',$line['Data valuta']);
+                $data="$anno-$mese-$giorno";
                self::insEntrata([
+<<<<<<< HEAD
+                    'mov_data'=>$data,
+=======
                    'mov_data'=>self::dateFormat(0,$line['Data valuta']),
+>>>>>>> devel
                    'mov_fk_categoria'=>1,
                    'mov_descrizione'=>$line['Descrizione operazione'],
                    'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['Importo']))))),
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
 	],
 	"license" : "MIT",
 	"require" : {
-		"php": "^7.3|^8.0",
+		"php": "^7.3|^8.0|^8.3",
 		"barryvdh/laravel-dompdf": "^2.0",
 		"creativeorange/gravatar": "^1.0",
 		"directorytree/ldaprecord": "^2.9",
--- a/composer.lock
+++ b/composer.lock
@@ -4,6 +4,20 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
+<<<<<<< HEAD
+    "content-hash": "687cd004c9e85a059f97bef99a50fbef",
+    "packages": [
+        {
+            "name": "asm89/stack-cors",
+            "version": "v2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/asm89/stack-cors.git",
+                "reference": "50f57105bad3d97a43ec4a485eb57daf347eafea"
+            },
+            "dist": {
+                "type": "zip",
+=======
    "content-hash": "c58658999463fa4485159d5f4dde1d96",
    "packages": [
        {
@@ -59,6 +73,7 @@
            },
            "dist": {
                "type": "zip",
+>>>>>>> devel
                "url": "https://api.github.com/repos/asm89/stack-cors/zipball/50f57105bad3d97a43ec4a485eb57daf347eafea",
                "reference": "50f57105bad3d97a43ec4a485eb57daf347eafea",
                "shasum": ""
@@ -161,6 +176,18 @@
        },
        {
            "name": "aws/aws-sdk-php",
+<<<<<<< HEAD
+            "version": "3.306.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/aws/aws-sdk-php.git",
+                "reference": "dc228b55a4224fe3160a0a2ca430b80c5348d943"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/dc228b55a4224fe3160a0a2ca430b80c5348d943",
+                "reference": "dc228b55a4224fe3160a0a2ca430b80c5348d943",
+=======
            "version": "3.308.1",
            "source": {
                "type": "git",
@@ -171,6 +198,7 @@
                "type": "zip",
                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bf5f1221d4c5c67d3213150fb91dfb5ce627227b",
                "reference": "bf5f1221d4c5c67d3213150fb91dfb5ce627227b",
+>>>>>>> devel
                "shasum": ""
            },
            "require": {
@@ -250,6 +278,28 @@
            "support": {
                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                "issues": "https://github.com/aws/aws-sdk-php/issues",
+<<<<<<< HEAD
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.306.0"
+            },
+            "time": "2024-05-06T18:11:49+00:00"
+        },
+        {
+            "name": "barryvdh/laravel-dompdf",
+            "version": "v2.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/barryvdh/laravel-dompdf.git",
+                "reference": "cb37868365f9b937039d316727a1fced1e87b31c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/cb37868365f9b937039d316727a1fced1e87b31c",
+                "reference": "cb37868365f9b937039d316727a1fced1e87b31c",
+                "shasum": ""
+            },
+            "require": {
+                "dompdf/dompdf": "^2.0.3",
+=======
                "source": "https://github.com/aws/aws-sdk-php/tree/3.308.1"
            },
            "time": "2024-05-22T18:05:56+00:00"
@@ -270,6 +320,7 @@
            },
            "require": {
                "dompdf/dompdf": "^2.0.7",
+>>>>>>> devel
                "illuminate/support": "^6|^7|^8|^9|^10|^11",
                "php": "^7.2 || ^8.0"
            },
@@ -317,7 +368,11 @@
            ],
            "support": {
                "issues": "https://github.com/barryvdh/laravel-dompdf/issues",
+<<<<<<< HEAD
+                "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.1.1"
+=======
                "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.2.0"
+>>>>>>> devel
            },
            "funding": [
                {
@@ -329,7 +384,11 @@
                    "type": "github"
                }
            ],
+<<<<<<< HEAD
+            "time": "2024-03-15T12:48:39+00:00"
+=======
            "time": "2024-04-25T13:16:04+00:00"
+>>>>>>> devel
        },
        {
            "name": "box/spout",
@@ -1246,6 +1305,8 @@
                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0"
            },
            "time": "2023-11-17T15:01:25+00:00"
+<<<<<<< HEAD
+=======
        },
        {
            "name": "firebase/php-jwt",
@@ -1309,6 +1370,7 @@
                "source": "https://github.com/firebase/php-jwt/tree/v6.10.1"
            },
            "time": "2024-05-18T18:05:11+00:00"
+>>>>>>> devel
        },
        {
            "name": "fruitcake/laravel-cors",
@@ -1391,6 +1453,17 @@
            "time": "2022-02-23T14:25:13+00:00"
        },
        {
+<<<<<<< HEAD
+            "name": "graham-campbell/result-type",
+            "version": "v1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/GrahamCampbell/Result-Type.git",
+                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
+            },
+            "dist": {
+                "type": "zip",
+=======
            "name": "google/apiclient",
            "version": "v2.16.0",
            "source": {
@@ -1573,6 +1646,7 @@
            },
            "dist": {
                "type": "zip",
+>>>>>>> devel
                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
                "shasum": ""
@@ -1949,6 +2023,8 @@
                }
            ],
            "time": "2023-12-03T20:05:35+00:00"
+<<<<<<< HEAD
+=======
        },
        {
            "name": "jeroennoten/laravel-adminlte",
@@ -2008,6 +2084,7 @@
                "source": "https://github.com/jeroennoten/Laravel-AdminLTE/tree/v3.11.0"
            },
            "time": "2024-03-18T14:42:51+00:00"
+>>>>>>> devel
        },
        {
            "name": "laravel-notification-channels/telegram",
@@ -3830,6 +3907,17 @@
            "time": "2022-01-27T09:35:39+00:00"
        },
        {
+<<<<<<< HEAD
+            "name": "phenx/php-font-lib",
+            "version": "0.5.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dompdf/php-font-lib.git",
+                "reference": "a1681e9793040740a405ac5b189275059e2a9863"
+            },
+            "dist": {
+                "type": "zip",
+=======
            "name": "paragonie/constant_time_encoding",
            "version": "v2.7.0",
            "source": {
@@ -3994,6 +4082,7 @@
            },
            "dist": {
                "type": "zip",
+>>>>>>> devel
                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/a1681e9793040740a405ac5b189275059e2a9863",
                "reference": "a1681e9793040740a405ac5b189275059e2a9863",
                "shasum": ""
@@ -4255,6 +4344,8 @@
            "time": "2023-11-12T21:59:55+00:00"
        },
        {
+<<<<<<< HEAD
+=======
            "name": "phpseclib/phpseclib",
            "version": "3.0.37",
            "source": {
@@ -4414,6 +4505,7 @@
            "time": "2021-02-03T23:26:27+00:00"
        },
        {
+>>>>>>> devel
            "name": "psr/clock",
            "version": "1.0.0",
            "source": {
@@ -9683,6 +9775,18 @@
        },
        {
            "name": "mockery/mockery",
+<<<<<<< HEAD
+            "version": "1.6.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mockery/mockery.git",
+                "reference": "81a161d0b135df89951abd52296adf97deb0723d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d",
+                "reference": "81a161d0b135df89951abd52296adf97deb0723d",
+=======
            "version": "1.6.12",
            "source": {
                "type": "git",
@@ -9693,6 +9797,7 @@
                "type": "zip",
                "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699",
                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699",
+>>>>>>> devel
                "shasum": ""
            },
            "require": {
@@ -9762,7 +9867,11 @@
                "security": "https://github.com/mockery/mockery/security/advisories",
                "source": "https://github.com/mockery/mockery"
            },
+<<<<<<< HEAD
+            "time": "2024-03-21T18:34:15+00:00"
+=======
            "time": "2024-05-16T03:13:13+00:00"
+>>>>>>> devel
        },
        {
            "name": "myclabs/deep-copy",
@@ -11542,7 +11651,7 @@
    "prefer-stable": true,
    "prefer-lowest": false,
    "platform": {
-        "php": "^7.3|^8.0"
+        "php": "^7.3|^8.0|^8.3"
    },
    "platform-dev": [],
    "plugin-api-version": "2.6.0"
--- a/config/imap.php
+++ b/config/imap.php
@@ -0,0 +1,199 @@
+<?php
+/*
+* File:     imap.php
+* Category: config
+* Author:   M. Goldenbaum
+* Created:  24.09.16 22:36
+* Updated:  -
+*
+* Description:
+*  -
+*/
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | IMAP default account
+    |--------------------------------------------------------------------------
+    |
+    | The default account identifier. It will be used as default for any missing account parameters.
+    | If however the default account is missing a parameter the package default will be used.
+    | Set to 'false' [boolean] to disable this functionality.
+    |
+    */
+    'default' => env('IMAP_DEFAULT_ACCOUNT', 'default'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default date format
+    |--------------------------------------------------------------------------
+    |
+    | The default date format is used to convert any given Carbon::class object into a valid date string.
+    | These are currently known working formats: "d-M-Y", "d-M-y", "d M y"
+    |
+    */
+    'date_format' => 'd-M-Y',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Available IMAP accounts
+    |--------------------------------------------------------------------------
+    |
+    | Please list all IMAP accounts which you are planning to use within the
+    | array below.
+    |
+    */
+    'accounts' => [
+
+        'default' => [// account identifier
+            'host'  => env('IMAP_HOST', 'localhost'),
+            'port'  => env('IMAP_PORT', 993),
+            'protocol'  => env('IMAP_PROTOCOL', 'imap'), //might also use imap, [pop3 or nntp (untested)]
+            'encryption'    => env('IMAP_ENCRYPTION', 'ssl'), // Supported: false, 'ssl', 'tls', 'notls', 'starttls'
+            'validate_cert' => env('IMAP_VALIDATE_CERT', true),
+            'username' => env('IMAP_USERNAME', 'root@example.com'),
+            'password' => env('IMAP_PASSWORD', ''),
+            'authentication' => env('IMAP_AUTHENTICATION', null),
+            'proxy' => [
+                'socket' => null,
+                'request_fulluri' => false,
+                'username' => null,
+                'password' => null,
+            ]
+        ],
+
+        /*
+        'gmail' => [ // account identifier
+            'host' => 'imap.gmail.com',
+            'port' => 993,
+            'encryption' => 'ssl',
+            'validate_cert' => true,
+            'username' => 'example@gmail.com',
+            'password' => 'PASSWORD',
+            'authentication' => 'oauth',
+        ],
+
+        'another' => [ // account identifier
+            'host' => '',
+            'port' => 993,
+            'encryption' => false,
+            'validate_cert' => true,
+            'username' => '',
+            'password' => '',
+            'authentication' => null,
+        ]
+        */
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Available IMAP options
+    |--------------------------------------------------------------------------
+    |
+    | Available php imap config parameters are listed below
+    |   -Delimiter (optional):
+    |       This option is only used when calling $oClient->
+    |       You can use any supported char such as ".", "/", (...)
+    |   -Fetch option:
+    |       IMAP::FT_UID  - Message marked as read by fetching the message body
+    |       IMAP::FT_PEEK - Fetch the message without setting the "seen" flag
+    |   -Fetch sequence id:
+    |       IMAP::ST_UID  - Fetch message components using the message uid
+    |       IMAP::ST_MSGN - Fetch message components using the message number
+    |   -Body download option
+    |       Default TRUE
+    |   -Flag download option
+    |       Default TRUE
+    |   -Message key identifier option
+    |       You can choose between 'id', 'number' or 'list'
+    |       'id'     - Use the MessageID as array key (default, might cause hickups with yahoo mail)
+    |       'number' - Use the message number as array key (isn't always unique and can cause some interesting behavior)
+    |       'list'   - Use the message list number as array key (incrementing integer (does not always start at 0 or 1)
+    |       'uid'    - Use the message uid as array key (isn't always unique and can cause some interesting behavior)
+    |   -Fetch order
+    |       'asc'  - Order all messages ascending (probably results in oldest first)
+    |       'desc' - Order all messages descending (probably results in newest first)
+    |   -Disposition types potentially considered an attachment
+    |       Default ['attachment', 'inline']
+    |   -Common folders
+    |       Default folder locations and paths assumed if none is provided
+    |   -Open IMAP options:
+    |       DISABLE_AUTHENTICATOR - Disable authentication properties.
+    |                               Use 'GSSAPI' if you encounter the following
+    |                               error: "Kerberos error: No credentials cache
+    |                               file found (try running kinit) (...)"
+    |                               or ['GSSAPI','PLAIN'] if you are using outlook mail
+    |   -Decoder options (currently only the message subject and attachment name decoder can be set)
+    |       'utf-8' - Uses imap_utf8($string) to decode a string
+    |       'mimeheader' - Uses mb_decode_mimeheader($string) to decode a string
+    |
+    */
+    'options' => [
+        'delimiter' => '/',
+        'fetch' => \Webklex\PHPIMAP\IMAP::FT_PEEK,
+        'sequence' => \Webklex\PHPIMAP\IMAP::ST_MSGN,
+        'fetch_body' => true,
+        'fetch_flags' => true,
+        'message_key' => 'list',
+        'fetch_order' => 'asc',
+        'dispositions' => ['attachment', 'inline'],
+        'common_folders' => [
+            "root" => "INBOX",
+            "junk" => "INBOX/Junk",
+            "draft" => "INBOX/Drafts",
+            "sent" => "INBOX/Sent",
+            "trash" => "INBOX/Trash",
+        ],
+        'open' => [
+            // 'DISABLE_AUTHENTICATOR' => 'GSSAPI'
+        ],
+        'decoder' => [
+            'message' => 'utf-8', // mimeheader
+            'attachment' => 'utf-8' // mimeheader
+        ]
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Available events
+    |--------------------------------------------------------------------------
+    |
+    */
+    'events' => [
+        "message" => [
+            'new' => \Webklex\IMAP\Events\MessageNewEvent::class,
+            'moved' => \Webklex\IMAP\Events\MessageMovedEvent::class,
+            'copied' => \Webklex\IMAP\Events\MessageCopiedEvent::class,
+            'deleted' => \Webklex\IMAP\Events\MessageDeletedEvent::class,
+            'restored' => \Webklex\IMAP\Events\MessageRestoredEvent::class,
+        ],
+        "folder" => [
+            'new' => \Webklex\IMAP\Events\FolderNewEvent::class,
+            'moved' => \Webklex\IMAP\Events\FolderMovedEvent::class,
+            'deleted' => \Webklex\IMAP\Events\FolderDeletedEvent::class,
+        ],
+        "flag" => [
+            'new' => \Webklex\IMAP\Events\FlagNewEvent::class,
+            'deleted' => \Webklex\IMAP\Events\FlagDeletedEvent::class,
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Available masking options
+    |--------------------------------------------------------------------------
+    |
+    | By using your own custom masks you can implement your own methods for
+    | a better and faster access and less code to write.
+    |
+    | Checkout the two examples custom_attachment_mask and custom_message_mask
+    | for a quick start.
+    |
+    | The provided masks below are used as the default masks.
+    */
+    'masks' => [
+        'message' => \Webklex\PHPIMAP\Support\Masks\MessageMask::class,
+        'attachment' => \Webklex\PHPIMAP\Support\Masks\AttachmentMask::class
+    ]
+];
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -1,5 +1,4 @@
@import url(https://fonts.googleapis.com/css?family=Nunito);
-
@charset "UTF-8";
 /*!
 * Bootstrap v5.1.3 (https://getbootstrap.com/)
Author	SHA1	Message	Date
fbarachino	0155be2654	Allineamento devel con Master	2024-05-25 08:56:11 +00:00
fbarachino	a6a64fd39a	messo in .gitignore la cartella storage	2024-05-25 08:46:59 +00:00
Flavio Barachino	0330c1d0da	sistemato import file csv per ING Direct	2024-05-07 18:26:29 +02:00