Merge pull request #9464 from turbo124/v5-develop

v5.8.49
invoiceninja · Apr 16, 2024 · e18665d · e18665d
2 parents 013454f + fb28d9a
commit e18665d
Show file tree

Hide file tree

Showing 40 changed files with 751 additions and 167 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-5.8.48
+5.8.49
diff --git a/app/DataMapper/EDoc/FatturaPA.php b/app/DataMapper/EDoc/FatturaPA.php
@@ -13,11 +13,25 @@
 
 use Spatie\LaravelData\Data;
 
+use Spatie\LaravelData\Optional;
+use App\DataMapper\EDoc\FatturaPA\DatiContratto;
+use App\DataMapper\EDoc\FatturaPA\DatiRicezione;
+use App\DataMapper\EDoc\FatturaPA\DatiOrdineAcquisto;
+use App\DataMapper\EDoc\FatturaPA\DatiAnagraficiVettore;
+
 class FatturaPA extends Data
 {
-    public string $RegimeFiscale = 'RF01';
-    public string $TipoDocumento = 'TD01';
-    public string $ModalitaPagamento = 'MP01';
-    public string $CondizioniPagamento = 'TP02';
+    public DatiRicezione|Optional $DatiRicezione;
+    public DatiContratto|Optional $DatiContratto;
+    public DatiOrdineAcquisto|Optional $DatiOrdineAcquisto;
+    public DatiAnagraficiVettore|Optional $DatiAnagraficiVettore;
+
+    public function __construct(
+        public string $RegimeFiscale = 'RF01',
+        public string $TipoDocumento = 'TD01',
+        public string $ModalitaPagamento = 'MP01',
+        public string $CondizioniPagamento = 'TP02',
+    ) {
+    }
 
 }
diff --git a/app/DataMapper/EDoc/FatturaPA/DatiAnagraficiVettore.php b/app/DataMapper/EDoc/FatturaPA/DatiAnagraficiVettore.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\EDoc\FatturaPA;
+
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Attributes\WithTransformer;
+use Spatie\LaravelData\Transformers\DateTimeInterfaceTransformer;
+
+class DatiAnagraficiVettore extends Data
+{
+
+    public function __construct(
+        public string $IdFiscaleIVA = '',
+        public string $CodiceFiscale = '',
+        public string $Anagrafica = '',
+        #[WithTransformer(DateTimeInterfaceTransformer::class, format: 'Y-m-d\TH:i:s.uP')]
+        public \DateTime $DataOraConsegna = new \DateTime(),
+    ){}
+}
diff --git a/app/DataMapper/EDoc/FatturaPA/DatiContratto.php b/app/DataMapper/EDoc/FatturaPA/DatiContratto.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\EDoc\FatturaPA;
+
+use Spatie\LaravelData\Data;
+
+class DatiContratto extends Data
+{
+    public function __construct(
+        public string $RiferimentoNumeroLinea = '',
+        public string $IdDocumento = '',
+        public string $Data = '',
+        public string $NumItem = '',
+        public string $CodiceCommessaConvenzione = '',
+        public string $CodiceCUP = '',
+        public string $CodiceCIG = '',
+    ) {
+    }
+}
diff --git a/app/DataMapper/EDoc/FatturaPA/DatiOrdineAcquisto.php b/app/DataMapper/EDoc/FatturaPA/DatiOrdineAcquisto.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\EDoc\FatturaPA;
+
+use Spatie\LaravelData\Data;
+
+class DatiOrdineAcquisto extends Data
+{
+    public function __construct(
+        public string $RiferimentoNumeroLinea = '',
+        public string $IdDocumento = '',
+        public string $Data = '',
+        public string $NumItem = '',
+        public string $CodiceCommessaConvenzione = '',
+        public string $CodiceCUP = '',
+        public string $CodiceCIG = '',
+    ) {
+    }
+}
diff --git a/app/DataMapper/EDoc/FatturaPA/DatiRicezione.php b/app/DataMapper/EDoc/FatturaPA/DatiRicezione.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\EDoc\FatturaPA;
+
+use Spatie\LaravelData\Data;
+
+class DatiRicezione extends Data
+{
+    public function __construct(
+        public string $RiferimentoNumeroLinea = '',
+        public string $IdDocumento = '',
+        public string $Data = '',
+        public string $NumItem = '',
+        public string $CodiceCommessaConvenzione = '',
+        public string $CodiceCUP = '',
+        public string $CodiceCIG = '',
+    ) {
+    }
+}
diff --git a/app/DataMapper/EDocSettings.php b/app/DataMapper/EDocSettings.php
@@ -26,48 +26,4 @@ public function createFatturaPA(): FatturaPA
         return $this->FatturaPA ??= new FatturaPA();
     }
 
