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

Merge pull request #2836 from CihanSenturk/Sales-/-Purchases-price-disable-scenario

Browse Source 
Scenario of disable sale/purchase price done
This commit is contained in:
Cüneyt Şentürk 2022-12-19 12:38:35 +03:00 committed by GitHub
commit aae36e738b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Models/Common/Item.php
View File

@ -88,6 +88,11 @@ class Item extends Model
return $query->where($billing . '_price', '=', null); return $query->where($billing . '_price', '=', null);
} }
public function scopePriceType($query, $price_type)
{
return $query->whereNotNull($price_type . '_price');
}
/** /**
* Get the item id. * Get the item id.
* *

3
app/View/Components/Documents/Form/ItemButton.php
View File

@ -39,9 +39,10 @@ class ItemButton extends Component
*/ */
public function render() 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);
$items = Item::priceType($price_type)->enabled()->orderBy('name')->take(setting('default.select_limit'))->get();
foreach ($items as $item) { foreach ($items as $item) {
$price = $item->{$price_type . '_price'}; $price = $item->{$price_type . '_price'};

2
resources/assets/js/components/AkauntingItemButton.vue
View File

@ -315,7 +315,7 @@ export default {
}, },
async fetchMatchedItems() { async fetchMatchedItems() {
await window.axios.get(url + '/common/items?search="' + this.search + '" enabled:1 limit:10') await window.axios.get(url + '/common/items?search="' + this.search + '" not ' + this.price + ':NULL enabled:1 limit:10')
.then(response => { .then(response => {
this.item_list = []; this.item_list = [];
let items = response.data.data; let items = response.data.data;