Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-09 04:44:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8268 from turbo124/v5-develop

Browse Source 
Fixes for translation string in subscriptions
This commit is contained in:
David Bomba 2023-02-09 09:24:10 +11:00 committed by GitHub
commit 150c341eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/PaymentDrivers/PayTrace/CreditCard.php
View File

@ -87,6 +87,9 @@ class CreditCard
return $this->paytrace->processUnsuccessfulTransaction($data); return $this->paytrace->processUnsuccessfulTransaction($data);
} }
nlog("paytrace response createCustomer");
nlog($response);
$cgt = []; $cgt = [];
$cgt['token'] = $response->customer_id; $cgt['token'] = $response->customer_id;
$cgt['payment_method_id'] = GatewayType::CREDIT_CARD; $cgt['payment_method_id'] = GatewayType::CREDIT_CARD;

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

@ -54,7 +54,7 @@ class PurchaseOrderService
if (! $this->purchase_order->design_id) if (! $this->purchase_order->design_id)
$this->purchase_order->design_id = $this->decodePrimaryKey($settings->purchase_order_design_id); $this->purchase_order->design_id = $this->decodePrimaryKey($settings->purchase_order_design_id);
if (!isset($this->invoice->footer) || empty($this->invoice->footer)) if (!isset($this->purchase_order->footer) || empty($this->purchase_order->footer))
$this->purchase_order->footer = $settings->purchase_order_footer; $this->purchase_order->footer = $settings->purchase_order_footer;
if (!isset($this->purchase_order->terms) || empty($this->purchase_order->terms)) if (!isset($this->purchase_order->terms) || empty($this->purchase_order->terms))

2
resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
View File

@ -209,7 +209,7 @@
@if($steps['passwordless_login_sent']) @if($steps['passwordless_login_sent'])
<span <span
class="block mt-2 text-sm text-green-600">{{ ctrans('texts.email_sent') }}</span> class="block mt-2 text-sm text-green-600">{!! ctrans('texts.sent') !!}</span>
@endif @endif
@endif @endif