-}
-
-
-
-class DatiAnagraficiVettore extends Data{
-
-    public string $IdFiscaleIVA = '';
-    public string $CodiceFiscale = '';
-    public string $Anagrafica = '';
-}
-
-class DatiTrasporto extends Data{
-    public string $DataOraConsegna = ''; //datetime in this format 2017-01-10T16:46:12.000+02:00
-    //public DatiAnagraficiVettore
-}
-
-class DatiOrdineAcquisto extends Data{
-    public string $RiferimentoNumeroLinea = '';
-    public string $IdDocumento = '';
-    public string $Data = '';
-    public string $NumItem = '';
-    public string $CodiceCommessaConvenzione = '';
-    public string $CodiceCUP = '';
-    public string $CodiceCIG = '';
-}
-
-class DatiContratto extends Data{
-    public string $RiferimentoNumeroLinea = '';
-    public string $IdDocumento = '';
-    public string $Data = '';
-    public string $NumItem = '';
-    public string $CodiceCommessaConvenzione = '';
-    public string $CodiceCUP = '';
-    public string $CodiceCIG = '';
-}
-
-class DatiRicezione extends Data{
-    public string $RiferimentoNumeroLinea = '';
-    public string $IdDocumento = '';
-    public string $Data = '';
-    public string $NumItem = '';
-    public string $CodiceCommessaConvenzione = '';
-    public string $CodiceCUP = '';
-    public string $CodiceCIG = '';
 }
diff --git a/app/DataMapper/Tax/DE/Rule.php b/app/DataMapper/Tax/DE/Rule.php
@@ -235,17 +235,17 @@ public function calculateRates(): self
         } elseif(in_array($this->client_subregion, $this->eu_country_codes) && !$this->client->vat_number) { //eu country / no valid vat
             if(($this->client->company->tax_data->seller_subregion != $this->client_subregion) && $this->client->company->tax_data->regions->EU->has_sales_above_threshold) {
                 // nlog("eu zone with sales above threshold");
-                $this->tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->country->iso_3166_2}->tax_rate;
-                $this->reduced_tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->country->iso_3166_2}->reduced_tax_rate;
+                $this->tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->country->iso_3166_2}->tax_rate ?? 0;
+                $this->reduced_tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->country->iso_3166_2}->reduced_tax_rate ?? 0;
             } else {
                 // nlog("EU with intra-community supply ie DE to DE");
-                $this->tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->tax_rate;
-                $this->reduced_tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->reduced_tax_rate;
+                $this->tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->tax_rate ?? 0;
+                $this->reduced_tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->reduced_tax_rate ?? 0;
             }
         } else {
             // nlog("default tax");
-            $this->tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->tax_rate;
-            $this->reduced_tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->reduced_tax_rate;
+            $this->tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->tax_rate ?? 0;
+            $this->reduced_tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->reduced_tax_rate ?? 0;
         }
 
         return $this;

