shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bill item price issue solved..

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-12-28 17:17:42 +03:00
parent db0d424de2
commit 5b7d70fae7
3 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Abstracts/View/Components/DocumentForm.php
View File

@ -154,6 +154,12 @@ abstract class DocumentForm extends Component
/** @var bool */ /** @var bool */
public $hideAmount; public $hideAmount;
/** @var bool */
public $isSalePrice;
/** @var bool */
public $isPurchasePrice;
/** Items Component End */ /** Items Component End */
/** /**
@ -183,7 +189,8 @@ abstract class DocumentForm extends Component
string $textItems = '', string $textQuantity = '', string $textPrice = '', string $textAmount = '', string $textItems = '', string $textQuantity = '', string $textPrice = '', string $textAmount = '',
bool $hideItems = false, bool $hideName = false, bool $hideDescription = false, bool $hideQuantity = false, bool $hideItems = false, bool $hideName = false, bool $hideDescription = false, bool $hideQuantity = false,
bool $hidePrice = false, bool $hideDiscount = false, bool $hideAmount = false, bool $hidePrice = false, bool $hideDiscount = false, bool $hideAmount = false,
bool $hideEditItemColumns = false bool $hideEditItemColumns = false,
bool $isSalePrice = false, bool $isPurchasePrice = false
/** Items Component End */ /** Items Component End */
) { ) {
$this->type = $type; $this->type = $type;
@ -249,6 +256,8 @@ abstract class DocumentForm extends Component
$this->hideAmount = $this->getHideAmount($type, $hideAmount); $this->hideAmount = $this->getHideAmount($type, $hideAmount);
$this->hideEditItemColumns = $hideEditItemColumns; $this->hideEditItemColumns = $hideEditItemColumns;
$this->isSalePrice = $isSalePrice;
$this->isPurchasePrice = $isPurchasePrice;
/** Items Component End */ /** Items Component End */
} }

35
app/View/Components/SelectItemButton.php
View File

@ -21,7 +21,7 @@ class SelectItemButton extends Component
* *
* @return void * @return void
*/ */
public function __construct(string $type = 'sale', bool $isSale = true, bool $isPurchase = false) public function __construct(string $type = 'sale', bool $isSale = false, bool $isPurchase = false)
{ {
$this->type = $type; $this->type = $type;
$this->isSale = $isSale; $this->isSale = $isSale;
@ -36,13 +36,10 @@ class SelectItemButton extends Component
public function render() public function render()
{ {
$items = Item::enabled()->orderBy('name')->take(setting('default.select_limit'))->get(); $items = Item::enabled()->orderBy('name')->take(setting('default.select_limit'))->get();
$price_type= $this->getPriceType($this->type, $this->isSale, $this->isPurchase);
foreach ($items as $item) { foreach ($items as $item) {
$price = $item->sale_price; $price = $item->{$price_type . '_price'};
if ($this->type == 'purchase' || $this->isPurchase) {
$price = $item->purchase_price;
}
$item->price = $price; $item->price = $price;
} }
@ -51,4 +48,30 @@ class SelectItemButton extends Component
return view('components.select-item-button', compact('items', 'price')); return view('components.select-item-button', compact('items', 'price'));
} }
protected function getPriceType($type, $is_sale, $is_purchase)
{
if (!empty($is_sale)) {
return 'sale';
}
if (!empty($is_sale)) {
return 'purchase';
}
switch ($type) {
case 'bill':
case 'expense':
case 'purchase':
$type = 'purchase';
break;
case 'sale':
case 'income':
case 'invoice':
default:
$type = 'sale';
}
return $type;
}
} }

6
resources/views/components/documents/form/items.blade.php
View File

@ -80,7 +80,11 @@
@stack('add_item_td_start') @stack('add_item_td_start')
<tr id="addItem"> <tr id="addItem">
<td class="text-right border-bottom-0" colspan="{{ '7' }}"> <td class="text-right border-bottom-0" colspan="{{ '7' }}">
<x-select-item-button type="{{ $type }}" /> <x-select-item-button
type="{{ $type }}"
is-sale="{{ $isSalePrice }}"
is-purchase="{{ $isPurchasePrice }}"
/>
</td> </td>
</tr> </tr>
@stack('add_item_td_end') @stack('add_item_td_end')