Merge branch 'master' into master
This commit is contained in:
		@@ -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 <b>DRAFT</b> bill and will be reflected to charts after it gets received.',
 | 
			
		||||
        'received'          => 'Bill marked as received successfully!',
 | 
			
		||||
        'draft'             => 'This is a <b>DRAFT</b> 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',
 | 
			
		||||
            ],
 | 
			
		||||
        ],
 | 
			
		||||
 
 | 
			
		||||
@@ -9,8 +9,5 @@ return [
 | 
			
		||||
    'currencies_eur'        => 'Euro',
 | 
			
		||||
    'currencies_gbp'        => 'British Pound',
 | 
			
		||||
    'currencies_try'        => 'Turkish Lira',
 | 
			
		||||
    'taxes_exempt'          => 'Tax Exempt',
 | 
			
		||||
    'taxes_normal'          => 'Normal Tax',
 | 
			
		||||
    'taxes_sales'           => 'Sales Tax',
 | 
			
		||||
 | 
			
		||||
];
 | 
			
		||||
 
 | 
			
		||||
@@ -40,6 +40,7 @@ return [
 | 
			
		||||
    'others'                => 'Other|Others',
 | 
			
		||||
    'contacts'              => 'Contact|Contacts',
 | 
			
		||||
    'reconciliations'       => 'Reconciliation|Reconciliations',
 | 
			
		||||
    'developers'            => 'Developer|Developers',
 | 
			
		||||
 | 
			
		||||
    'dashboard'             => 'Dashboard',
 | 
			
		||||
    'banking'               => 'Banking',
 | 
			
		||||
 
 | 
			
		||||
@@ -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 <b>DRAFT</b> 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 <b>DRAFT</b> 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',
 | 
			
		||||
    ],
 | 
			
		||||
 | 
			
		||||
];
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user