add card.flag implementation

This commit is contained in:
2016-03-09 20:16:19 +01:00
parent 1d3c476476
commit 42c326f407
25 changed files with 497 additions and 80 deletions

View File

@@ -17,6 +17,7 @@ use common\models\InventoryItem;
use yii\db\Query;
use common\models\Procurement;
use common\models\Transfer;
use common\models\Sale;
/**
* ContactForm is the model behind the contact form.
@@ -32,7 +33,7 @@ class InventoryItemForm extends Model{
/**common data*/
public $inventory;
public $lastInventory;
public $last_inventory;
public $id_inventory;
public $products;
public $inventoryGroups;
@@ -48,6 +49,8 @@ class InventoryItemForm extends Model{
public $product_in;
public $product_out;
public $product_stock;
public $last_inventory_item;
public $inventory_item;
public function rules(){
return [
@@ -98,9 +101,9 @@ class InventoryItemForm extends Model{
$item->count_sold = $this->product_out;
$item->count = $this->product_stock;
if ( isset( $this->lastInventoryItem ) ){
$item->id_inventory_item_prev = $this->lastInventoryItem->id_inventory_item;
$item->count_prev = $this->lastInventoryItem->count;
if ( isset( $this->last_inventory_item ) ){
$item->id_inventory_item_prev = $this->last_inventory_item->id_inventory_item;
$item->count_prev = $this->last_inventory_item->count;
}else{
$item->count_prev = 0;
}
@@ -112,11 +115,13 @@ class InventoryItemForm extends Model{
}else{
$item->id_inventory_group = $this->inventoryGroup->id_inventory_group;
}
$item->id_inventory = $this->inventory->id_inventory;
if ( !$item->save() ){
throw new \Exception("Nem sikerült a leltár végrehajtása");
}
$this->inventory_item = $item;
return true;
}
return false;
@@ -128,8 +133,8 @@ class InventoryItemForm extends Model{
$query->from(Procurement::tableName());
$query->innerJoin(Product::tableName(),"product.id_product = procurement.id_product");
if ( isset($this->lastInventoryItem ) ){
$query->andWhere([ '>', 'procurement.created_at' ,$this->lastInventoryItem->created_at]);
if ( isset($this->last_inventory_item ) ){
$query->andWhere([ '>', 'procurement.created_at' ,$this->last_inventory_item->created_at]);
}
if ( $this->type == 'product') {
@@ -147,7 +152,8 @@ class InventoryItemForm extends Model{
$query = new Query();
$query->select(['sum(transfer.count) as total_sold']);
$query->from(Transfer::tableName());
$query->innerJoin(Product::tableName(),"product.id_product = transfer.id_object and transfer.type = " .Transfer::TYPE_PRODUCT);
$query->innerJoin(Sale::tableName(),"sale.id_sale = transfer.id_object and transfer.type = " .Transfer::TYPE_PRODUCT);
$query->innerJoin(Product::tableName(),"product.id_product = sale.id_product ");
$query->andWhere(['in', 'transfer.status' ,[Transfer::STATUS_PAID ,Transfer::STATUS_NOT_PAID ] ]);
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
@@ -190,9 +196,9 @@ class InventoryItemForm extends Model{
* Load previous inventory item, if exists
* */
protected function loadLastInventoryItem( ){
if ( isset( $this->lastInventory ) ){
if ( isset( $this->last_inventory ) ){
$query = InventoryItem::find();
$query->andWhere(['id_inventory' => $this->lastInventory->id_inventory]);
$query->andWhere(['id_inventory' => $this->last_inventory->id_inventory]);
if ( $this->type == 'product'){
$query->andWhere(['id_product' => $this->product->id_product]);
@@ -200,7 +206,7 @@ class InventoryItemForm extends Model{
$query->andWhere(['id_inventory_group' => $this->inventoryGroup->id_inventory_group]);
}
$this->lastInventoryItem = $query->one();
$this->last_inventory_item = $query->one();
}
}
@@ -223,10 +229,9 @@ class InventoryItemForm extends Model{
}
public function loadLastInventory(){
$query = Inventory::find();
$query->andWhere('<', 'inventory.created_at' , $this->inventory->created_at);
$query->andWhere(['<', 'inventory.created_at' , $this->inventory->created_at]);
$query->orderBy(['created_at' => SORT_DESC ]);
//$this->lastInventory =
$query->limit(1)->all();
$this->last_inventory =$query->limit(1)->one();
}
public function loadProducts(){