Merge pull request #9741 from turbo124/v5-develop

v5.10.6

.github/workflows/react_release.yml

@@ -44,6 +44,7 @@ jobs:
           git clone https://${{secrets.commit_secret}}@github.com/invoiceninja/ui.git
           cd ui
           git checkout develop
+          cp .env.example .env
           cp ../vite.config.ts.react ./vite.config.js
           npm i
           npm run build

VERSION.txt

@@ -1 +1 @@
-5.10.5
+5.10.6

app/Http/Controllers/SelfUpdateController.php

@@ -181,6 +181,9 @@ class SelfUpdateController extends BaseController
 
     public function checkVersion()
     {
+        if(Ninja::isHosted())
+            return '5.10.SaaS';
+
         return trim(file_get_contents(config('ninja.version_url')));
     }
 

app/Http/Requests/Company/UpdateCompanyRequest.php

@@ -15,10 +15,8 @@ use App\Utils\Ninja;
 use App\Http\Requests\Request;
 use App\Utils\Traits\MakesHash;
 use App\DataMapper\CompanySettings;
-use InvoiceNinja\EInvoice\EInvoice;
 use App\Http\ValidationRules\ValidSettingsRule;
-use InvoiceNinja\EInvoice\Models\Peppol\Invoice;
-use App\Http\ValidationRules\EInvoice\ValidScheme;
+use App\Http\ValidationRules\EInvoice\ValidCompanyScheme;
 use App\Http\ValidationRules\Company\ValidSubdomain;
 
 class UpdateCompanyRequest extends Request
@@ -67,7 +65,7 @@ class UpdateCompanyRequest extends Request
         $rules['smtp_local_domain'] = 'sometimes|string|nullable';
         // $rules['smtp_verify_peer'] = 'sometimes|string';
 