diff --git a/app/DataProviders/EDocRules.php b/app/DataProviders/EDocRules.php
@@ -0,0 +1,103 @@
+<?php
+/**
+* Invoice Ninja (https://invoiceninja.com).
+*
+* @link https://github.com/invoiceninja/invoiceninja source repository
+*
+* @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+*
+* @license https://www.elastic.co/licensing/elastic-license
+*/
+
+namespace App\DataProviders;
+
+class EDocRules
+{
+    // [
+    //     "key" => "",
+    //     "label" => "",
+    //     "type" => "dropdown/date/string/text",
+    //     "resource" => "resource.json",
+    //     "required" => true,
+    // ]
+    public function rules() 
+    {
+
+        return [
+            'FatturaPA' => $this->FatturaPADefaults(),
+        ];
+
+    }
+
+
+    private function FatturaPADefaults()
+    {
+        return [
+            [
+                "key" => "RegimeFiscale",
+                "label" => "Regime Fiscale",
+                "type" => "dropdown",
+                "resource" => "RegimeFiscale.json",
+                "required" => true,
+            ],
+            [
+                "key" => "TipoDocumento",
+                "label" => "Tipo Documento",
+                "type" => "dropdown",
+                "resource" => "TipoDocumento.json",
+                "required" => true,
+            ],
+            [
+                "key" => "ModalitaPagamento",
+                "label" => "Modalita Pagamento",
+                "type" => "dropdown",
+                "resource" => "ModalitaPagamento.json",
+                "required" => true,
+            ],
+            [
+                "key" => "CondizioniPagamento",
+                "label" => "Condizioni Pagamento",
+                "type" => "dropdown",
+                "resource" => "CondizioniPagamento.json",
+                "required" => true,
+            ],
+            [
+                "key" => "DatiRicezione",
+                "label" => "Dati Ricezione",
+                "type" => "dropdown",
+                "resource" => "CondizioniPagamento",
+                "required" => false,
+                "children" => [],
+            ],
+            [
+                "key" => "DatiContratto",
+                "label" => "Dati Contratto",
+                "type" => "object",
+                "resource" => "DatiContratto",
+                "required" => false,
+                "children" => [
+                    [
+                        "key"=> "RiferimentoNumeroLinea",
+                        "validation" => [
+                            "string","min:1","max:10","required" 
+                        ],
+                    ]
+                ],
+            ],
+            [
+                "key" => "DatiOrdineAcquisto",
+                "label" => "Dati Ordine Acquisto",
+                "type" => "object",
+                "resource" => "DatiOrdineAcquisto",
+                "required" => false,
+            ],
+            [
+                "key" => "DatiAnagraficiVettore",
+                "label" => "Dati Anagrafici Vettore",
+                "type" => "object",
+                "resource" => "DatiAnagraficiVettore",
+                "required" => false,
+            ],
+        ];
+    }
+}
diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -207,7 +207,6 @@ private function makePayment(array $ids)
 
         //format data
         $invoices->map(function ($invoice) {
-            // $invoice->service()->removeUnpaidGatewayFees();
             $invoice->balance = $invoice->balance > 0 ? Number::formatValue($invoice->balance, $invoice->client->currency()) : 0;
             $invoice->partial = $invoice->partial > 0 ? Number::formatValue($invoice->partial, $invoice->client->currency()) : 0;
 

diff --git a/app/Http/Controllers/TwilioController.php b/app/Http/Controllers/TwilioController.php
@@ -144,7 +144,6 @@ public function confirm(ConfirmSmsRequest $request)
     public function generate2faResetCode(Generate2faRequest $request)
     {
         nlog($request->all());
-        nlog($request->headers());
 
         $user = User::where('email', $request->email)->first();
 

diff --git a/app/Http/Requests/BankTransactionRule/StoreBankTransactionRuleRequest.php b/app/Http/Requests/BankTransactionRule/StoreBankTransactionRuleRequest.php
@@ -27,12 +27,18 @@ class StoreBankTransactionRuleRequest extends Request
      */
     public function authorize(): bool
     {
-        return auth()->user()->can('create', BankTransactionRule::class) && auth()->user()->account->hasFeature(Account::FEATURE_API);
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
+        return $user->can('create', BankTransactionRule::class) && $user->account->hasFeature(Account::FEATURE_API);
         ;
     }
 
     public function rules()
     {
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
         /* Ensure we have a client name, and that all emails are unique*/
         $rules = [
             'name' => 'bail|required|string',
@@ -45,18 +51,9 @@ public function rules()
             'applies_to' => 'bail|sometimes|string',
         ];
 
-        if (isset($this->category_id)) {
-            $rules['category_id'] = 'bail|sometimes|exists:expense_categories,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
-        }
-
-        if (isset($this->vendor_id)) {
-            $rules['vendor_id'] = 'bail|sometimes|exists:vendors,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
-        }
-
-        if (isset($this->client_id)) {
-            $rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
-        }
-
+        $rules['category_id'] = 'bail|sometimes|exists:expense_categories,id,company_id,'.$user->company()->id.',is_deleted,0';
+        $rules['vendor_id'] = 'bail|sometimes|exists:vendors,id,company_id,'.$user->company()->id.',is_deleted,0';
+        $rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.$user->company()->id.',is_deleted,0';
 
         return $rules;
     }

diff --git a/app/Http/Requests/Credit/StoreCreditRequest.php b/app/Http/Requests/Credit/StoreCreditRequest.php
@@ -94,6 +94,10 @@ public function prepareForValidation()
             $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
         }
 
+        if(isset($input['partial']) && $input['partial'] == 0) {
+            $input['partial_due_date'] = null;
+        }
+
         $input = $this->decodePrimaryKeys($input);
 
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];