From 20f8c7e1e309a3c71480b0ca32062826da20fd9b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 19 Apr 2021 13:36:00 +1000 Subject: [PATCH 1/2] minor fixes for migration --- app/Traits/GenerateMigrationResources.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index ebc9dd79bd3e..577369bfa9e0 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -523,6 +523,7 @@ info("get company"); 'updated_at' => $invoice->updated_at ? Carbon::parse($invoice->updated_at)->toDateString() : null, 'deleted_at' => $invoice->deleted_at ? Carbon::parse($invoice->deleted_at)->toDateString() : null, 'invitations' => $this->getResourceInvitations($invoice->invitations, 'invoice_id'), + 'auto_bill_enabled' => $invoice->auto_bill, ]; } @@ -595,6 +596,7 @@ info("get company"); 'due_date_days' => $this->transformDueDate($invoice), 'remaining_cycles' => $this->getRemainingCycles($invoice), 'invitations' => $this->getResourceInvitations($invoice->invitations, 'recurring_invoice_id'), + 'auto_bill_enabled' => $invoice->auto_bill, ]; } From c90eac806f7412533033877f96054ffcb06830b0 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 28 Apr 2021 09:43:35 +1000 Subject: [PATCH 2/2] Texts --- resources/lang/en/texts.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 0958cc603992..449bb5abbe66 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4271,6 +4271,17 @@ $LANG = array( 'activity_82' => ':user archived subscription :subscription', 'activity_83' => ':user deleted subscription :subscription', 'activity_84' => ':user restored subscription :subscription', + + 'amount_greater_than_balance_v5' => 'The amount is greater than the invoice balance. You cannot overpay an invoice.', + 'click_to_continue' => 'Click to continue', + + 'notification_invoice_sent_subject' => 'Invoice :invoice was created to :client', + 'notification_invoice_viewed_subject' => 'Invoice :invoice was created for :client', + 'notification_quote_sent_subject' => 'Quote :invoice was created to :client', + 'notification_quote_viewed_subject' => 'Quote :invoice was created for :client', + 'notification_credit_sent_subject' => 'Credit :invoice was created to :client', + 'notification_credit_viewed_subject' => 'Credit :invoice was created for :client', + ); return $LANG;