From 2757fae1f2db10cedc368a31379c37d9b55f93c9 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 17 Mar 2024 16:04:44 +1100 Subject: [PATCH] Adjustments for email quotas --- app/Export/CSV/BaseExport.php | 1 + app/Models/Account.php | 6 +++--- lang/en/texts.php | 1 + lang/fr_CA/texts.php | 10 ++++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php index 37e904d154c6..da0ca9a0d147 100644 --- a/app/Export/CSV/BaseExport.php +++ b/app/Export/CSV/BaseExport.php @@ -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 = [ diff --git a/app/Models/Account.php b/app/Models/Account.php index 382eec8692ee..2a6b60717b63 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -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); diff --git a/lang/en/texts.php b/lang/en/texts.php index 7628afa05b1e..bb56e8675177 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -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; diff --git a/lang/fr_CA/texts.php b/lang/fr_CA/texts.php index 9faef9cfe54c..b69b5fca52d9 100644 --- a/lang/fr_CA/texts.php +++ b/lang/fr_CA/texts.php @@ -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 type de paiement manuel 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;