Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9435 from turbo124/v5-develop

Browse Source 
v5.8.43
This commit is contained in:
David Bomba 2024-04-05 08:43:05 +11:00 committed by GitHub
commit 1441380c70
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.8.42 5.8.43

5
app/Services/Credit/CreditService.php
View File

@ -43,6 +43,11 @@ class CreditService
return (new CreateEDocument($this->credit))->handle(); return (new CreateEDocument($this->credit))->handle();
} }
public function getEDocument($contact = null)
{
return $this->getECredit($contact);
}
/** /**
* Applies the invoice number. * Applies the invoice number.
* @return $this InvoiceService object * @return $this InvoiceService object

4
app/Services/Email/EmailDefaults.php
View File

@ -320,8 +320,8 @@ class EmailDefaults
} }
} }
/** E-Invoice xml file */ /** E-Invoice xml file */
if ($this->email->email_object->settings->enable_e_invoice && ! $this->email->email_object->entity instanceof PurchaseOrder) { if ($this->email->email_object->settings->enable_e_invoice) {
$xml_string = $this->email->email_object->entity->service()->getEInvoice(); $xml_string = $this->email->email_object->entity->service()->getEDocument();
if($xml_string) { if($xml_string) {
$this->email->email_object->attachments = array_merge($this->email->email_object->attachments, [['file' => base64_encode($xml_string), 'name' => explode(".", $this->email->email_object->entity->getFileName('xml'))[0]."-e_invoice.xml"]]); $this->email->email_object->attachments = array_merge($this->email->email_object->attachments, [['file' => base64_encode($xml_string), 'name' => explode(".", $this->email->email_object->entity->getFileName('xml'))[0]."-e_invoice.xml"]]);

5
app/Services/Invoice/InvoiceService.php
View File

@ -204,6 +204,11 @@ class InvoiceService
return (new CreateEDocument($this->invoice))->handle(); return (new CreateEDocument($this->invoice))->handle();
} }
public function getEDocument($contact = null)
{
return $this->getEInvoice($contact);
}
public function sendEmail($contact = null) public function sendEmail($contact = null)
{ {
$send_email = new SendEmail($this->invoice, null, $contact); $send_email = new SendEmail($this->invoice, null, $contact);

5
app/Services/PurchaseOrder/PurchaseOrderService.php
View File

@ -82,6 +82,11 @@ class PurchaseOrderService
{ {
return (new CreateEDocument($this->purchase_order))->handle(); return (new CreateEDocument($this->purchase_order))->handle();
} }
public function getEDocument($contact = null)
{
return $this->getEPurchaseOrder($contact);
}
public function deleteEPurchaseOrder() public function deleteEPurchaseOrder()
{ {
$this->purchase_order->load('invitations'); $this->purchase_order->load('invitations');

5
app/Services/Quote/QuoteService.php
View File

@ -78,6 +78,11 @@ class QuoteService
return (new CreateEDocument($this->quote))->handle(); return (new CreateEDocument($this->quote))->handle();
} }
public function getEDocument($contact = null)
{
return $this->getEQuote($contact);
}
public function sendEmail($contact = null): self public function sendEmail($contact = null): self
{ {
$send_email = new SendEmail($this->quote, null, $contact); $send_email = new SendEmail($this->quote, null, $contact);

5
config/ninja.php
View File

@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.8.42'), 'app_version' => env('APP_VERSION', '5.8.43'),
'app_tag' => env('APP_TAG', '5.8.42'), 'app_tag' => env('APP_TAG', '5.8.43'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),
@ -101,7 +101,6 @@ return [
'wepay' => env('WEPAY_KEYS', ''), 'wepay' => env('WEPAY_KEYS', ''),
'braintree' => env('BRAINTREE_KEYS', ''), 'braintree' => env('BRAINTREE_KEYS', ''),
'mollie' => env('MOLLIE_KEYS', ''), 'mollie' => env('MOLLIE_KEYS', ''),
'square' => env('SQUARE_KEYS', ''),
], ],
'contact' => [ 'contact' => [
'email' => env('MAIL_FROM_ADDRESS'), 'email' => env('MAIL_FROM_ADDRESS'),

32
resources/views/react/index.blade.php
View File

@ -1 +1,31 @@
<?php include public_path('react/index.html'); <!DOCTYPE html>
<html data-report-errors="{{ $report_errors }}" data-rc="{{ $rc }}" data-user-agent="{{ $user_agent }}" data-login="{{ $login }}">
<head>
<!-- Source: https://github.com/invoiceninja/invoiceninja -->
<!-- Version: {{ config('ninja.app_version') }} -->
<meta charset="UTF-8">
<title>{{ config('ninja.app_name') }}</title>
<meta name="google-signin-client_id" content="{{ config('services.google.client_id') }}">
@include('react.head')
</head>
<body class="h-full">
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
</body>
<!--
If you are reading this, there is a fair change that the react application has not loaded for you. There are a couple of solutions:
1. Download the release file from https://github.com/invoiceninja/invoiceninja and overwrite your current installation.
2. Switch back to the Flutter application by editing the database, you can do this with the following SQL
UPDATE accounts SET
set_react_as_default_ap = 0;
-->
</html>