close #2999 Enhancement: Invoice item columns setting styling ( #866acb813 )

app/Abstracts/View/Components/Documents/Form.php

@@ -164,30 +164,45 @@ abstract class Form extends Component
     /** @var bool */
     public $hideItemName;
 
+    /** @var bool */
+    public $hideSettingItemName;
+
     /** @var string */
     public $textItemName;
 
     /** @var bool */
     public $hideItemDescription;
 
+    /** @var bool */
+    public $hideSettingItemDescription;
+
     /** @var string */
     public $textItemDescription;
 
     /** @var bool */
     public $hideItemQuantity;
 
+    /** @var bool */
+    public $hideSettingItemQuantity;
+
     /** @var string */
     public $textItemQuantity;
 
     /** @var bool */
     public $hideItemPrice;
 
+    /** @var bool */
+    public $hideSettingItemPrice;
+
     /** @var string */
     public $textItemPrice;
 
     /** @var bool */
     public $hideItemAmount;
 
+    /** @var bool */
+    public $hideSettingItemAmount;
+
     /** @var string */
     public $textItemAmount;
 
@@ -276,8 +291,8 @@ abstract class Form extends Component
         string $textAddContact = '', string $textCreateNewContact = '', string $textEditContact = '', string $textContactInfo = '', string $textChooseDifferentContact = '',
         bool $hideIssuedAt = false, string $textIssuedAt = '', string $issuedAt = '', bool $hideDueAt = false, string $textDueAt = '', string $dueAt = '', $periodDueAt = '',
         bool $hideDocumentNumber = false, string $textDocumentNumber = '', string $documentNumber = '', bool $hideOrderNumber = false, string $textOrderNumber = '', string $orderNumber = '',
-        bool $hideEditItemColumns = false, bool $hideItems = false, bool $hideItemName = false, string $textItemName = '', bool $hideItemDescription = false, string $textItemDescription = '',
+        bool $hideEditItemColumns = false, bool $hideItems = false, bool $hideItemName = false, bool $hideSettingItemName = false, string $textItemName = '', bool $hideItemDescription = false, bool $hideSettingItemDescription = false, string $textItemDescription = '',
-        bool $hideItemQuantity = false, string $textItemQuantity = '', bool $hideItemPrice = false, string $textItemPrice = '', bool $hideItemAmount = false, string $textItemAmount = '',
+        bool $hideItemQuantity = false, bool $hideSettingItemQuantity = false, string $textItemQuantity = '', bool $hideItemPrice = false, bool $hideSettingItemPrice = false, string $textItemPrice = '', bool $hideItemAmount = false, bool $hideSettingItemAmount = false, string $textItemAmount = '',
         bool $hideDiscount = false, bool $isSalePrice = false, bool $isPurchasePrice = false, int $searchCharLimit = 0, string $notes = '',
         bool $showRecurring = false,
         bool $hideAdvanced = false, string $textSectionAdvancedTitle = '', string $textSectionAdvancedDescription = '',
@@ -358,18 +373,23 @@ abstract class Form extends Component
 
         $this->hideItems = $this->getHideItems($type, $hideItems, $hideItemName, $hideItemDescription);
         $this->hideItemName = $this->getHideItemName($type, $hideItemName);
+        $this->hideSettingItemName = $this->getHideSettingItemName($type, $hideSettingItemName);
         $this->textItemName = $this->getTextItemName($type, $textItemName);
 
         $this->hideItemDescription = $this->getHideItemDescription($type, $hideItemDescription);
+        $this->hideSettingItemDescription = $this->getHideSettingItemDescription($type, $hideSettingItemDescription);
         $this->textItemDescription = $this->getTextItemDescription($type, $textItemDescription);
 
         $this->hideItemQuantity = $this->getHideItemQuantity($type, $hideItemQuantity);
+        $this->hideSettingItemQuantity = $this->getHideSettingItemQuantity($type, $hideSettingItemQuantity);
         $this->textItemQuantity = $this->getTextItemQuantity($type, $textItemQuantity);
 
         $this->hideItemPrice = $this->getHideItemPrice($type, $hideItemPrice);
+        $this->hideSettingItemPrice = $this->getHideSettingItemPrice($type, $hideSettingItemPrice);
         $this->textItemPrice = $this->getTextItemPrice($type, $textItemPrice);
 
         $this->hideItemAmount = $this->getHideItemAmount($type, $hideItemAmount);
