diff --git a/VERSION.txt b/VERSION.txt index bdde6d7a8c85..879aebbd77dd 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.6.25 \ No newline at end of file +5.6.26 \ No newline at end of file diff --git a/app/Services/Invoice/EInvoice/FacturaEInvoice.php b/app/Services/Invoice/EInvoice/FacturaEInvoice.php index aebebd103e14..7d109e21a618 100644 --- a/app/Services/Invoice/EInvoice/FacturaEInvoice.php +++ b/app/Services/Invoice/EInvoice/FacturaEInvoice.php @@ -483,7 +483,7 @@ class FacturaEInvoice extends AbstractService "website" => substr($company->settings->website, 0, 50), "contactPeople" => substr($company->owner()->present()->name(), 0, 40), "firstName" => $company->owner()->present()->firstName(), - "lastName" => $company->owner()->present()->lastName(); + "lastName" => $company->owner()->present()->lastName(), // 'centres' => $this->setFace(), // "cnoCnae" => "04647", // Clasif. Nacional de Act. Económicas // "ineTownCode" => "280796" // Cód. de municipio del INE diff --git a/app/Services/Invoice/EInvoice/ZugferdEInvoice.php b/app/Services/Invoice/EInvoice/ZugferdEInvoice.php index 687f8431e80f..e40d3ed6dbc4 100644 --- a/app/Services/Invoice/EInvoice/ZugferdEInvoice.php +++ b/app/Services/Invoice/EInvoice/ZugferdEInvoice.php @@ -91,6 +91,7 @@ class ZugferdEInvoice extends AbstractService //Create line items and calculate taxes foreach ($this->invoice->line_items as $index => $item) { + /** @var \App\DataMapper\InvoiceItem $item **/ $xrechnung->addNewPosition($index) ->setDocumentPositionGrossPrice($item->gross_line_total) ->setDocumentPositionNetPrice($item->line_total); diff --git a/app/Utils/Traits/MakesReminders.php b/app/Utils/Traits/MakesReminders.php index 06560db29e38..2447d2c1f316 100644 --- a/app/Utils/Traits/MakesReminders.php +++ b/app/Utils/Traits/MakesReminders.php @@ -16,18 +16,18 @@ use Illuminate\Support\Carbon; /** * Class MakesReminders. + * */ trait MakesReminders { /** - * * @param string $schedule_reminder * @param string $num_days_reminder * @return ?bool */ public function inReminderWindow($schedule_reminder, $num_days_reminder) { - + /** @var \App\Models\Invoice | \App\Models\Quote | \App\Models\RecurringInvoice | \App\Models\Credit $this **/ $offset = $this->client->timezone_offset(); switch ($schedule_reminder) { @@ -44,7 +44,9 @@ trait MakesReminders public function calculateTemplate(string $entity_string): string { - //if invoice is currently a draft, or being marked as sent, this will be the initial email + + /** @var \App\Models\Invoice | \App\Models\Quote | \App\Models\RecurringInvoice | \App\Models\Credit $this **/ + $client = $this->client; if ($entity_string != 'invoice') { diff --git a/config/ninja.php b/config/ninja.php index 22c1ef96e80b..e50a4db22031 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,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.6.25'), - 'app_tag' => env('APP_TAG','5.6.25'), + 'app_version' => env('APP_VERSION','5.6.26'), + 'app_tag' => env('APP_TAG','5.6.26'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),