From 31d406e506f8660cecd356798368bb3bb8a23387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Batuhan=20Ba=C5=9F?= <hawkfreedev@gmail.com>
Date: Thu, 18 Oct 2018 12:29:36 +0300
Subject: [PATCH] Invoice customization bug fixing

---
 app/Http/ViewComposers/InvoiceText.php | 12 ++++--------
 resources/lang/en-GB/settings.php      |  6 +++---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/Http/ViewComposers/InvoiceText.php b/app/Http/ViewComposers/InvoiceText.php
index b9af97141..3907aa5c3 100644
--- a/app/Http/ViewComposers/InvoiceText.php
+++ b/app/Http/ViewComposers/InvoiceText.php
@@ -15,25 +15,21 @@ class InvoiceText
      */
     public function compose(View $view)
     {
-        $text_override = [
-            'items' => trans_choice('general.items', 2),
-            'quantity' => trans('invoices.quantity'),
-            'price' => trans('invoices.price'),
-        ];
+        $text_override = [];
 
-        $text_items = setting('general.invoice_item');
+        $text_items = setting('general.invoice_item', trans_choice('general.items', 2));
 
         if ($text_items == 'custom') {
             $text_items = setting('general.invoice_item_input');
         }
 
-        $text_quantity = setting('general.invoice_quantity');
+        $text_quantity = setting('general.invoice_quantity', trans('invoices.quantity'));
 
         if ($text_quantity == 'custom') {
             $text_quantity = setting('general.invoice_quantity_input');
         }
 
-        $text_price = setting('general.invoice_price');
+        $text_price = setting('general.invoice_price', trans('invoices.price'));
 
         if ($text_price == 'custom') {
             $text_price = setting('general.invoice_price_input');
diff --git a/resources/lang/en-GB/settings.php b/resources/lang/en-GB/settings.php
index 8d80e67cb..146a66426 100644
--- a/resources/lang/en-GB/settings.php
+++ b/resources/lang/en-GB/settings.php
@@ -35,14 +35,14 @@ return [
         'logo'              => 'Logo',
         'custom'            => 'Custom',
         'item_name'         => 'Item Name',
-        'item'              => 'Item (Default)',
+        'item'              => 'Items',
         'product'           => 'Product',
         'service'           => 'Service',
         'price_name'        => 'Price Name',
-        'price'             => 'Price (Default)',
+        'price'             => 'Price',
         'rate'              => 'Rate',
         'quantity_name'     => 'Quantity Name',
-        'quantity'          => 'Quantity (Default)',
+        'quantity'          => 'Quantity',
     ],
     'default' => [
         'tab'               => 'Defaults',