diff --git a/VERSION.txt b/VERSION.txt index 3d325733355f..fcd2fd579853 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.7.28 \ No newline at end of file +5.7.29 \ No newline at end of file diff --git a/app/Services/Invoice/EInvoice/FacturaEInvoice.php b/app/Services/Invoice/EInvoice/FacturaEInvoice.php index a11c6cc03226..4ec4ca779e65 100644 --- a/app/Services/Invoice/EInvoice/FacturaEInvoice.php +++ b/app/Services/Invoice/EInvoice/FacturaEInvoice.php @@ -468,7 +468,7 @@ class FacturaEInvoice extends AbstractService { $company = $this->invoice->company; - if($company->getSetting('classification')) + if($company->getSetting('classification') == 'individual') return $this->setIndividualSeller(); $seller = new FacturaeParty([ @@ -512,7 +512,7 @@ class FacturaEInvoice extends AbstractService $seller = new FacturaeParty([ "isLegalEntity" => false, "taxNumber" => $company->settings->vat_number, - "name" => $company->getSetting('classification') === 'individual' ? substr($company->owner()->present()->name(), 0, 40) : substr($company->present()->name(), 0, 40), + // "name" => $company->getSetting('classification') === 'individual' ? substr($company->owner()->present()->name(), 0, 40) : substr($company->present()->name(), 0, 40), "address" => substr($company->settings->address1, 0, 80), "postCode" => substr($this->invoice->client->postal_code, 0, 5), "town" => substr($company->settings->city, 0, 50), @@ -529,7 +529,8 @@ class FacturaEInvoice extends AbstractService "fax" => "", "website" => substr($company->settings->website, 0, 50), // "contactPeople" => substr($company->owner()->present()->name(), 0, 40), - "firstSurname" => $company->owner()->present()->firstName(), + "name" => $company->owner()->present()->firstName(), + // "firstSurname" => $company->owner()->present()->firstName(), "lastSurname" => $company->owner()->present()->lastName(), ]); diff --git a/config/ninja.php b/config/ninja.php index b9c170a48bf9..5c38ee2e3562 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.7.28'), - 'app_tag' => env('APP_TAG','5.7.28'), + 'app_version' => env('APP_VERSION','5.7.29'), + 'app_tag' => env('APP_TAG','5.7.29'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),