mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-08 20:22:42 +01:00
Fixes for Paypal and E-Invoice signatures
This commit is contained in:
parent
ee8391d651
commit
63e733961f
@ -1 +1 @@
|
||||
5.5.115
|
||||
5.5.116
|
@ -123,8 +123,6 @@ class PayPalExpressPaymentDriver extends BaseDriver
|
||||
{
|
||||
$this->initializeOmnipayGateway();
|
||||
|
||||
dd('here');
|
||||
|
||||
$response = $this->omnipay_gateway
|
||||
->completePurchase(['amount' => $this->payment_hash->data->amount, 'currency' => $this->client->getCurrencyCode()])
|
||||
->send();
|
||||
|
@ -17,6 +17,7 @@ use App\Services\AbstractService;
|
||||
use josemmo\Facturae\FacturaeItem;
|
||||
use josemmo\Facturae\FacturaeParty;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use josemmo\Facturae\Common\FacturaeSigner;
|
||||
|
||||
class FacturaEInvoice extends AbstractService
|
||||
{
|
||||
@ -129,7 +130,8 @@ class FacturaEInvoice extends AbstractService
|
||||
->buildSeller()
|
||||
->buildItems()
|
||||
->setDiscount()
|
||||
->setPoNumber();
|
||||
->setPoNumber()
|
||||
->signDocument();
|
||||
|
||||
|
||||
$disk = config('filesystems.default');
|
||||
@ -180,7 +182,7 @@ class FacturaEInvoice extends AbstractService
|
||||
]));
|
||||
|
||||
}
|
||||
|
||||
|
||||
return $this;
|
||||
|
||||
}
|
||||
@ -191,22 +193,24 @@ class FacturaEInvoice extends AbstractService
|
||||
|
||||
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) {
|
||||
|
||||
$data[] = [$this->resolveTaxCode($item->tax_name2) => $item->tax_rate2];
|
||||
|
||||
$data[$this->resolveTaxCode($item->tax_name2)] = $item->tax_rate2;
|
||||
|
||||
}
|
||||
|
||||
if (strlen($item->tax_name3) > 1) {
|
||||
|
||||
$data[] = [$this->resolveTaxCode($item->tax_name3) => $item->tax_rate3];
|
||||
|
||||
$data[$this->resolveTaxCode($item->tax_name3)] = $item->tax_rate3;
|
||||
|
||||
}
|
||||
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
@ -309,4 +313,14 @@ class FacturaEInvoice extends AbstractService
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -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' => '5.5.115',
|
||||
'app_tag' => '5.5.115',
|
||||
'app_version' => '5.5.116',
|
||||
'app_tag' => '5.5.116',
|
||||
'minimum_client_version' => '5.0.16',
|
||||
'terms_version' => '1.0.1',
|
||||
'api_secret' => env('API_SECRET', ''),
|
||||
|
Loading…
Reference in New Issue
Block a user