rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inventory changes

Browse Source
This commit is contained in:
Roland Schneider
2016-03-11 21:46:59 +01:00
parent 80507fce43
commit 0fc5ab01bc
11 changed files with 160 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
backend/models/InventoryItemForm.php
View File

@@ -91,6 +91,9 @@ class InventoryItemForm extends Model{
public function save(){
if ( $this->validate()) {
$this->loadLastInventory();
$this->loadLastInventoryItem();
$this->loadProductIn();
$this->loadProductSold();
@@ -99,7 +102,9 @@ class InventoryItemForm extends Model{
$item = new InventoryItem();
$item->count_in = $this->product_in;
$item->count_sold = $this->product_out;
$item->count = $this->product_stock;
$item->count = $this->count;
$item->count_system = $this->product_stock;
if ( isset( $this->last_inventory_item ) ){
$item->id_inventory_item_prev = $this->last_inventory_item->id_inventory_item;
@@ -198,6 +203,7 @@ class InventoryItemForm extends Model{
protected function loadLastInventoryItem( ){
if ( isset( $this->last_inventory ) ){
$query = InventoryItem::find();
$query->andWhere(['id_inventory' => $this->last_inventory->id_inventory]);
if ( $this->type == 'product'){
@@ -211,8 +217,8 @@ class InventoryItemForm extends Model{
}
public function read(){
$this->loadInventory();
$this->loadLastInventory();
$this->loadProducts();
$this->loadInventoryGroups();
@@ -229,6 +235,14 @@ class InventoryItemForm extends Model{
}
public function loadLastInventory(){
$query = Inventory::find();
$query->innerJoin(InventoryItem::tableName(),"inventory_item.id_inventory = inventory.id_inventory");
if ( $this->type == 'product'){
$query->andWhere(['inventory_item.id_product' => $this->product->id_product]);
}else{
$query->andWhere(['inventory_item.id_inventory_group' => $this->inventoryGroup->id_inventory_group]);
}
$query->andWhere(['<', 'inventory.created_at' , $this->inventory->created_at]);
$query->orderBy(['created_at' => SORT_DESC ]);
$this->last_inventory =$query->limit(1)->one();
@@ -265,7 +279,8 @@ class InventoryItemForm extends Model{
public function attributeLabels()
{
return [
'count' => 'Mennyiség'
'count' => 'Mennyiség',
'name' => "Termék/Termék csoport neve"
];
}

32
backend/models/InventoryItemSearch.php
View File

@@ -12,6 +12,7 @@ use common\models\User;
use common\models\Product;
use common\models\InventoryGroup;
use common\components\Helper;
use common\models\Inventory;
/**
* InventoryItemSearch represents the model behind the search form about `common\models\InventoryItem`.
@@ -58,6 +59,10 @@ class InventoryItemSearch extends InventoryItem
'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',
'coalesce(inventory_item.count_system,0) as item_count_system',
'inventory.created_at as inventory_created_at',
'inventory_prev.id_inventory as inventory_prev_id_inventory',
'inventory_prev.name as inventory_prev_name',
new Expression('(inventory_item.count - ( inventory_item.count_prev + inventory_item.count_in - inventory_item.count_sold )) as item_difference'),
]);
$query->from(InventoryItem::tableName());
@@ -66,8 +71,12 @@ class InventoryItemSearch extends InventoryItem
$query->innerJoin(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->andWhere( ['id_inventory' => $this->inventory->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] );
$dataProvider = new ActiveDataProvider(
['query' => $query ,
@@ -82,6 +91,10 @@ class InventoryItemSearch extends InventoryItem
['item_count', 'item_count'],
['item_count', 'item_count'],
['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'],
])
,
]
@@ -96,17 +109,12 @@ class InventoryItemSearch extends InventoryItem
}
$query->andFilterWhere([
'id_inventory_item' => $this->id_inventory_item,
'id_inventory' => $this->id_inventory,
'count_in' => $this->count_in,
'count_sold' => $this->count_sold,
'count' => $this->count,
'type' => $this->type,
'id_product' => $this->id_product,
'id_inventory_group' => $this->id_inventory_group,
'id_user' => $this->id_user,
'created_at' => $this->created_at,
'updated_at' => $this->updated_at,
'inventory_item.id_inventory_item' => $this->id_inventory_item,
'inventory_item.type' => $this->type,
'inventory_item.id_product' => $this->id_product,
'inventory_item.id_inventory_group' => $this->id_inventory_group,
'inventory_item.id_user' => $this->id_user,
'inventory_item.created_at' => $this->created_at,
]);
return $dataProvider;