diff --git a/app/Jobs/Document/CreateDocumentItem.php b/app/Jobs/Document/CreateDocumentItem.php index abc57ca81..2f814d5ff 100644 --- a/app/Jobs/Document/CreateDocumentItem.php +++ b/app/Jobs/Document/CreateDocumentItem.php @@ -45,13 +45,16 @@ class CreateDocumentItem extends Job implements HasOwner, HasSource, ShouldCreat } // Apply total discount to amount + /* + // Disabled this block because broken line item amount.. if (!empty($this->request['global_discount'])) { if ($this->request['global_discount_type'] === 'percentage') { - $item_discounted_amount -= $item_discounted_amount * ($this->request['global_discount'] / 100); + //$item_discounted_amount -= $item_discounted_amount * ($this->request['global_discount'] / 100); } else { - $item_discounted_amount -= $this->request['global_discount']; + //$item_discounted_amount -= $this->request['global_discount']; } } + */ $tax_amount = 0; $item_tax_total = 0; diff --git a/resources/views/components/documents/template/line-item.blade.php b/resources/views/components/documents/template/line-item.blade.php index 6be2ac84a..b42074c42 100644 --- a/resources/views/components/documents/template/line-item.blade.php +++ b/resources/views/components/documents/template/line-item.blade.php @@ -36,7 +36,23 @@ @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) @stack('discount_td_start') @if ($item->discount_type === 'percentage') - {{ $item->discount }} + + @php + $text_discount = ''; + + if (setting('localisation.percent_position') == 'before') { + $text_discount .= '%'; + } + + $text_discount .= $item->discount; + + if (setting('localisation.percent_position') == 'after') { + $text_discount .= '%'; + } + @endphp + + {{ $text_discount }} + @else @money($item->discount, $document->currency_code, true) @endif