diff --git a/app/View/Components/SelectItemButton.php b/app/View/Components/SelectItemButton.php index 9fa8b4e12..ae1008d96 100644 --- a/app/View/Components/SelectItemButton.php +++ b/app/View/Components/SelectItemButton.php @@ -36,7 +36,7 @@ class SelectItemButton extends Component public function render() { $items = Item::enabled()->orderBy('name')->take(setting('default.select_limit'))->get(); - $price_type= $this->getPriceType($this->type, $this->isSale, $this->isPurchase); + $price_type = $this->getPriceType($this->type, $this->isSale, $this->isPurchase); foreach ($items as $item) { $price = $item->{$price_type . '_price'}; @@ -44,7 +44,7 @@ class SelectItemButton extends Component $item->price = $price; } - $price = ($this->isPurchase) ? 'purchase_price' : 'sale_price'; + $price = $price_type . '_price'; return view('components.select-item-button', compact('items', 'price')); } @@ -55,7 +55,7 @@ class SelectItemButton extends Component return 'sale'; } - if (!empty($is_sale)) { + if (!empty($is_purchase)) { return 'purchase'; } diff --git a/resources/views/components/documents/form/content.blade.php b/resources/views/components/documents/form/content.blade.php index cd7d00c79..c58ddcc1b 100644 --- a/resources/views/components/documents/form/content.blade.php +++ b/resources/views/components/documents/form/content.blade.php @@ -65,6 +65,8 @@ hide-discount="{{ $hideDiscount }}" hide-amount="{{ $hideAmount }}" text-amount="{{ $textAmount }}" + is-sale-price="{{ $isSalePrice }}" + is-purchase-price="{{ $isPurchasePrice }}" /> @if (!$hideFooter) diff --git a/resources/views/components/documents/form/main.blade.php b/resources/views/components/documents/form/main.blade.php index 7f84b7371..6c16f296e 100644 --- a/resources/views/components/documents/form/main.blade.php +++ b/resources/views/components/documents/form/main.blade.php @@ -42,6 +42,8 @@ hide-discount="{{ $hideDiscount }}" hide-amount="{{ $hideAmount }}" text-amount="{{ $textAmount }}" + is-sale-price="{{ $isSalePrice }}" + is-purchase-price="{{ $isPurchasePrice }}" /> setting('bill.title', trans_choice('general.bills', 1))])) @section('content') - + @endsection @push('scripts_start') diff --git a/resources/views/purchases/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php index d18dff854..75d66f511 100644 --- a/resources/views/purchases/bills/edit.blade.php +++ b/resources/views/purchases/bills/edit.blade.php @@ -3,7 +3,7 @@ @section('title', trans('general.title.edit', ['type' => trans_choice('general.bills', 1)])) @section('content') - + @endsection @push('scripts_start')