diff --git a/resources/lang/en-GB/bills.php b/resources/lang/en-GB/bills.php index 93a3b1f9c..13360748a 100644 --- a/resources/lang/en-GB/bills.php +++ b/resources/lang/en-GB/bills.php @@ -2,54 +2,57 @@ return [ - 'bill_number' => 'Bill Number', - 'bill_date' => 'Bill Date', - 'total_price' => 'Total Price', - 'due_date' => 'Due Date', - 'order_number' => 'Order Number', - 'bill_from' => 'Bill From', + 'bill_number' => 'Bill Number', + 'bill_date' => 'Bill Date', + 'total_price' => 'Total Price', + 'due_date' => 'Due Date', + 'order_number' => 'Order Number', + 'bill_from' => 'Bill From', - 'quantity' => 'Quantity', - 'price' => 'Price', - 'sub_total' => 'Subtotal', - 'discount' => 'Discount', - 'tax_total' => 'Tax Total', - 'total' => 'Total', + 'quantity' => 'Quantity', + 'price' => 'Price', + 'sub_total' => 'Subtotal', + 'discount' => 'Discount', + 'tax_total' => 'Tax Total', + 'total' => 'Total', - 'item_name' => 'Item Name|Item Names', + 'item_name' => 'Item Name|Item Names', - 'show_discount' => ':discount% Discount', - 'add_discount' => 'Add Discount', - 'discount_desc' => 'of subtotal', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', - 'payment_due' => 'Payment Due', - 'amount_due' => 'Amount Due', - 'paid' => 'Paid', - 'histories' => 'Histories', - 'payments' => 'Payments', - 'add_payment' => 'Add Payment', - 'mark_received' => 'Mark Received', - 'download_pdf' => 'Download PDF', - 'send_mail' => 'Send Email', + 'payment_due' => 'Payment Due', + 'amount_due' => 'Amount Due', + 'paid' => 'Paid', + 'histories' => 'Histories', + 'payments' => 'Payments', + 'add_payment' => 'Add Payment', + 'mark_received' => 'Mark Received', + 'download_pdf' => 'Download PDF', + 'send_mail' => 'Send Email', + 'create_bill' => 'Create Bill', + 'receive_bill' => 'Receive Bill', + 'make_payment' => 'Make Payment', 'status' => [ - 'draft' => 'Draft', - 'received' => 'Received', - 'partial' => 'Partial', - 'paid' => 'Paid', + 'draft' => 'Draft', + 'received' => 'Received', + 'partial' => 'Partial', + 'paid' => 'Paid', ], 'messages' => [ - 'received' => 'Bill marked as received successfully!', - 'draft' => 'This is a DRAFT bill and will be reflected to charts after it gets received.', + 'received' => 'Bill marked as received successfully!', + 'draft' => 'This is a DRAFT bill and will be reflected to charts after it gets received.', 'status' => [ - 'created' => 'Created on :date', - 'receive' => [ + 'created' => 'Created on :date', + 'receive' => [ 'draft' => 'Not sent', 'received' => 'Received on :date', ], - 'paid' => [ + 'paid' => [ 'await' => 'Awaiting payment', ], ], diff --git a/resources/lang/en-GB/invoices.php b/resources/lang/en-GB/invoices.php index 63db9f663..e40dd303d 100644 --- a/resources/lang/en-GB/invoices.php +++ b/resources/lang/en-GB/invoices.php @@ -2,67 +2,70 @@ return [ - 'invoice_number' => 'Invoice Number', - 'invoice_date' => 'Invoice Date', - 'total_price' => 'Total Price', - 'due_date' => 'Due Date', - 'order_number' => 'Order Number', - 'bill_to' => 'Bill To', + 'invoice_number' => 'Invoice Number', + 'invoice_date' => 'Invoice Date', + 'total_price' => 'Total Price', + 'due_date' => 'Due Date', + 'order_number' => 'Order Number', + 'bill_to' => 'Bill To', - 'quantity' => 'Quantity', - 'price' => 'Price', - 'sub_total' => 'Subtotal', - 'discount' => 'Discount', - 'tax_total' => 'Tax Total', - 'total' => 'Total', + 'quantity' => 'Quantity', + 'price' => 'Price', + 'sub_total' => 'Subtotal', + 'discount' => 'Discount', + 'tax_total' => 'Tax Total', + 'total' => 'Total', - 'item_name' => 'Item Name|Item Names', + 'item_name' => 'Item Name|Item Names', - 'show_discount' => ':discount% Discount', - 'add_discount' => 'Add Discount', - 'discount_desc' => 'of subtotal', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', - 'payment_due' => 'Payment Due', - 'paid' => 'Paid', - 'histories' => 'Histories', - 'payments' => 'Payments', - 'add_payment' => 'Add Payment', - 'mark_paid' => 'Mark Paid', - 'mark_sent' => 'Mark Sent', - 'download_pdf' => 'Download PDF', - 'send_mail' => 'Send Email', - 'all_invoices' => 'Login to view all invoices', + 'payment_due' => 'Payment Due', + 'paid' => 'Paid', + 'histories' => 'Histories', + 'payments' => 'Payments', + 'add_payment' => 'Add Payment', + 'mark_paid' => 'Mark Paid', + 'mark_sent' => 'Mark Sent', + 'download_pdf' => 'Download PDF', + 'send_mail' => 'Send Email', + 'all_invoices' => 'Login to view all invoices', + 'create_invoice' => 'Create Invoice', + 'send_invoice' => 'Send Invoice', + 'get_paid' => 'Get Paid', 'status' => [ - 'draft' => 'Draft', - 'sent' => 'Sent', - 'viewed' => 'Viewed', - 'approved' => 'Approved', - 'partial' => 'Partial', - 'paid' => 'Paid', + 'draft' => 'Draft', + 'sent' => 'Sent', + 'viewed' => 'Viewed', + 'approved' => 'Approved', + 'partial' => 'Partial', + 'paid' => 'Paid', ], 'messages' => [ - 'email_sent' => 'Invoice email has been sent successfully!', - 'marked_sent' => 'Invoice marked as sent successfully!', - 'email_required' => 'No email address for this customer!', - 'draft' => 'This is a DRAFT invoice and will be reflected to charts after it gets sent.', + 'email_sent' => 'Invoice email has been sent successfully!', + 'marked_sent' => 'Invoice marked as sent successfully!', + 'email_required' => 'No email address for this customer!', + 'draft' => 'This is a DRAFT invoice and will be reflected to charts after it gets sent.', 'status' => [ - 'created' => 'Created on :date', - 'send' => [ + 'created' => 'Created on :date', + 'send' => [ 'draft' => 'Not sent', 'sent' => 'Sent on :date', ], - 'paid' => [ + 'paid' => [ 'await' => 'Awaiting payment', ], ], ], 'notification' => [ - 'message' => 'You are receiving this email because you have an upcoming :amount invoice to :customer customer.', - 'button' => 'Pay Now', + 'message' => 'You are receiving this email because you have an upcoming :amount invoice to :customer customer.', + 'button' => 'Pay Now', ], ]; diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index 9b3168f2b..489feb93f 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -29,7 +29,7 @@
-

{{ trans('general.title.create', ['type' => trans_choice('general.bills', 1)]) }}

+

{{ trans('bills.create_bill') }}

{{ trans_choice('general.statuses', 1) . ': ' . trans('bills.messages.status.created', ['date' => Date::parse($bill->created_at)->format($date_format)]) }} @@ -44,7 +44,7 @@
-

{{ trans('general.title.send', ['type' => trans_choice('general.bills', 1)]) }}

+

{{ trans('bills.receive_bill') }}

@if ($bill->status->code == 'draft') @@ -63,7 +63,7 @@
-

{{ trans('general.title.get', ['type' => trans('general.paid')]) }}

+

{{ trans('bills.make_payment') }}

@if($bill->status->code != 'paid' && empty($bill->payments()->count())) diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index 058d014ab..ca230a31f 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -29,7 +29,7 @@
-

{{ trans('general.title.create', ['type' => trans_choice('general.invoices', 1)]) }}

+

{{ trans('invoices.create_invoice') }}

{{ trans_choice('general.statuses', 1) . ': ' . trans('invoices.messages.status.created', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }} @@ -44,7 +44,7 @@
-

{{ trans('general.title.send', ['type' => trans_choice('general.invoices', 1)]) }}

+

{{ trans('invoices.send_invoice') }}

@if ($invoice->status->code != 'sent' && $invoice->status->code != 'partial') @@ -74,7 +74,7 @@
-

{{ trans('general.title.get', ['type' => trans('general.paid')]) }}

+

{{ trans('invoices.get_paid') }}

@if($invoice->status->code != 'paid' && empty($invoice->payments()->count()))