-        // $rules['e_invoice'] = ['sometimes','nullable', new ValidScheme()];
+        $rules['e_invoice'] = ['sometimes','nullable', new ValidCompanyScheme()];
 
         if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) {
             $rules['portal_domain'] = 'bail|nullable|sometimes|url';

app/Http/ValidationRules/EInvoice/ValidCompanyScheme.php

@@ -11,6 +11,7 @@
 
 namespace App\Http\ValidationRules\EInvoice;
 
+use App\Services\EDocument\Standards\Validation\Peppol\CompanyLevel;
 use Closure;
 use InvoiceNinja\EInvoice\EInvoice;
 use Illuminate\Validation\Validator;
@@ -19,9 +20,9 @@ use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Contracts\Validation\ValidatorAwareRule;
 
 /**
- * Class BlackListRule.
+ * Class ValidScheme.
  */
-class ValidScheme implements ValidationRule, ValidatorAwareRule
+class ValidCompanyScheme implements ValidationRule, ValidatorAwareRule
 {
  
     /**
@@ -35,7 +36,7 @@ class ValidScheme implements ValidationRule, ValidatorAwareRule
     {
 
         $r = new EInvoice();
-        $errors = $r->validateRequest($value['Invoice'], Invoice::class);
+        $errors = $r->validateRequest($value['Invoice'], CompanyLevel::class);
         
         foreach ($errors as $key => $msg) {
 

app/Repositories/VendorRepository.php

@@ -53,11 +53,7 @@ class VendorRepository extends BaseRepository
 
         $vendor->saveQuietly();
 
-        if ($vendor->number == '' || ! $vendor->number) {
-            $vendor->number = $this->getNextVendorNumber($vendor);
-        }
-
-        $vendor->saveQuietly();
+        $vendor->service()->applyNumber();
         
         if (isset($data['contacts']) || $vendor->contacts()->count() == 0) {
             $this->contact_repo->save($data, $vendor);

app/Services/Client/ClientService.php

@@ -169,7 +169,7 @@ class ClientService
             } catch (QueryException $e) {
                 $x++;
 
-                if ($x > 10) {
+                if ($x > 50) {
                     $this->completed = false;
                 }
             }

app/Services/EDocument/Standards/Validation/Peppol/CompanyLevel.php

@@ -0,0 +1,303 @@
+<?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\Services\EDocument\Standards\Validation\Peppol;
+
+use DateTime;
+use InvoiceNinja\EInvoice\Models\Peppol\AllowanceChargeType\AllowanceCharge;
+use InvoiceNinja\EInvoice\Models\Peppol\BillingReferenceType\BillingReference;
+use InvoiceNinja\EInvoice\Models\Peppol\CodeType\AccountingCostCode;
+use InvoiceNinja\EInvoice\Models\Peppol\CodeType\DocumentCurrencyCode;
+use InvoiceNinja\EInvoice\Models\Peppol\CodeType\InvoiceTypeCode;
+use InvoiceNinja\EInvoice\Models\Peppol\CodeType\PaymentAlternativeCurrencyCode;
+use InvoiceNinja\EInvoice\Models\Peppol\CodeType\PaymentCurrencyCode;
+use InvoiceNinja\EInvoice\Models\Peppol\CodeType\PricingCurrencyCode;
+use InvoiceNinja\EInvoice\Models\Peppol\CodeType\TaxCurrencyCode;
+use InvoiceNinja\EInvoice\Models\Peppol\CustomerPartyType\AccountingCustomerParty;
+use InvoiceNinja\EInvoice\Models\Peppol\CustomerPartyType\BuyerCustomerParty;
+use InvoiceNinja\EInvoice\Models\Peppol\DeliveryTermsType\DeliveryTerms;
+use InvoiceNinja\EInvoice\Models\Peppol\DeliveryType\Delivery;
+use InvoiceNinja\EInvoice\Models\Peppol\DocumentReferenceType\AdditionalDocumentReference;
+use InvoiceNinja\EInvoice\Models\Peppol\DocumentReferenceType\ContractDocumentReference;
+use InvoiceNinja\EInvoice\Models\Peppol\DocumentReferenceType\DespatchDocumentReference;
+use InvoiceNinja\EInvoice\Models\Peppol\DocumentReferenceType\OriginatorDocumentReference;
+use InvoiceNinja\EInvoice\Models\Peppol\DocumentReferenceType\ReceiptDocumentReference;
+use InvoiceNinja\EInvoice\Models\Peppol\DocumentReferenceType\StatementDocumentReference;
+use InvoiceNinja\EInvoice\Models\Peppol\ExchangeRateType\PaymentAlternativeExchangeRate;
+use InvoiceNinja\EInvoice\Models\Peppol\ExchangeRateType\PaymentExchangeRate;
+use InvoiceNinja\EInvoice\Models\Peppol\ExchangeRateType\PricingExchangeRate;
+use InvoiceNinja\EInvoice\Models\Peppol\ExchangeRateType\TaxExchangeRate;
+use InvoiceNinja\EInvoice\Models\Peppol\IdentifierType\CustomizationID;
+use InvoiceNinja\EInvoice\Models\Peppol\IdentifierType\ID;
+use InvoiceNinja\EInvoice\Models\Peppol\IdentifierType\ProfileExecutionID;
+use InvoiceNinja\EInvoice\Models\Peppol\IdentifierType\ProfileID;
+use InvoiceNinja\EInvoice\Models\Peppol\IdentifierType\UBLVersionID;
+use InvoiceNinja\EInvoice\Models\Peppol\IdentifierType\UUID;
+use InvoiceNinja\EInvoice\Models\Peppol\InvoiceLineType\InvoiceLine;
+use InvoiceNinja\EInvoice\Models\Peppol\MonetaryTotalType\LegalMonetaryTotal;
+use InvoiceNinja\EInvoice\Models\Peppol\NumericType\LineCountNumeric;
+use InvoiceNinja\EInvoice\Models\Peppol\OrderReferenceType\OrderReference;
+use InvoiceNinja\EInvoice\Models\Peppol\PartyType\PayeeParty;
+use InvoiceNinja\EInvoice\Models\Peppol\PartyType\TaxRepresentativeParty;
+use InvoiceNinja\EInvoice\Models\Peppol\PaymentMeansType\PaymentMeans;
+use InvoiceNinja\EInvoice\Models\Peppol\PaymentTermsType\PaymentTerms;
+use InvoiceNinja\EInvoice\Models\Peppol\PaymentType\PrepaidPayment;
+use InvoiceNinja\EInvoice\Models\Peppol\PeriodType\InvoicePeriod;
+use InvoiceNinja\EInvoice\Models\Peppol\ProjectReferenceType\ProjectReference;
+use InvoiceNinja\EInvoice\Models\Peppol\SignatureType\Signature;
+use InvoiceNinja\EInvoice\Models\Peppol\SupplierPartyType\AccountingSupplierParty;
+use InvoiceNinja\EInvoice\Models\Peppol\SupplierPartyType\SellerSupplierParty;
+use InvoiceNinja\EInvoice\Models\Peppol\TaxTotalType\TaxTotal;
+use InvoiceNinja\EInvoice\Models\Peppol\TaxTotalType\WithholdingTaxTotal;
+use Symfony\Component\Serializer\Attribute\Context;
+use Symfony\Component\Serializer\Attribute\SerializedName;
+use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
+use Symfony\Component\Validator\Constraints\Date;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\Constraints\NotNull;
+use Symfony\Component\Validator\Constraints\Valid;
+
+class CompanyLevel
+{
+    // /** @var UBLVersionID */
+    // #[SerializedName('cbc:UBLVersionID')]
+    // public $UBLVersionID;
+
+    // /** @var CustomizationID */
+    // #[SerializedName('cbc:CustomizationID')]
+    // public $CustomizationID;
+
+    // /** @var ProfileID */
+    // #[SerializedName('cbc:ProfileID')]
+    // public $ProfileID;
+
+    // /** @var ProfileExecutionID */
+    // #[SerializedName('cbc:ProfileExecutionID')]
+    // public $ProfileExecutionID;
+
+    // /** @var ID */
+    // #[NotNull]
+    // #[NotBlank]
+    // #[Valid]
+    // #[SerializedName('cbc:ID')]
+    // public $ID;
+
+    /** @var bool */
+    #[SerializedName('cbc:CopyIndicator')]
+    public bool $CopyIndicator;
+
+    /** @var UUID */
+    #[SerializedName('cbc:UUID')]
+    public $UUID;
+
+    // /** @var ?\DateTime */
+    // #[NotNull]
+    // #[NotBlank]
+    // #[Valid]
+    // #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
+    // #[SerializedName('cbc:IssueDate')]
+    // public ?DateTime $IssueDate;
+
+    // /** @var ?\DateTime */
+    // #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d\TH:i:s.uP'])]
+    // #[SerializedName('cbc:IssueTime')]
+    // public ?DateTime $IssueTime;
+
+    // /** @var ?\DateTime */
+    // #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
+    // #[SerializedName('cbc:DueDate')]
+    // public ?DateTime $DueDate;
+
+    /** @var InvoiceTypeCode */
+    #[SerializedName('cbc:InvoiceTypeCode')]
+    public $InvoiceTypeCode;
+
+    /** @var string */
+    #[SerializedName('cbc:Note')]
+    public string $Note;
+
+    /** @var ?\DateTime */
+    #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
+    #[SerializedName('cbc:TaxPointDate')]
+    public ?DateTime $TaxPointDate;
+
+    /** @var DocumentCurrencyCode */
+    #[SerializedName('cbc:DocumentCurrencyCode')]
+    public $DocumentCurrencyCode;
+
+    /** @var TaxCurrencyCode */
+    #[SerializedName('cbc:TaxCurrencyCode')]
+    public $TaxCurrencyCode;
+
+    /** @var PricingCurrencyCode */
+    #[SerializedName('cbc:PricingCurrencyCode')]
+    public $PricingCurrencyCode;
+
+    /** @var PaymentCurrencyCode */
+    #[SerializedName('cbc:PaymentCurrencyCode')]
+    public $PaymentCurrencyCode;
+
+    /** @var PaymentAlternativeCurrencyCode */
+    #[SerializedName('cbc:PaymentAlternativeCurrencyCode')]
+    public $PaymentAlternativeCurrencyCode;
+
+    // /** @var AccountingCostCode */
+    // #[SerializedName('cbc:AccountingCostCode')]
+    // public $AccountingCostCode;
+
+    // /** @var string */
+    // #[SerializedName('cbc:AccountingCost')]
+    // public string $AccountingCost;
+
+    // /** @var LineCountNumeric */
+    // #[SerializedName('cbc:LineCountNumeric')]
+    // public $LineCountNumeric;
+
+    // /** @var string */
+    // #[SerializedName('cbc:BuyerReference')]
+    // public string $BuyerReference;
+
+    // /** @var InvoicePeriod[] */
+    // #[SerializedName('cac:InvoicePeriod')]
+    // public array $InvoicePeriod;
+
+    // /** @var OrderReference */
+    // #[SerializedName('cac:OrderReference')]
+    // public $OrderReference;
+
+    // /** @var BillingReference[] */
+    // #[SerializedName('cac:BillingReference')]
+    // public array $BillingReference;
+
+    /** @var DespatchDocumentReference[] */
+    #[SerializedName('cac:DespatchDocumentReference')]
+    public array $DespatchDocumentReference;
+
+    /** @var ReceiptDocumentReference[] */
+    #[SerializedName('cac:ReceiptDocumentReference')]
+    public array $ReceiptDocumentReference;
+
+    /** @var StatementDocumentReference[] */
+    #[SerializedName('cac:StatementDocumentReference')]
+    public array $StatementDocumentReference;
+
+    /** @var OriginatorDocumentReference[] */
+    #[SerializedName('cac:OriginatorDocumentReference')]
+    public array $OriginatorDocumentReference;
+
+    /** @var ContractDocumentReference[] */
+    #[SerializedName('cac:ContractDocumentReference')]
+    public array $ContractDocumentReference;
+
+    /** @var AdditionalDocumentReference[] */
+    #[SerializedName('cac:AdditionalDocumentReference')]
+    public array $AdditionalDocumentReference;
+
+    /** @var ProjectReference[] */
+    #[SerializedName('cac:ProjectReference')]
+    public array $ProjectReference;
+
+    // /** @var Signature[] */
+    // #[SerializedName('cac:Signature')]
+    // public array $Signature;
+
+    // /** @var AccountingSupplierParty */
+    // #[NotNull]
+    // #[NotBlank]
+    // #[Valid]
+    // #[SerializedName('cac:AccountingSupplierParty')]
+    // public $AccountingSupplierParty;
+
+    // /** @var AccountingCustomerParty */
+    // #[NotNull]
+    // #[NotBlank]
+    // #[Valid]
+    // #[SerializedName('cac:AccountingCustomerParty')]
+    // public $AccountingCustomerParty;
+
+    /** @var PayeeParty */
+    #[SerializedName('cac:PayeeParty')]
+    public $PayeeParty;
+
+    // /** @var BuyerCustomerParty */
+    // #[SerializedName('cac:BuyerCustomerParty')]
+    // public $BuyerCustomerParty;
+
+    // /** @var SellerSupplierParty */
+    // #[SerializedName('cac:SellerSupplierParty')]
+    // public $SellerSupplierParty;
+
+    /** @var TaxRepresentativeParty */
+    #[SerializedName('cac:TaxRepresentativeParty')]
+    public $TaxRepresentativeParty;
+
+    /** @var Delivery[] */
+    #[SerializedName('cac:Delivery')]
+    public array $Delivery;
+
+    /** @var DeliveryTerms */
+    #[SerializedName('cac:DeliveryTerms')]
+    public $DeliveryTerms;
+
+    /** @var PaymentMeans[] */
+    #[SerializedName('cac:PaymentMeans')]
+    public array $PaymentMeans;
+
+    /** @var PaymentTerms[] */
+    #[SerializedName('cac:PaymentTerms')]
+    public array $PaymentTerms;
+
+    // /** @var PrepaidPayment[] */
+    // #[SerializedName('cac:PrepaidPayment')]
+    // public array $PrepaidPayment;
+
+    // /** @var AllowanceCharge[] */
+    // #[SerializedName('cac:AllowanceCharge')]
+    // public array $AllowanceCharge;
+
+    // /** @var TaxExchangeRate */
+    // #[SerializedName('cac:TaxExchangeRate')]
+    // public $TaxExchangeRate;
+
+    // /** @var PricingExchangeRate */
+    // #[SerializedName('cac:PricingExchangeRate')]
+    // public $PricingExchangeRate;
+
+    // /** @var PaymentExchangeRate */
+    // #[SerializedName('cac:PaymentExchangeRate')]
+    // public $PaymentExchangeRate;
+
+    // /** @var PaymentAlternativeExchangeRate */
+    // #[SerializedName('cac:PaymentAlternativeExchangeRate')]
+    // public $PaymentAlternativeExchangeRate;
+
+    // /** @var TaxTotal[] */
+    // #[SerializedName('cac:TaxTotal')]
+    // public array $TaxTotal;
+
+    // /** @var WithholdingTaxTotal[] */
+    // #[SerializedName('cac:WithholdingTaxTotal')]
+    // public array $WithholdingTaxTotal;
+
+    // /** @var LegalMonetaryTotal */
+    // #[NotNull]
+    // #[NotBlank]
+    // #[Valid]
+    // #[SerializedName('cac:LegalMonetaryTotal')]
+    // public $LegalMonetaryTotal;
+
+    // /** @var InvoiceLine[] */
+    // #[NotNull]
+    // #[NotBlank]
+    // #[Valid]
+    // #[SerializedName('cac:InvoiceLine')]
+    // public array $InvoiceLine;
+}

app/Services/Vendor/VendorService.php

@@ -12,10 +12,55 @@
 namespace App\Services\Vendor;
 
 use App\Models\Vendor;
+use App\Utils\Traits\GeneratesCounter;
+use Illuminate\Database\QueryException;
 
 class VendorService
 {
+    
+    use GeneratesCounter;
+
+    private bool $completed = true;
+
     public function __construct(public Vendor $vendor)
     {
     }
+
+    public function applyNumber(): self
+    {
+        $x = 1;
+
+        if(isset($this->vendor->number)) {
+            return $this;
+        }
+
+        do {
+            try {
+                $this->vendor->number = $this->getNextVendorNumber($this->vendor);
+                $this->vendor->saveQuietly();
+
+                $this->completed = false;
+            } catch (QueryException $e) {
+                $x++;
+
+                if ($x > 50) {
+                    $this->completed = false;
+                }
+            }
+        } while ($this->completed);
+
+        return $this;
+    }
+
+    /**
+     * Saves the vendor instance
+     *
+     * @return Vendor The Vendor Model
+     */
+    public function save(): Vendor
+    {
+        $this->vendor->saveQuietly();
+
+        return $this->vendor->fresh();
+    }
 }

config/ninja.php

@@ -17,8 +17,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.10.5'),
-    'app_tag' => env('APP_TAG', '5.10.5'),
+    'app_version' => env('APP_VERSION', '5.10.6'),
+    'app_tag' => env('APP_TAG', '5.10.6'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),