Fixes for requests in schedules

app/Http/Requests/Client/UpdateClientRequest.php

@@ -143,8 +143,8 @@ class UpdateClientRequest extends Request
      * down to the free plan setting properties which
      * are saveable
      *
-     * @param  object $settings
+     * @param  \stdClass $settings
-     * @return stdClass $settings
+     * @return \stdClass $settings
      */
     private function filterSaveableSettings($settings)
     {

app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php

@@ -81,7 +81,7 @@ class UpdateRecurringQuoteRequest extends Request
      * off / optin / optout will reset the status of this field to off to allow
      * the client to choose whether to auto_bill or not.
      *
-     * @param enum $auto_bill off/always/optin/optout
+     * @param string $auto_bill off/always/optin/optout
      *
      * @return bool
      */

app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php

@@ -60,6 +60,7 @@ class StoreSchedulerRequest extends Request
             $this->merge(['next_run_client' => $input['next_run']]);
         }
         
-        return $input;
+        $this->replace($input);
+
     }
 }

app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php

@@ -57,6 +57,6 @@ class UpdateSchedulerRequest extends Request
             $this->merge(['next_run_client' => $input['next_run']]);
         }
         
-        return $input;
+        $this->replace($input);
     }
 }

lang/ca/texts.php

@@ -20,17 +20,17 @@ $LANG = array(
     'additional_info' => 'Informació adicional',
     'payment_terms' => 'Condicions de pagament',
     'currency_id' => 'Moneda',
-    'size_id' => 'Tamany de l\'empresa',
+    'size_id' => 'Mida de l\'empresa',
-    'industry_id' => 'Industria',
+    'industry_id' => 'Sector industrial',
     'private_notes' => 'Notes privades',
     'invoice' => 'Factura',
     'client' => 'Client',
     'invoice_date' => 'Data factura',
     'due_date' => 'Data venciment',
     'invoice_number' => 'Número de factura',
-    'invoice_number_short' => 'Factura #',
+    'invoice_number_short' => 'Núm. factura',
     'po_number' => 'Apartat de correus',
-    'po_number_short' => 'Apartat de correus #',
+    'po_number_short' => 'Núm apt correus',
     'frequency_id' => 'Quant sovint',
     'discount' => 'Descompte',
     'taxes' => 'Impostos',
@@ -44,7 +44,7 @@ $LANG = array(
     'net_subtotal' => 'Net',
     'paid_to_date' => 'Pagat',
     'balance_due' => 'Pendent',
-    'invoice_design_id' => 'Diseny',
+    'invoice_design_id' => 'Disseny',
     'terms' => 'Condicions',
     'your_invoice' => 'La teva factura',
     'remove_contact' => 'Esborra contacte',
@@ -54,22 +54,22 @@ $LANG = array(
     'enable' => 'Activa',
     'learn_more' => 'Aprèn més',
     'manage_rates' => 'Administrar tarifes',
-    'note_to_client' => 'Nota al client',
+    'note_to_client' => 'Nota per al client',
-    'invoice_terms' => 'Condicions factura',
+    'invoice_terms' => 'Condicions de la factura',
     'save_as_default_terms' => 'Guarda com a condicions per defecte',
     'download_pdf' => 'Descarrega PDF',
     'pay_now' => 'Paga ara',
     'save_invoice' => 'Guarda factura',
-    'clone_invoice' => 'Clonar a fatura',
+    'clone_invoice' => 'Clona a fatura',
-    'archive_invoice' => 'Arxivar factura',
+    'archive_invoice' => 'Arxiva factura',
     'delete_invoice' => 'Suprimex factura',
-    'email_invoice' => 'Enviar factura per correu electrónic',
+    'email_invoice' => 'Envia factura per correu electrònic',
-    'enter_payment' => 'Introduir pagament',
+    'enter_payment' => 'Introdueix pagament',
     'tax_rates' => 'Impostos',
     'rate' => 'Preu',
     'settings' => 'Paràmetres',
-    'enable_invoice_tax' => 'Activar especificar <b>impost</b>',
+    'enable_invoice_tax' => 'Activa especificar <b>impost</b>',
-    'enable_line_item_tax' => 'Activar especificar <b>impost per línea</b>',
+    'enable_line_item_tax' => 'Activa especificar <b>impost per línea</b>',
     'dashboard' => 'Tauler de control',
     'dashboard_totals_in_all_currencies_help' => 'Nota: afegiu un :link anomenat ":name" per mostrar els totals utilitzant una moneda base única.',
     'clients' => 'Clients',
@@ -83,28 +83,33 @@ $LANG = array(
     'company_details' => 'Detalls de l\'empresa',
     'online_payments' => 'Pagaments en línia',
     'notifications' => 'Notificacions',
-    'import_export' => 'Importar | Exportar',
+    'import_export' => 'Importació | Exportació',
     'done' => 'Fet',
     'save' => 'Desa',
-    'create' => 'Crear',
+    'create' => 'Crea',
-    'upload' => 'Penjar',
+    'upload' => 'Penja',
-    'import' => 'Importar',
+    'import' => 'Importa',
-    'download' => 'Baixar',
+    'download' => 'Baixa',
-    'cancel' => 'Cancel·lar',
+    'cancel' => 'Cancel·la',
-    'close' => 'Tancar',
+    'close' => 'Tanca',
     'provide_email' => 'Si us plau, indica una adreça de correu electrònic vàlida',
     'powered_by' => 'Funciona amb',
-    'no_items' => 'No hi ha conceptes',
+    'no_items' => 'No hi ha cap element',
     'recurring_invoices' => 'Factures recurrents',
     'recurring_help' => '<p>Envieu automàticament als clients les mateixes factures setmanalment, bimensuals, mensuals, trimestrals o anuals.</p> 
-<p>Utilitzeu: MONTH,: TRIMESTRE o: YEAR per a dates dinàmiques. Les funcions matemàtiques bàsiques també funcionen, per exemple: MES-1 </p>
+<p>Utilitzeu :MONTH, :QUARTER o :YEAR per a dates dinàmiques. Les funcions matemàtiques bàsiques també funcionen, per exemple: :MONTH-1 </p>
-',
+<p>Exemples de variables dinàmiques de factures:</p>
+<ul>
+<li>"Quota gimnàs pel mes de :MONTH" >> "Quota gimnàs pel mes de juliol"</li>
+<li>"Subscripció anual :YEAR+1" >> "Subscripció anual 2015"</li>
+<li>"Pagament consultor del :QUARTER+1" >> "Pagament consultor del Q2"</li>
+</ul>',
     'recurring_quotes' => 'Pressupostos recurrents',
     'in_total_revenue' => 'en ingressos totals',
     'billed_client' => 'client facturat',
     'billed_clients' => 'clients facturats',
-    'active_client' => 'Client actiu',
+    'active_client' => 'client actiu',
-    'active_clients' => 'Clients actius',
+    'active_clients' => 'clients actius',
     'invoices_past_due' => 'Factures vençudes',
     'upcoming_invoices' => 'Properes factures',
     'average_invoice' => 'Mitjana de facturació',
@@ -2407,7 +2412,7 @@ $LANG = array(
     'currency_vanuatu_vatu' => 'Vanuatu Vatu',
 
     'currency_cuban_peso' => 'Cuban Peso',
-    'currency_bz_dollar' => 'BZ Dollar',
+    'currency_bz_dollar' => 'Dòlar BZ',
 
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider :link we\'d greatly appreciate it!',
     'writing_a_review' => 'escriu una ressenya',
@@ -4007,6 +4012,7 @@ $LANG = array(
      'notification_invoice_reminder1_sent_subject' => 'Reminder 1 for Invoice :invoice was sent to :client',
      'notification_invoice_reminder2_sent_subject' => 'Reminder 2 for Invoice :invoice was sent to :client',
      'notification_invoice_reminder3_sent_subject' => 'Reminder 3 for Invoice :invoice was sent to :client',
+     'notification_invoice_custom_sent_subject' => 'Custom reminder for Invoice :invoice was sent to :client',
      'notification_invoice_reminder_endless_sent_subject' => 'Endless reminder for Invoice :invoice was sent to :client',
      'assigned_user' => 'Assigned User',
      'setup_steps_notice' => 'To proceed to next step, make sure you test each section.',
@@ -4255,9 +4261,9 @@ $LANG = array(
     'klarna' => 'Klarna',
     'eps' => 'EPS',
     'becs' => 'BECS Direct Debit',
-    'bacs' => 'BACS Direct Debit',
+    'bacs' => 'Dèbit directe BACS',
-    'payment_type_BACS' => 'BACS Direct Debit',
+    'payment_type_BACS' => 'Dèbit directe BACS',
-    'missing_payment_method' => 'Please add a payment method first, before trying to pay.',
+    'missing_payment_method' => 'Introduïu un sistema de pagament primer, abans d\'intentar pagar.',
     'becs_mandate' => 'By providing your bank account details, you agree to this <a class="underline" href="https://stripe.com/au-becs-dd-service-agreement/legal">Direct Debit Request and the Direct Debit Request service agreement</a>, and authorise Stripe Payments Australia Pty Ltd ACN 160 180 343 Direct Debit User ID number 507156 (“Stripe”) to debit your account through the Bulk Electronic Clearing System (BECS) on behalf of :company (the “Merchant”) for any amounts separately communicated to you by the Merchant. You certify that you are either an account holder or an authorised signatory on the account listed above.',
     'you_need_to_accept_the_terms_before_proceeding' => 'You need to accept the terms before proceeding.',
     'direct_debit' => 'Direct Debit',
@@ -4384,7 +4390,7 @@ $LANG = array(
     'imported_customers' => 'Successfully started importing customers',
     'login_success' => 'Successful Login',
     'login_failure' => 'Failed Login',
-    'exported_data' => 'Once the file is ready you\'ll receive an email with a download link',
+    'exported_data' => 'Quan l\'arxiu estigui llest rebreu un missatge de correu amb l\'enllaç de descàrrega',
     'include_deleted_clients' => 'Include Deleted Clients',
     'include_deleted_clients_help' => 'Load records belonging to deleted clients',
     'step_1_sign_in' => 'Step 1: Sign In',
@@ -4473,7 +4479,7 @@ $LANG = array(
     'activity_123' => ':user deleted recurring expense :recurring_expense',
     'activity_124' => ':user restored recurring expense :recurring_expense',
     'fpx' => "FPX",
-    'to_view_entity_set_password' => 'To view the :entity you need to set a password.',
+    'to_view_entity_set_password' => 'Per a veure :entity haureu d\'establir una contrasenya.',
     'unsubscribe' => 'Unsubscribe',
     'unsubscribed' => 'Unsubscribed',
     'unsubscribed_text' => 'You have been removed from notifications for this document',
@@ -4571,7 +4577,7 @@ $LANG = array(
     'purchase_order_number' => 'Purchase Order Number',
     'purchase_order_number_short' => 'Purchase Order #',
     'inventory_notification_subject' => 'Inventory threshold notification for product: :product',
-    'inventory_notification_body' => 'Threshold of :amount has been reached for product: :product',
+    'inventory_notification_body' => 'S\'ha arribat al límit de :amount per al producte :product ',
     'activity_130' => ':user created purchase order :purchase_order',
     'activity_131' => ':user updated purchase order :purchase_order',
     'activity_132' => ':user archived purchase order :purchase_order',
@@ -4603,7 +4609,7 @@ $LANG = array(
     'vendor_document_upload' => 'Vendor Document Upload',
     'vendor_document_upload_help' => 'Enable vendors to upload documents',
     'are_you_enjoying_the_app' => 'Are you enjoying the app?',
-    'yes_its_great' => 'Yes, it\'s great!',
+    'yes_its_great' => 'Sí, genial!',
     'not_so_much' => 'Not so much',
     'would_you_rate_it' => 'Great to hear! Would you like to rate it?',
     'would_you_tell_us_more' => 'Sorry to hear it! Would you like to tell us more?',
@@ -4908,75 +4914,75 @@ $LANG = array(
     'update_payment' => 'Update Payment',
     'markup' => 'Markup',
     'unlock_pro' => 'Unlock Pro',
-    'upgrade_to_paid_plan_to_schedule' => 'Upgrade to a paid plan to create schedules',
+    'upgrade_to_paid_plan_to_schedule' => 'Actualitzeu a un pla de pagament per a crear calendaris',
-    'next_run' => 'Next Run',
+    'next_run' => 'Següent volta',
-    'all_clients' => 'All Clients',
+    'all_clients' => 'Tots els clients',
-    'show_aging_table' => 'Show Aging Table',
+    'show_aging_table' => 'Veure taula de compliment',
-    'show_payments_table' => 'Show Payments Table',
+    'show_payments_table' => 'Veure taula de pagaments',
     'email_statement' => 'Email Statement',
-    'once' => 'Once',
+    'once' => 'Una volta',
-    'schedules' => 'Schedules',
+    'schedules' => 'Calendaris',
-    'new_schedule' => 'New Schedule',
+    'new_schedule' => 'Nou calendari',
-    'edit_schedule' => 'Edit Schedule',
+    'edit_schedule' => 'Edita calendari',
-    'created_schedule' => 'Successfully created schedule',
+    'created_schedule' => 'Calendari creat correctament',
-    'updated_schedule' => 'Successfully updated schedule',
+    'updated_schedule' => 'Calendari editat correctament',
-    'archived_schedule' => 'Successfully archived schedule',
+    'archived_schedule' => 'Calendari arxivat correctament',
-    'deleted_schedule' => 'Successfully deleted schedule',
+    'deleted_schedule' => 'Calendari esborrat correctament',
-    'removed_schedule' => 'Successfully removed schedule',
+    'removed_schedule' => 'Calendari eliminat correctament ',
-    'restored_schedule' => 'Successfully restored schedule',
+    'restored_schedule' => 'Calendari restaurat correctament',
-    'search_schedule' => 'Search Schedule',
+    'search_schedule' => 'Cerca calendari',
-    'search_schedules' => 'Search Schedules',
+    'search_schedules' => 'Cerca calendaris',
-    'update_product' => 'Update Product',
+    'update_product' => 'Actualitza producte',
-    'create_purchase_order' => 'Create Purchase Order',
+    'create_purchase_order' => 'Crea ordre de compra',
-    'update_purchase_order' => 'Update Purchase Order',
+    'update_purchase_order' => 'Actualitza ordre de compra',
-    'sent_invoice' => 'Sent Invoice',
+    'sent_invoice' => 'Factura enviada',
-    'sent_quote' => 'Sent Quote',
+    'sent_quote' => 'Pressupost enviat',
-    'sent_credit' => 'Sent Credit',
+    'sent_credit' => 'Crèdit enviat',
-    'sent_purchase_order' => 'Sent Purchase Order',
+    'sent_purchase_order' => 'Ordre de compra enviada',
-    'image_url' => 'Image URL',
+    'image_url' => 'URL de la imatge',
-    'max_quantity' => 'Max Quantity',
+    'max_quantity' => 'Quantitat màxims',
-    'test_url' => 'Test URL',
+    'test_url' => 'URL de prova',
-    'auto_bill_help_off' => 'Option is not shown',
+    'auto_bill_help_off' => 'L\'opció no es mostra',
-    'auto_bill_help_optin' => 'Option is shown but not selected',
+    'auto_bill_help_optin' => 'L\'opció es mostra però no se selecciona',
-    'auto_bill_help_optout' => 'Option is shown and selected',
+    'auto_bill_help_optout' => 'L\'opció es mostra i selecciona',
-    'auto_bill_help_always' => 'Option is not shown',
+    'auto_bill_help_always' => 'L\'opció no es mostra',
-    'view_all' => 'View All',
+    'view_all' => 'Mostra-ho tot',
-    'edit_all' => 'Edit All',
+    'edit_all' => 'Edita-ho tot',
-    'accept_purchase_order_number' => 'Accept Purchase Order Number',
+    'accept_purchase_order_number' => 'Accepta el número d\'ordre de compra',
-    'accept_purchase_order_number_help' => 'Enable clients to provide a PO number when approving a quote',
+    'accept_purchase_order_number_help' => 'Permet als clients afegir un número d\'ordre de compra quan aprovin un pressupost',
-    'from_email' => 'From Email',
+    'from_email' => 'De correu electrònic',
-    'show_preview' => 'Show Preview',
+    'show_preview' => 'Mostra previsualització',
-    'show_paid_stamp' => 'Show Paid Stamp',
+    'show_paid_stamp' => 'Mostra segell de "Pagat"',
-    'show_shipping_address' => 'Show Shipping Address',
+    'show_shipping_address' => 'Mostra adreça d\'enviament',
-    'no_documents_to_download' => 'There are no documents in the selected records to download',
+    'no_documents_to_download' => 'No hi ha cap documents a descarregar en cap dels elements selecctionats',
-    'pixels' => 'Pixels',
+    'pixels' => 'Píxels',
-    'logo_size' => 'Logo Size',
+    'logo_size' => 'Mida del logo',
-    'failed' => 'Failed',
+    'failed' => 'Fallat',
-    'client_contacts' => 'Client Contacts',
+    'client_contacts' => 'Contactes del client',
-    'sync_from' => 'Sync From',
+    'sync_from' => 'Sincronitza de',
-    'gateway_payment_text' => 'Invoices: :invoices for :amount for client :client',
+    'gateway_payment_text' => 'Factures: :invoices de :amount per al client :client',
-    'gateway_payment_text_no_invoice' => 'Payment with no invoice for amount :amount for client :client',
+    'gateway_payment_text_no_invoice' => 'Pagament sense factura de :amount per al client :client',
-    'click_to_variables' => 'Client here to see all variables.',
+    'click_to_variables' => 'Pitgeu aquí per veure totes les variables.',
-    'ship_to' => 'Ship to',
+    'ship_to' => 'Envia a',
-    'stripe_direct_debit_details' => 'Please transfer into the nominated bank account above.',
+    'stripe_direct_debit_details' => 'Transferiu al compte bancari especificat a dalt, si us plau.',
-    'branch_name' => 'Branch Name',
+    'branch_name' => 'Nom de l\'oficina',
-    'branch_code' => 'Branch Code',
+    'branch_code' => 'Codi de l\'oficina',
-    'bank_name' => 'Bank Name',
+    'bank_name' => 'Nom del banc',
-    'bank_code' => 'Bank Code',
+    'bank_code' => 'Codi del banc',
     'bic' => 'BIC',
-    'change_plan_description' => 'Upgrade or downgrade your current plan.',
+    'change_plan_description' => 'Actualitzeu el vostre pla.',
-    'add_company_logo' => 'Add Logo',
+    'add_company_logo' => 'Afegiu logo',
-    'add_stripe' => 'Add Stripe',
+    'add_stripe' => 'Afegiu Stripe',
-    'invalid_coupon' => 'Invalid Coupon',
+    'invalid_coupon' => 'Cupó invàlid',
-    'no_assigned_tasks' => 'No billable tasks for this project',
+    'no_assigned_tasks' => 'No hi ha cap tasca cobrable a aquest projecte',
-    'authorization_failure' => 'Insufficient permissions to perform this action',
+    'authorization_failure' => 'Permisos insuficients per a realitzar aquesta acció',
-    'authorization_sms_failure' => 'Please verify your account to send emails.',
+    'authorization_sms_failure' => 'Verifiqueu el vostre compte per a poder enviar missatges de correu.',
-    'white_label_body' => 'Thank you for purchasing a white label license. <br><br> Your license key is: <br><br> :license_key',
+    'white_label_body' => 'Gràcies per comprar una llicència de marca blanca. <br><br>La vostra clau de llicència és: <br><br>:license_key',
     'payment_type_Klarna' => 'Klarna',
-    'payment_type_Interac E Transfer' => 'Interac E Transfer',
+    'payment_type_Interac E Transfer' => 'Transferència Interac E',
     'xinvoice_payable' => 'Payable within :payeddue days net until :paydate',
     'xinvoice_no_buyers_reference' => "No buyer's reference given",
-    'xinvoice_online_payment' => 'The invoice needs to be payed online via the provided link',
+    'xinvoice_online_payment' => 'The invoice needs to be paid online via the provided link',
     'pre_payment' => 'Pre Payment',
     'number_of_payments' => 'Number of payments',
     'number_of_payments_helper' => 'The number of times this payment will be made',
@@ -4984,11 +4990,6 @@ $LANG = array(
     'notification_payment_emailed' => 'Payment :payment was emailed to :client',
     'notification_payment_emailed_subject' => 'Payment :payment was emailed',
     'record_not_found' => 'Record not found',
-    'product_tax_exempt' => 'Product Tax Exempt',
-    'product_type_physical' => 'Physical Goods',
-    'product_type_digital' => 'Digital Goods',
-    'product_type_service' => 'Services',
-    'product_type_freight' => 'Shipping',
     'minimum_payment_amount' => 'Minimum Payment Amount',
     'client_initiated_payments' => 'Client Initiated Payments',
     'client_initiated_payments_help' => 'Support making a payment in the client portal without an invoice',
@@ -5057,6 +5058,34 @@ $LANG = array(
     'here' => 'here',
     'industry_Restaurant & Catering' => 'Restaurant & Catering',
     'show_credits_table' => 'Show Credits Table',
+    'manual_payment' => 'Payment Manual',
+    'tax_summary_report' => 'Tax Summary Report',
+    'tax_category' => 'Tax Category',
+    'physical_goods' => 'Physical Goods',
+    'digital_products' => 'Digital Products',
+    'services' => 'Services',
+    'shipping' => 'Shipping',
+    'tax_exempt' => 'Tax Exempt',
+    'late_fee_added_locked_invoice' => 'Late fee for invoice :invoice added on :date',
+    'lang_Khmer' => 'Khmer',
+    'routing_id' => 'Routing ID',
+    'enable_e_invoice' => 'Enable E-Invoice',
+    'e_invoice_type' => 'E-Invoice Type',
+    'reduced_tax' => 'Reduced Tax',
+    'override_tax' => 'Override Tax',
+    'zero_rated' => 'Zero Rated',
+    'reverse_tax' => 'Reverse Tax',
+    'updated_tax_category' => 'Successfully updated the tax category',
+    'updated_tax_categories' => 'Successfully updated the tax categories',
+    'set_tax_category' => 'Set Tax Category',
+    'payment_manual' => 'Payment Manual',
+    'expense_payment_type' => 'Expense Payment Type',
+    'payment_type_Cash App' => 'Cash App',
+    'rename' => 'Rename',
+    'renamed_document' => 'Successfully renamed document',
+    'e_invoice' => 'E-Invoice',
+    'light_dark_mode' => 'Light/Dark Mode',
+    'activities' => 'Activities',
 );
 
 

lang/fr_CA/texts.php

@@ -5072,6 +5072,12 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'set_tax_category' => 'Définir la catégorie de taxe',
     'payment_manual' => 'Paiement manuel',
     'expense_payment_type' => 'Type de paiement de dépense',
+    'payment_type_Cash App' => 'Cash App',
+    'rename' => 'Renommer',
+    'renamed_document' => 'Le document a été renommé',
+    'e_invoice' => 'Facture électronique',
+    'light_dark_mode' => 'Mode clair/sombre',
+    'activities' => 'Activités',
 );
 
 

routes/api.php

@@ -394,4 +394,4 @@ Route::post('api/v1/yodlee/data_updates', [YodleeController::class, 'dataUpdates
 Route::post('api/v1/yodlee/refresh_updates', [YodleeController::class, 'refreshUpdatesWebhook'])->middleware('throttle:100,1');
 Route::post('api/v1/yodlee/balance', [YodleeController::class, 'balanceWebhook'])->middleware('throttle:100,1');
 
-Route::fallback([BaseController::class, 'notFound']);
+Route::fallback([BaseController::class, 'notFound'])->middleware('throttle:404');