Minor fixes

2024-11-10 05:02:36 +01:00 · 2023-07-13 10:59:10 +10:00 · 2023-07-13 10:59:10 +10:00 · 484d090fae
commit 484d090fae
parent 348b925947
12 changed files with 32 additions and 65 deletions
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@ -55,6 +55,10 @@ class InvoiceFilters extends QueryFilters
        $this->builder->where(function ($query) use ($status_parameters) {
            $invoice_filters = [];

+            if (in_array('draft', $status_parameters)) {
+                $invoice_filters[] = Invoice::STATUS_DRAFT;
+            }
+
            if (in_array('paid', $status_parameters)) {
                $invoice_filters[] = Invoice::STATUS_PAID;
            }
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@ -91,47 +91,7 @@ class ActivityController extends BaseController
                                ->orderBy('created_at', 'DESC')
                                ->company()
                                ->take($default_activities);
-
-        // if ($request->has('react')) {
-
-        //     /** @var \App\Models\User auth()->user() */
-        //     $user = auth()->user();
-
-        //     if (!$user->isAdmin()) {
-        //         $activities->where('user_id', auth()->user()->id);
-        //     }
-
-        //     $system = ctrans('texts.system');
-
-        //     $data = $activities->cursor()->map(function ($activity) {
-
-        //         $arr =
-        //         [
-        //             'client' => $activity->client ? $activity->client : '',
-        //             'contact' => $activity->client ? $activity->contact : '',
-        //             'quote' => $activity->quote ? $activity->quote : '',
-        //             'user' => $activity->user ? $activity->user : '',
-        //             'expense' => $activity->expense ? $activity->expense : '',
-        //             'invoice' => $activity->invoice ? $activity->invoice : '',
-        //             'recurring_invoice' => $activity->recurring_invoice ? $activity->recurring_invoice : '',
-        //             'payment' => $activity->payment ? $activity->payment : '',
-        //             'credit' => $activity->credit ? $activity->credit : '',
-        //             'task' => $activity->task ? $activity->task : '',
-        //             'vendor' => $activity->vendor ? $activity->vendor : '',
-        //             'purchase_order' => $activity->purchase_order ? $activity->purchase_order : '',
-        //             'subscription' => $activity->subscription ? $activity->subscription : '',
-        //             'vendor_contact' => $activity->vendor_contact ? $activity->vendor_contact : '',
-        //             'recurring_expense' => $activity->recurring_expense ? $activity->recurring_expense : '',
-        //         ];
-                
-        //         $activity_array = $activity->toArray();
-
-        //         return array_merge($arr, $activity_array);
-        //     });
-
-        //     return response()->json(['data' => $data->toArray()], 200);
-        // }
-        // else
+                                
        if($request->has('reactv2')) {

            /** @var \App\Models\User auth()->user() */
--- a/app/Utils/Ninja.php
+++ b/app/Utils/Ninja.php
@ -132,7 +132,7 @@ class Ninja
            'ip' => $ip,
            'token' => request()->header('X-API-TOKEN'),
            'is_system' => app()->runningInConsole(),
-            'user_id' => $user_id,
+            'user_id' => ($ip == '127.0.0.1') ? null : $user_id,
        ];
    }

--- a/lang/cs/texts.php
+++ b/lang/cs/texts.php
@ -753,7 +753,7 @@ $LANG = array(
    'activity_7' => 'Klient :contact zobrazil fakturu :invoice pro :client',
    'activity_8' => ':user archivoval fakturu :invoice',
    'activity_9' => ':user smazal fakturu :invoice',
-    'activity_10' => ':contact entered payment :payment for :payment_amount on invoice :invoice for :client',
+    'activity_10' => ':user entered payment :payment for :payment_amount on invoice :invoice for :client',
    'activity_11' => ':user změnil platbu :payment',
    'activity_12' => ':user archivoval platbu :payment',
    'activity_13' => ':user smazal platbu :payment',
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@ -5122,7 +5122,7 @@ $LANG = array(
    'lang_French - Swiss' => 'French - Swiss',
    'currency_swazi_lilangeni' => 'Swazi Lilangeni',
    'income' => 'Income',
-    
+    'amount_received_help' => 'Enter a value here if the total amount received was MORE than the invoice amount, or when recording a payment with no invoices. Otherwise this field should be left blank.',  
 );


--- a/lang/en_GB/texts.php
+++ b/lang/en_GB/texts.php
@ -761,7 +761,7 @@ $LANG = array(
    'activity_7' => ':contact viewed invoice :invoice for :client',
    'activity_8' => ':user archived invoice :invoice',
    'activity_9' => ':user deleted invoice :invoice',
-    'activity_10' => ':contact entered payment :payment for :payment_amount on invoice :invoice for :client',
+    'activity_10' => ':user entered payment :payment for :payment_amount on invoice :invoice for :client',
    'activity_11' => ':user updated payment :payment',
    'activity_12' => ':user archived payment :payment',
    'activity_13' => ':user deleted payment :payment',
--- a/lang/fr_CA/texts.php
+++ b/lang/fr_CA/texts.php
@ -748,7 +748,7 @@ $LANG = array(
    'activity_7' => ':contact a visualisé la facture :invoice pour :client',
    'activity_8' => ':user a archivé la facture :invoice',
    'activity_9' => ':user a supprimé la facture :invoice',
-    'activity_10' => ':contact a saisi le paiement :payment de :payment_amount de la facture :invoice pour :client',
+    'activity_10' => ':user a saisi le paiement :payment de :payment_amount de la facture :invoice pour :client',
    'activity_11' => ':user a mis à jour le paiement :payment',
    'activity_12' => ':user a archivé le paiement :payment',
    'activity_13' => ':user a supprimé le paiement :payment',
@ -1433,7 +1433,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
    'payment_type_Swish' => 'Swish',
    'payment_type_Alipay' => 'Alipay',
    'payment_type_Sofort' => 'Sofort',
-    'payment_type_SEPA' => 'SEPA Prélèvement automatique',
+    'payment_type_SEPA' => 'Prélèvement automatique SEPA',
    'payment_type_Bitcoin' => 'Bitcoin',
    'payment_type_GoCardless' => 'GoCardless',
    'payment_type_Zelle' => 'Zelle',
@ -2448,7 +2448,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette

    'alipay' => 'Alipay',
    'sofort' => 'Sofort',
-    'sepa' => 'SEPA Prélèvement automatique',
+    'sepa' => 'Prélèvement automatique SEPA',
    'name_without_special_characters' => 'Veuillez entrer un nom en utilisant seulement les lettres de a à z et des espaces.',
    'enable_alipay' => 'Accepter Alipay',
    'enable_sofort' => 'Accepter les transferts d\'institutions bancaires de l\'Union européenne',
@ -3130,7 +3130,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
    'number_padding' => 'Disposition du numéro',
    'general' => 'Général',
    'surcharge_field' => 'Champ Surcharge',
-    'company_value' => 'Valeur de compagnie',
+    'company_value' => 'Valeur de l\'entreprise',
    'credit_field' => 'Champ Crédit',
    'payment_field' => 'Champ Paiement',
    'group_field' => 'Champ Groupe',
@ -3510,7 +3510,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
    'search_expenses' => 'Recherche de dépenses',
    'search_payments' => 'Recherche de paiements',
    'search_groups' => 'Recherche de groupes',
-    'search_company' => 'Recherche d\'entreprises',
+    'search_company' => 'Recherche d\'une entreprise',
    'cancelled_invoice' => 'La facture a été annulée',
    'cancelled_invoices' => 'Les factures ont été annulées',
    'reversed_invoice' => 'La facture a été inversée',
@ -3972,8 +3972,8 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'account_balance' => 'Solde de compte',
     'thanks' => 'Merci',
     'minimum_required_payment' => 'Le paiement minimum requis est :amount',
-     'under_payments_disabled' => 'La société ne tolère pas le sous-paiement.',
-     'over_payments_disabled' => 'La société ne tolère pas le sur-paiement.',
+     'under_payments_disabled' => 'L\'entreprise ne tolère pas le sous-paiement.',
+     'over_payments_disabled' => 'L\'entreprise ne tolère pas le sur-paiement.',
     'saved_at' => 'Enregistré à :time',
     'credit_payment' => 'Le crédit a été appliqué à la facture :invoice_number',
     'credit_subject' => 'Nouveau crédit :credit de :account',
@ -4109,7 +4109,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'migration_api_secret_notice' => 'Vous pouvez trouver API_SECRET dans le fichier .env ou Invoice Ninja v5. Si la propriété est manquante, laissez le champ vide.',
     'billing_coupon_notice' => 'Votre rabais sera appliqué au moment de régler votre facture.',
     'use_last_email' => 'Utiliser le dernier e-mail',
-     'activate_company' => 'Activer la société',
+     'activate_company' => 'Activer l\'entreprise',
     'activate_company_help' => 'Activez les courriels, les factures récurrentes et les notifications',
     'an_error_occurred_try_again' => 'Une erreur s\'est produite, veuillez réessayer',
     'please_first_set_a_password' => 'Veuillez d\'abord définir un mot de passe',
@ -4242,9 +4242,9 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
    'giropay_law' => 'En saisissant vos information de client (tel que votre nom et numéro de compte), vous (le client) agréez à donner cette information volontairement.',
    'klarna' => 'Klarna',
    'eps' => 'EPS',
-    'becs' => 'BECS Prélèvement automatique',
-    'bacs' => 'Débit direct BACS',
-    'payment_type_BACS' => 'Débit direct BACS',
+    'becs' => 'Prélèvement automatique BECS',
+    'bacs' => 'Prélèvement automatique BACS',
+    'payment_type_BACS' => 'Prélèvement automatique BACS',
    'missing_payment_method' => 'Veuillez ajouter une méthode de paiement avant de payer.',
    'becs_mandate' => 'En fournissant vos coordonnées bancaires, vous acceptez <a class="underline" href="https://stripe.com/au-becs-dd-service-agreement/legal">l\'entente de service de requête de débit direct</a>, et autorisez Stripe Payments Australia Pty Ltd ACN 160 180 343 Direct Debit User ID number 507156 (“Stripe”) à prélever votre compte par le Bulk Electronic Clearing System (BECS) de la part du :company (“Merchant”) pour tout montant séparément communiqué à vous par le Marchand. Vous certifiez que vous êtes propriétaire du compte ou que vous êtes un signataire autorisé sur le compte indiqué plus haut.',
    'you_need_to_accept_the_terms_before_proceeding' => 'Vous devez accepter les conditions pour continuer.',
@ -4257,12 +4257,12 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
    'browser_pay' => 'Google Pay, Apple Pay et Microsoft Pay',
    'no_available_methods' => 'Cartes de crédit introuvable sur cet appareil. <a href="https://invoiceninja.github.io/docs/payments#apple-pay-google-pay-microsoft-pay" target="_blank" class="underline">Plus d\'information.</a>',
    'gocardless_mandate_not_ready' => 'La demande de paiement n\'est pas prête. Veuillez essayer de nouveau plus tard.',
-    'payment_type_instant_bank_pay' => 'Interac',
+    'payment_type_instant_bank_pay' => 'Instant Bank Pay',
    'payment_type_iDEAL' => 'iDEAL',
    'payment_type_Przelewy24' => 'Przelewy24',
    'payment_type_Mollie Bank Transfer' => 'Virement bancaire Mollie',
    'payment_type_KBC/CBC' => 'KBC/CBC',
-    'payment_type_Instant Bank Pay' => 'Interac',
+    'payment_type_Instant Bank Pay' => 'Instant Bank Pay',
    'payment_type_Hosted Page' => 'Page hébergée',
    'payment_type_GiroPay' => 'GiroPay',
    'payment_type_EPS' => 'EPS',
@ -4279,7 +4279,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
    'show_pdf_preview_help' => 'Afficher l\'aperçu PDF lors de la rédaction des factures',
    'print_pdf' => 'Imprimer le PDF',
    'remind_me' => 'Rappel',
-    'instant_bank_pay' => 'Interac',
+    'instant_bank_pay' => 'Instant Bank Pay',
    'click_selected' => 'Cliquer sur la sélection',
    'hide_preview' => 'Cacher l\'aperçu',
    'edit_record' => 'Modifier l\'enregistrement',
@ -5111,7 +5111,10 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
    'admin_initiated_payments_help' => 'Permet la saisie d\'un paiement dans le portal d\'administration sans facture',
    'paid_date' => 'Date de paiement',
    'downloaded_entities' => 'Un courriel sera envoyé avec le ou les PDF',
-
+    'lang_French - Swiss' => 'Français - Suisse',
+    'currency_swazi_lilangeni' => 'Lilangeni Eswatinien',
+    'income' => 'Revenu',
+    
 );


--- a/lang/ja/texts.php
+++ b/lang/ja/texts.php
@ -753,7 +753,7 @@ $LANG = array(
    'activity_7' => ':contact が :client の請求書 :invoice を閲覧しました',
    'activity_8' => ':user は 請求書 :invoice をアーカイブしました。',
    'activity_9' => ':user は 請求書 :invoice をアーカイブしました。',
-    'activity_10' => ':contact は、:client の請求書 :invoice に :payment_amount の支払い :payment を入力しました',
+    'activity_10' => ':user は、:client の請求書 :invoice に :payment_amount の支払い :payment を入力しました',
    'activity_11' => ':user updated payment :payment',
    'activity_12' => ':user archived payment :payment',
    'activity_13' => ':user deleted payment :payment',
--- a/lang/lt/texts.php
+++ b/lang/lt/texts.php
@ -754,7 +754,7 @@ $LANG = array(
    'activity_7' => ':contact viewed invoice :invoice for :client',
    'activity_8' => ':user archived invoice :invoice',
    'activity_9' => ':user deleted invoice :invoice',
-    'activity_10' => ':contact entered payment :payment for :payment_amount on invoice :invoice for :client',
+    'activity_10' => ':user entered payment :payment for :payment_amount on invoice :invoice for :client',
    'activity_11' => ':user atnaujino mokėjimą :payment',
    'activity_12' => ':user archived payment :payment',
    'activity_13' => ':user deleted payment :payment',
--- a/lang/nb_NO/texts.php
+++ b/lang/nb_NO/texts.php
@ -754,7 +754,7 @@ $LANG = array(
    'activity_7' => ':contact har sett fakturaen :invoice for :client',
    'activity_8' => ':user arkiverte faktura :invoice',
    'activity_9' => ':user slettet faktura :invoice',
-    'activity_10' => ':contact la inn betaling :payment på :payment_amount',
+    'activity_10' => ':user la inn betaling :payment på :payment_amount',
    'activity_11' => ':user oppdaterte betaling :payment',
    'activity_12' => ':user arkiverte betaling :payment',
    'activity_13' => ':user slettet betaling :payment',
--- a/lang/sq/texts.php
+++ b/lang/sq/texts.php
@ -751,7 +751,7 @@ $LANG = array(
    'activity_7' => ':contact viewed invoice :invoice for :client',
    'activity_8' => ':user ka arkivuar faturën :invoice',
    'activity_9' => ':user ka fshirë faturën :invoice',
-    'activity_10' => ':contact entered payment :payment for :payment_amount on invoice :invoice for :client',
+    'activity_10' => ':user entered payment :payment for :payment_amount on invoice :invoice for :client',
    'activity_11' => ':user ka perditesuar pagesën :payment',
    'activity_12' => ':user ka arkivuar pagesën :payment',
    'activity_13' => ':user ka fshirë pagesën :payment',
--- a/lang/tr_TR/texts.php
+++ b/lang/tr_TR/texts.php
@ -753,7 +753,7 @@ adresine gönderildi. Müthiş tüm özelliklerin kilidini açmak için lütfen
    'activity_7' => ':contact viewed invoice :invoice for :client',
    'activity_8' => ':user :invoice nolu faturayı arşivledi',
    'activity_9' => ':user :invoice nolu faturayı sildi',
-    'activity_10' => ':contact entered payment :payment for :payment_amount on invoice :invoice for :client',
+    'activity_10' => ':user entered payment :payment for :payment_amount on invoice :invoice for :client',
    'activity_11' => ':user :payment tutarlı ödemeyi güncelledi',
    'activity_12' => ':user :payment tutarlı ödemeyi arşivledi',
    'activity_13' => ':user :payment tutarlı ödemeyi sildi',