+        $this->hideSettingItemAmount = $this->getHideSettingItemAmount($type, $hideSettingItemAmount);
         $this->textItemAmount = $this->getTextItemAmount($type, $textItemAmount);
 
         $this->hideDiscount = $this->getHideDiscount($type, $hideDiscount);
@@ -880,6 +900,21 @@ abstract class Form extends Component
             return $hideItemName;
         }
 
+        $hide = $this->getHideFromConfig($type, 'name');
+
+        if ($hide) {
+            return $hide;
+        }
+
+        return false;
+    }
+
+    protected function getHideSettingItemName($type, $hideSettingItemName): bool
+    {
+        if (! empty($hideSettingItemName)) {
+            return $hideSettingItemName;
+        }
+
         $hideItemName = setting($this->getDocumentSettingKey($type, 'item_name'), false);
 
         // if you use settting translation
@@ -887,12 +922,6 @@ abstract class Form extends Component
             return true;
         }
 
-        $hide = $this->getHideFromConfig($type, 'name');
-
-        if ($hide) {
-            return $hide;
-        }
-
         return false;
     }
 
@@ -932,13 +961,6 @@ abstract class Form extends Component
             return $hideItemDescription;
         }
 
-
-
-        // if you use settting translation
-        if (setting($this->getDocumentSettingKey($type, 'hide_item_description'), false)) {
-            return true;
-        }
-
         $hide = $this->getHideFromConfig($type, 'description');
 
         if ($hide) {
@@ -948,6 +970,20 @@ abstract class Form extends Component
         return false;
     }
 
+    protected function getHideSettingItemDescription($type, $hideSettingItemDescription): bool
+    {
+        if (! empty($hideSettingItemDescription)) {
+            return $hideSettingItemDescription;
+        }
+
+        // if you use settting translation
+        if (setting($this->getDocumentSettingKey($type, 'hide_item_description'), false)) {
+            return true;
+        }
+
+        return false;
+    }
+
     protected function getTextItemDescription($type, $textItemDescription)
     {
         if (! empty($textItemDescription)) {
@@ -969,6 +1005,21 @@ abstract class Form extends Component
             return $hideItemQuantity;
         }
 
+        $hide = $this->getHideFromConfig($type, 'quantity');
+
+        if ($hide) {
+            return $hide;
+        }
+
+        return false;
+    }
+
+    protected function getHideSettingItemQuantity($type, $hideSettingItemQuantity): bool
+    {
+        if (! empty($hideSettingItemQuantity)) {
+            return $hideSettingItemQuantity;
+        }
+
         $hideItemQuantity = setting($this->getDocumentSettingKey($type, 'quantity_name'), false);
 
         // if you use settting translation
@@ -976,12 +1027,6 @@ abstract class Form extends Component
             return true;
         }
 
-        $hide = $this->getHideFromConfig($type, 'quantity');
-
-        if ($hide) {
-            return $hide;
-        }
-
         return false;
     }
 
@@ -1021,6 +1066,21 @@ abstract class Form extends Component
             return $hideItemPrice;
         }
 
+        $hide = $this->getHideFromConfig($type, 'price');
+
+        if ($hide) {
+            return $hide;
+        }
+
+        return false;
+    }
+
+    protected function getHideSettingItemPrice($type, $hideSettingItemPrice): bool
+    {
+        if (! empty($hideSettingItemPrice)) {
+            return $hideSettingItemPrice;
+        }
+
         $hideItemPrice = setting($this->getDocumentSettingKey($type, 'price_name'), false);
 
         // if you use settting translation
@@ -1028,12 +1088,6 @@ abstract class Form extends Component
             return true;
         }
 
-        $hide = $this->getHideFromConfig($type, 'price');
-
-        if ($hide) {
-            return $hide;
-        }
-
         return false;
     }
 
@@ -1073,11 +1127,6 @@ abstract class Form extends Component
             return $hideItemAmount;
         }
 
-        // if you use settting translation
-        if (setting($this->getDocumentSettingKey($type, 'hide_amount'), false)) {
-            return true;
-        }
-
         $hide = $this->getHideFromConfig($type, 'amount');
 
         if ($hide) {
@@ -1087,6 +1136,20 @@ abstract class Form extends Component
         return false;
     }
 
