mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Merge pull request #7999 from LarsK1/patch-1
Translate Stripe payment texts
This commit is contained in:
commit
9da661cf66
@ -36,6 +36,7 @@ use Stripe\Exception\CardException;
|
|||||||
use Stripe\Exception\InvalidRequestException;
|
use Stripe\Exception\InvalidRequestException;
|
||||||
use Stripe\Exception\RateLimitException;
|
use Stripe\Exception\RateLimitException;
|
||||||
use Stripe\PaymentIntent;
|
use Stripe\PaymentIntent;
|
||||||
|
use App\Utils\Number;
|
||||||
|
|
||||||
class ACH
|
class ACH
|
||||||
{
|
{
|
||||||
@ -172,9 +173,9 @@ class ACH
|
|||||||
->first();
|
->first();
|
||||||
|
|
||||||
if ($invoice) {
|
if ($invoice) {
|
||||||
$description = "Invoice {$invoice->number} for {$amount} for client {$this->stripe->client->present()->name()}";
|
$description = ctrans('text.stripe_paymenttext', ['invoicenumber' => $invoice->number, 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
|
||||||
} else {
|
} else {
|
||||||
$description = "Payment with no invoice for amount {$amount} for client {$this->stripe->client->present()->name()}";
|
$description = ctrans('text.stripe_paymenttext_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -210,9 +211,9 @@ class ACH
|
|||||||
->first();
|
->first();
|
||||||
|
|
||||||
if ($invoice) {
|
if ($invoice) {
|
||||||
$description = "Invoice {$invoice->number} for {$amount} for client {$this->stripe->client->present()->name()}";
|
$description = ctrans('text.stripe_paymenttext', ['invoicenumber' => $invoice->number, 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
|
||||||
} else {
|
} else {
|
||||||
$description = "Payment with no invoice for amount {$amount} for client {$this->stripe->client->present()->name()}";
|
$description = ctrans('text.stripe_paymenttext_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (substr($cgt->token, 0, 2) === 'pm') {
|
if (substr($cgt->token, 0, 2) === 'pm') {
|
||||||
@ -454,9 +455,9 @@ class ACH
|
|||||||
->first();
|
->first();
|
||||||
|
|
||||||
if ($invoice) {
|
if ($invoice) {
|
||||||
$description = "Invoice {$invoice->number} for {$amount} for client {$this->stripe->client->present()->name()}";
|
$description = ctrans('text.stripe_paymenttext', ['invoicenumber' => $invoice->number, 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
|
||||||
} else {
|
} else {
|
||||||
$description = "Payment with no invoice for amount {$amount} for client {$this->stripe->client->present()->name()}";
|
$description = ctrans('text.stripe_paymenttext_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (substr($source->token, 0, 2) === 'pm') {
|
if (substr($source->token, 0, 2) === 'pm') {
|
||||||
|
@ -32,6 +32,7 @@ use Stripe\Exception\CardException;
|
|||||||
use Stripe\Exception\InvalidRequestException;
|
use Stripe\Exception\InvalidRequestException;
|
||||||
use Stripe\Exception\RateLimitException;
|
use Stripe\Exception\RateLimitException;
|
||||||
use Stripe\StripeClient;
|
use Stripe\StripeClient;
|
||||||
|
use App\Utils\Number;
|
||||||
|
|
||||||
class Charge
|
class Charge
|
||||||
{
|
{
|
||||||
@ -62,9 +63,9 @@ class Charge
|
|||||||
$invoice = Invoice::whereIn('id', $this->transformKeys(array_column($payment_hash->invoices(), 'invoice_id')))->withTrashed()->first();
|
$invoice = Invoice::whereIn('id', $this->transformKeys(array_column($payment_hash->invoices(), 'invoice_id')))->withTrashed()->first();
|
||||||
|
|
||||||
if ($invoice) {
|
if ($invoice) {
|
||||||
$description = "Invoice {$invoice->number} for {$amount} for client {$this->stripe->client->present()->name()}";
|
$description = ctrans('text.stripe_paymenttext', ['invoicenumber' => $invoice->number, 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
|
||||||
} else {
|
} else {
|
||||||
$description = "Payment with no invoice for amount {$amount} for client {$this->stripe->client->present()->name()}";
|
$description = ctrans('text.stripe_paymenttext_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->stripe->init();
|
$this->stripe->init();
|
||||||
|
@ -23,6 +23,7 @@ use App\PaymentDrivers\StripePaymentDriver;
|
|||||||
use App\PaymentDrivers\Stripe\Jobs\UpdateCustomer;
|
use App\PaymentDrivers\Stripe\Jobs\UpdateCustomer;
|
||||||
use Stripe\PaymentIntent;
|
use Stripe\PaymentIntent;
|
||||||
use Stripe\PaymentMethod;
|
use Stripe\PaymentMethod;
|
||||||
|
use App\Utils\Number;
|
||||||
|
|
||||||
class CreditCard
|
class CreditCard
|
||||||
{
|
{
|
||||||
@ -62,7 +63,7 @@ class CreditCard
|
|||||||
|
|
||||||
// $description = $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')) . " for client {$this->stripe->client->present()->name()}";
|
// $description = $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')) . " for client {$this->stripe->client->present()->name()}";
|
||||||
$invoice_numbers = collect($data['invoices'])->pluck('invoice_number')->implode(',');
|
$invoice_numbers = collect($data['invoices'])->pluck('invoice_number')->implode(',');
|
||||||
$description = "Invoices: {$invoice_numbers} for {$data['total']['amount_with_fee']} for client {$this->stripe->client->present()->name()}";
|
$description = ctrans('text.stripe_paymenttext', ['invoicenumber' => $invoice_numbers, 'amount' => Number::formatMoney($data['total']['amount_with_fee'], $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
|
||||||
|
|
||||||
$payment_intent_data = [
|
$payment_intent_data = [
|
||||||
'amount' => $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
|
'amount' => $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
|
||||||
|
@ -254,6 +254,8 @@ $LANG = array(
|
|||||||
'notification_invoice_paid' => 'A payment of :amount was made by client :client towards Invoice :invoice.',
|
'notification_invoice_paid' => 'A payment of :amount was made by client :client towards Invoice :invoice.',
|
||||||
'notification_invoice_sent' => 'The following client :client was emailed Invoice :invoice for :amount.',
|
'notification_invoice_sent' => 'The following client :client was emailed Invoice :invoice for :amount.',
|
||||||
'notification_invoice_viewed' => 'The following client :client viewed Invoice :invoice for :amount.',
|
'notification_invoice_viewed' => 'The following client :client viewed Invoice :invoice for :amount.',
|
||||||
|
'stripe_paymenttext' => 'Invoice :invoicenumber for :amount for client :client',
|
||||||
|
'stripe_paymenttext_without_invoice' => 'Payment with no invoice for amount :amount for client :client',
|
||||||
'reset_password' => 'You can reset your account password by clicking the following button:',
|
'reset_password' => 'You can reset your account password by clicking the following button:',
|
||||||
'secure_payment' => 'Secure Payment',
|
'secure_payment' => 'Secure Payment',
|
||||||
'card_number' => 'Card Number',
|
'card_number' => 'Card Number',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user