From 84dda1abe59557ba97d239945e911959c6ca8b4b Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Wed, 29 Sep 2021 13:17:36 +0200 Subject: [PATCH] bug fixing --- backend/models/InventoryItemSearch.php | 58 +++++++++++++------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/backend/models/InventoryItemSearch.php b/backend/models/InventoryItemSearch.php index 28e16cd..03116ff 100644 --- a/backend/models/InventoryItemSearch.php +++ b/backend/models/InventoryItemSearch.php @@ -56,13 +56,13 @@ class InventoryItemSearch extends InventoryItem public function search($params) { $query = new Query(); - + $query->select([ 'inventory_item.id_inventory_item as item_id_inventory_item', 'inventory_item.created_at as item_created_at', new Expression('case when inventory_item.id_product is null then inventory_group.name else product.name end as item_name'), 'user.username as user_username', - 'coalesce(inventory_item.count_prev ,0)as item_count_prev', + 'coalesce(inventory_item.count_prev ,0) as item_count_prev', 'coalesce(inventory_item.count_in,0) as item_count_in', 'coalesce(inventory_item.count_sold,0) as item_count_sold', 'coalesce(inventory_item.count,0) as item_count', @@ -77,50 +77,50 @@ class InventoryItemSearch extends InventoryItem 'inventory_item.stock_missing_count as item_stock_missing_count', 'inventory_item.stock_missing_money as item_stock_missing_money' ]); - + $query->from(InventoryItem::tableName()); - - + + $query->leftJoin(User::tableName(), "user.id = inventory_item.id_user"); $query->leftJoin(Product::tableName(), "product.id_product = inventory_item.id_product"); $query->leftJoin(InventoryGroup::tableName(), "inventory_group.id_inventory_group = inventory_item.id_inventory_group"); $query->leftJoin(Inventory::tableName(), "inventory.id_inventory = inventory_item.id_inventory"); - + $query->leftJoin( "inventory_item as item_prev", "item_prev.id_inventory_item = inventory_item.id_inventory_item_prev" ); $query->leftJoin( "inventory as inventory_prev", "inventory_prev.id_inventory = item_prev.id_inventory" ); - - $query->andWhere( ['inventory_item.id_inventory' => $this->inventory->id_inventory] ); - - $this->load($params); - - + $query->andWhere( ['inventory_item.id_inventory' => $this->inventory->id_inventory] ); + + $this->load($params); + + + $dataProvider = new ActiveDataProvider( ['query' => $query , 'pagination' => ( empty($this->output) ? [] : false ), 'sort' => [ 'defaultOrder' => ['item_name' => SORT_ASC], 'attributes' => Helper::mkYiiSortItems([ - ['item_created_at', 'item_created_at'], - ['item_name', 'item_name'], - ['user_username', 'user_username'], - ['item_count_prev', 'item_count_prev'], - ['item_count_sold', 'item_count_sold'], - ['item_count_in', 'item_count_in'], - ['item_count', 'item_count'], + ['item_created_at', 'item_created_at'], + ['item_name', 'item_name'], + ['user_username', 'user_username'], + ['item_count_prev', 'item_count_prev'], + ['item_count_sold', 'item_count_sold'], + ['item_count_in', 'item_count_in'], + ['item_count', 'item_count'], ['item_count_waste', 'item_count_waste'], - ['item_difference', 'item_difference'], - ['item_count_system', 'item_count_system'], - ['inventory.id_inventory', 'inventory_id_inventory'], - ['inventory.name', 'inventory_name'], - ['inventory_prev_name', 'inventory_prev_name'], - ['item_price_brutto', 'item_price_brutto'], + ['item_difference', 'item_difference'], + ['item_count_system', 'item_count_system'], + ['inventory.id_inventory', 'inventory_id_inventory'], + ['inventory.name', 'inventory_name'], + ['inventory_prev_name', 'inventory_prev_name'], + ['item_price_brutto', 'item_price_brutto'], ['item_purchase_price_net', 'item_purchase_price_net'], ['item_stock_missing_count', 'item_stock_missing_count'], ['item_stock_missing_money', 'item_stock_missing_money'], ]) - , - ] + , + ] ] ); @@ -129,7 +129,7 @@ class InventoryItemSearch extends InventoryItem $query->where('0=1'); return $dataProvider; } - + if ( !empty($this->item_type) && is_numeric($this->item_id) ){ if ( $this->item_type == 'product'){ @@ -138,7 +138,7 @@ class InventoryItemSearch extends InventoryItem $query->andFilterWhere(['inventory_group.id_inventory_group' => $this->item_id]); } } - + return $dataProvider; }