+    protected function getHideSettingItemAmount($type, $hideSettingItemAmount): bool
+    {
+        if (! empty($hideSettingItemAmount)) {
+            return $hideSettingItemAmount;
+        }
+
+        // if you use settting translation
+        if (setting($this->getDocumentSettingKey($type, 'hide_amount'), false)) {
+            return true;
+        }
+
+        return false;
+    }
+
     protected function getTextItemAmount($type, $textItemAmount)
     {
         if (!empty($textItemAmount)) {

resources/views/components/documents/form/items.blade.php

@@ -30,6 +30,13 @@
                                 <th class="px-3 py-1 ltr:pl-2 rtl:pr-2 ltr:text-left rtl:text-right text-xs font-normal border-t-0 border-r-0 border-b-0" style="vertical-align:bottom;">
                                     @if (! $hideItemName)
                                         {{ (trans_choice($textItemName, 2) != $textItemName) ? trans_choice($textItemName, 2) : trans($textItemName) }}
+
+                                        @if ($hideSettingItemName)
+                                            &nbsp;&nbsp;
+                                            <x-tooltip id="tooltip-item-price" placement="top" message="{{ trans('documents.item_price_hidden', ['type' => config('type.document.' . $type . '.translation.prefix')]) }}">
+                                                <x-icon icon="visibility_off" class="text-sm font-normal"></x-icon>
+                                            </x-tooltip>
+                                        @endif
                                     @endif
                                 </th>
 
@@ -40,6 +47,13 @@
                             <th class="px-3 py-1 text-left text-xs font-normal border-t-0 border-r-0 border-b-0" style=" vertical-align:bottom;">
                                 @if (! $hideItemDescription)
                                     {{ trans($textItemDescription) }}
+
+                                    @if ($hideSettingItemDescription)
+                                        &nbsp;&nbsp;
+                                        <x-tooltip id="tooltip-item-price" placement="top" message="{{ trans('documents.item_price_hidden', ['type' => config('type.document.' . $type . '.translation.prefix')]) }}">
+                                            <x-icon icon="visibility_off" class="text-sm font-normal"></x-icon>
+                                        </x-tooltip>
+                                    @endif
                                 @endif
                             </th>
 
@@ -51,6 +65,13 @@
                         <th class="px-3 py-1 ltr:text-left rtl:text-right text-xs font-normal border-t-0 border-r-0 border-b-0" style="vertical-align:bottom;">
                             @if (! $hideItemQuantity)
                                 {{ trans($textItemQuantity) }}
+
+                                @if ($hideSettingItemQuantity)
+                                    &nbsp;&nbsp;
+                                    <x-tooltip id="tooltip-item-price" placement="top" message="{{ trans('documents.item_price_hidden', ['type' => config('type.document.' . $type . '.translation.prefix')]) }}">
+                                        <x-icon icon="visibility_off" class="text-sm font-normal"></x-icon>
+                                    </x-tooltip>
+                                @endif
                             @endif
                         </th>
 
@@ -59,14 +80,16 @@
                         @stack('price_th_start')
 
                         <th class="px-3 py-1 ltr:text-left rtl:text-right text-xs font-normal border-t-0 border-r-0 border-b-0 pr-1" style="vertical-align:bottom;">
+                            @if (! $hideItemPrice)
                                 {{ trans($textItemPrice) }}
 
-                            @if ($hideItemPrice)
+                                @if ($hideSettingItemPrice)
                                     &nbsp;&nbsp;
                                     <x-tooltip id="tooltip-item-price" placement="top" message="{{ trans('documents.item_price_hidden', ['type' => config('type.document.' . $type . '.translation.prefix')]) }}">
                                         <x-icon icon="visibility_off" class="text-sm font-normal"></x-icon>
                                     </x-tooltip>
                                 @endif
+                            @endif
                         </th>
 
                         @stack('price_th_end')
@@ -76,6 +99,13 @@
                         <th class="px-3 py-1 ltr:text-right rtl:text-left text-xs font-normal border-t-0 border-b-0 item-total" style="vertical-align:bottom;">
                             @if (! $hideItemAmount)
                                 {{ trans($textItemAmount) }}
+
+                                @if ($hideSettingItemAmount)
+                                    &nbsp;&nbsp;
+                                    <x-tooltip id="tooltip-item-price" placement="top" message="{{ trans('documents.item_price_hidden', ['type' => config('type.document.' . $type . '.translation.prefix')]) }}">
+                                        <x-icon icon="visibility_off" class="text-sm font-normal"></x-icon>
+                                    </x-tooltip>
+                                @endif
                             @endif
                         </th>