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 #8504 from turbo124/v5-develop

Browse Source 
v5.5.116
This commit is contained in:
David Bomba 2023-05-08 08:19:43 +10:00 committed by GitHub
commit d5842b49ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.5.115 5.5.116

2
app/PaymentDrivers/PayPalExpressPaymentDriver.php
View File

@ -123,8 +123,6 @@ class PayPalExpressPaymentDriver extends BaseDriver
{ {
$this->initializeOmnipayGateway(); $this->initializeOmnipayGateway();
dd('here');
$response = $this->omnipay_gateway $response = $this->omnipay_gateway
->completePurchase(['amount' => $this->payment_hash->data->amount, 'currency' => $this->client->getCurrencyCode()]) ->completePurchase(['amount' => $this->payment_hash->data->amount, 'currency' => $this->client->getCurrencyCode()])
->send(); ->send();

22
app/Services/Invoice/EInvoice/FacturaEInvoice.php
View File

@ -17,6 +17,7 @@ use App\Services\AbstractService;
use josemmo\Facturae\FacturaeItem; use josemmo\Facturae\FacturaeItem;
use josemmo\Facturae\FacturaeParty; use josemmo\Facturae\FacturaeParty;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use josemmo\Facturae\Common\FacturaeSigner;
class FacturaEInvoice extends AbstractService class FacturaEInvoice extends AbstractService
{ {
@ -129,7 +130,8 @@ class FacturaEInvoice extends AbstractService
->buildSeller() ->buildSeller()
->buildItems() ->buildItems()
->setDiscount() ->setDiscount()
->setPoNumber(); ->setPoNumber()
->signDocument();
$disk = config('filesystems.default'); $disk = config('filesystems.default');
@ -191,19 +193,21 @@ class FacturaEInvoice extends AbstractService
if (strlen($item->tax_name1) > 1) { if (strlen($item->tax_name1) > 1) {
$data[] = [$this->resolveTaxCode($item->tax_name1) => $item->tax_rate1]; $data[$this->resolveTaxCode($item->tax_name1)] = $item->tax_rate1;
} }
if (strlen($item->tax_name2) > 1) { if (strlen($item->tax_name2) > 1) {
$data[] = [$this->resolveTaxCode($item->tax_name2) => $item->tax_rate2];
$data[$this->resolveTaxCode($item->tax_name2)] = $item->tax_rate2;
} }
if (strlen($item->tax_name3) > 1) { if (strlen($item->tax_name3) > 1) {
$data[] = [$this->resolveTaxCode($item->tax_name3) => $item->tax_rate3];
$data[$this->resolveTaxCode($item->tax_name3)] = $item->tax_rate3;
} }
@ -309,4 +313,14 @@ class FacturaEInvoice extends AbstractService
return $this; return $this;
} }
private function signDocument(): self
{
// $ssl_cert = file_get_contents(base_path('e_invoice_cert.p12'));
// $this->fac->sign($ssl_cert, null, "SuperSecrethere");
return $this;
}
} }

4
config/ninja.php
View File

@ -15,8 +15,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' => '5.5.115', 'app_version' => '5.5.116',
'app_tag' => '5.5.115', 'app_tag' => '5.5.116',
'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', ''), 'api_secret' => env('API_SECRET', ''),