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

Adjustments for email quotas

Browse Source
This commit is contained in:
David Bomba 2024-03-17 16:04:44 +11:00
parent 80b944f822
commit 2757fae1f2
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Export/CSV/BaseExport.php
View File

@ -294,6 +294,7 @@ class BaseExport
'line_total' => 'item.line_total',
'gross_line_total' => 'item.gross_line_total',
'tax_amount' => 'item.tax_amount',
'product_cost' => 'item.product_cost'
];
protected array $quote_report_keys = [

6
app/Models/Account.php
View File

@ -102,7 +102,7 @@ class Account extends BaseModel
private $free_plan_email_quota = 20;
private $paid_plan_email_quota = 400;
private $paid_plan_email_quota = 300;
/**
* @var string
@ -504,10 +504,10 @@ class Account extends BaseModel
if ($this->isPaid()) {
$limit = $this->paid_plan_email_quota;
$limit += Carbon::createFromTimestamp($this->created_at)->diffInMonths() * 50;
$limit += Carbon::createFromTimestamp($this->created_at)->diffInMonths() * 30;
} else {
$limit = $this->free_plan_email_quota;
$limit += Carbon::createFromTimestamp($this->created_at)->diffInMonths() * 2;
$limit += Carbon::createFromTimestamp($this->created_at)->diffInMonths() * 1.5;
}
return min($limit, 1000);

1
lang/en/texts.php
View File

@ -5258,6 +5258,7 @@ $lang = array(
'csv_rows_length' => 'No data found in this CSV file',
'accept_payments_online' => 'Accept Payments Online',
'all_payment_gateways' => 'View all payment gateways',
'product_cost' => 'Product cost',
);
return $lang;

10
lang/fr_CA/texts.php
View File

@ -460,7 +460,7 @@ $lang = array(
'edit_token' => 'Éditer le jeton',
'delete_token' => 'Supprimer le jeton',
'token' => 'Jeton',
'add_gateway' => 'Add Payment Gateway',
'add_gateway' => 'Ajouter une passerelle de paiement',
'delete_gateway' => 'Supprimer la passerelle',
'edit_gateway' => 'Éditer la passerelle',
'updated_gateway' => 'La passerelle a été mise à jour',
@ -5248,9 +5248,11 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
'payment_type_help' => 'Définit le <b>type de paiement manuel<b/> par défaut.',
'quote_valid_until_help' => 'Le nombre de jours pour lesquels la soumission est valide',
'expense_payment_type_help' => 'Le type de paiement de dépenses par défaut à utiliser',
'paylater' => 'Pay in 4',
'payment_provider' => 'Payment Provider',
'paylater' => 'Payer en 4',
'payment_provider' => 'Fournisseur de paiement',
'select_email_provider' => 'Définir le courriel pour l\'envoi',
'purchase_order_items' => 'Articles du bon d\'achat',
'csv_rows_length' => 'Aucune donnée dans ce fichier CSV',
);
return $lang;