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

Add inventory changes ( tax, net purchase price

Browse Source
This commit is contained in:
Roland Schneider
2017-01-06 18:24:43 +01:00
parent 6de07dac93
commit f3d00953c8
16 changed files with 547 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
common/models/InventoryItem.php
View File

@@ -26,11 +26,16 @@ use common\components\ProductAwareBehavior;
* @property integer $id_user
* @property integer $id_inventory_item_prev
* @property integer $price_brutto
* @property integer $total_price_brutto
* @property string $created_at
* @property string $updated_at
* @property mixed productName
* @property mixed product
* @property integer tax
* @property integer purchase_price_net
* @property integer net_stock_money
* @property integer stock_missing_count
* @property integer stock_missing_money
* @property \common\models\InventoryGroup inventoryGroup
*/
class InventoryItem extends BaseFitnessActiveRecord
{
@@ -133,6 +138,7 @@ class InventoryItem extends BaseFitnessActiveRecord
return $result;
}
public function getInventoryGroupName(){
$result = "";
@@ -158,32 +164,6 @@ class InventoryItem extends BaseFitnessActiveRecord
return $name;
}
public function getDifference(){
$diff = $this->count - ( $this->count_prev + $this->count_in - $this->count_sold );
return $diff;
}
public function recalculateTotalPriceBrutto(){
$diff = $this->difference;
if (!isset($diff) || !is_numeric($diff)){
$diff = 0;
}
$price = $this->price_brutto;
if (!isset($price) || !is_numeric($price)){
$price = 0;
}
$this->total_price_brutto = $price * $diff;
}
public static function findNextItemAlphabetical($id_inventory_item){
@@ -227,6 +207,65 @@ class InventoryItem extends BaseFitnessActiveRecord
return null;
}
/**
* Recalculate the next values:
*
netto készlet érték
leltárhiány db
leltárhiány összeg
*
* @param boolean $insert whether this method called while inserting a record.
* If false, it means the method is called while updating a record.
* @return boolean whether the insertion or updating should continue.
* If false, the insertion or updating will be cancelled.
*/
public function beforeSave($insert)
{
$result = parent::beforeSave($insert);
if ( $result ){
if ( !isset($this->id_inventory_group) ){
$count = 0;
$purchase_price_net = 0;
$count_prev = 0;
$count_in = 0;
$count_sold = 0;
$price = 0;
if (isset($price) && is_numeric($price)){
$price = $this->price_brutto;
}
if ( isset($this->count)){
$count = $this->count;
}
if ( isset($this->purchase_price_net)){
$purchase_price_net = $this->purchase_price_net;
}
if ( isset($this->count_prev) ){
$count_prev = $this->count_prev;
}
if ( isset($this->count_in)){
$count_in = $this->count_in;
}
if ( isset($this->count_sold)){
$count_sold = $this->count_sold;
}
//netto készlet érték
$this->net_stock_money = $count * $purchase_price_net;
//leltárhiány db
$this->stock_missing_count = $this->count - ($count_prev + $count_in - $count_sold) ;
//leltárhiány összeg
$this->stock_missing_money = $price * $this->stock_missing_count;
}
}
return $result;
}
public function afterSave($insert, $changedAttributes){
if ( !$insert ){

478
common/models/Product.php
View File

@@ -2,9 +2,9 @@
namespace common\models;
use common\components\Helper;
use Yii;
use yii\helpers\ArrayHelper;
use common\components\Helper;
/**
* This is the model class for table "product".
@@ -18,19 +18,22 @@ use common\components\Helper;
* @property integer $purchase_price
* @property integer $sale_price
* @property integer $profit_margins
* @property integer $tax
* @property integer $purchase_net_price
* @property integer $status
* @property integer $stock
* @property string $description
* @property string $created_at
* @property string $updated_at
*/
class Product extends \common\models\BaseFitnessActiveRecord {
class Product extends \common\models\BaseFitnessActiveRecord
{
const STATUS_DELETED = 0;
const STATUS_ACTIVE = 10;
public static $BUNTETES = "buntetes3000";
const STATUS_DELETED = 0;
const STATUS_ACTIVE = 10;
public static $BUNTETES = "buntetes3000";
/**
* @inheritdoc
*/
@@ -46,26 +49,29 @@ class Product extends \common\models\BaseFitnessActiveRecord {
{
return [
[['id_product_category', 'id_account', 'name'], 'required'],
[['id_inventory_group', 'id_product_category', 'id_account', 'purchase_price', 'sale_price', 'profit_margins', 'status'], 'integer'],
[['id_inventory_group', 'id_product_category', 'id_account', 'purchase_price', 'sale_price', 'profit_margins', 'status', 'tax'], 'integer'],
[['product_number', 'barcode'], 'string', 'max' => 20],
[['product_number', 'barcode'], 'filter', 'filter' => 'trim', 'skipOnArray' => true],
[['product_number', 'barcode'], 'filter', 'filter' => 'trim', 'skipOnArray' => true],
[['name'], 'string', 'max' => 128],
[['description'], 'string', 'max' => 255],
// [['product_number'], 'unique' ],
// [['barcode'], 'unique' ],
// a1 and a2 need to be unique together, only a1 will receive error message
// a1 and a2 need to be unique together, only a1 will receive error message
// ['a1', 'unique', 'targetAttribute' => ['a1', 'a2']]
[['barcode','product_number'], 'filter', 'filter' => function($value){return Helper::fixAsciiChars($value);}],
['barcode', 'unique', 'targetAttribute' => ['id_account', 'barcode']],
['product_number', 'unique', 'targetAttribute' => ['id_account', 'product_number']],
[['barcode', 'product_number'], 'filter', 'filter' => function ($value) {
return Helper::fixAsciiChars($value);
}],
['barcode', 'unique', 'targetAttribute' => ['id_account', 'barcode']],
['product_number', 'unique', 'targetAttribute' => ['id_account', 'product_number']],
];
}
public function validateAscii($attribute,$params){
if ( !$this->hasErrors($this->$attribute)){
$this->attribute = Helper::fixAsciiChars($this->attributes);
}
public function validateAscii($attribute, $params)
{
if (!$this->hasErrors($this->$attribute)) {
$this->attribute = Helper::fixAsciiChars($this->attributes);
}
}
/**
@@ -84,216 +90,262 @@ class Product extends \common\models\BaseFitnessActiveRecord {
'profit_margins' => Yii::t('common/product', 'Profit Margins'),
'status' => Yii::t('common/product', 'Status'),
'name' => Yii::t('common/product', 'Name'),
'tax' => Yii::t('common/product', 'Adó(%)'),
'stock' => Yii::t('common/product', 'Raktáron'),
'description' => Yii::t('common/product', 'Description'),
'created_at' => Yii::t('common/product', 'Created At'),
'updated_at' => Yii::t('common/product', 'Updated At'),
'id_inventory_group' => Yii::t('common/product', 'Leltár csoport'),
];
}
public function getAccount() {
return $this->hasOne ( Account::className (), [
'id_account' => 'id_account'
] );
public function getAccount()
{
return $this->hasOne(Account::className(), [
'id_account' => 'id_account'
]);
}
public function getAccountName() {
return $this->account->name;
public function getAccountName()
{
return $this->account->name;
}
public function getInventoryGroup() {
return $this->hasOne ( InventoryGroup::className (), [
'id_inventory_group' => 'id_inventory_group'
] );
public function getInventoryGroup()
{
return $this->hasOne(InventoryGroup::className(), [
'id_inventory_group' => 'id_inventory_group'
]);
}
public function getInventoryGroupName() {
$result = "";
$inventoryGroup = $this->inventoryGroup;
if ( isset($inventoryGroup)){
$result = $inventoryGroup->name;
}
return $result;
public function getInventoryGroupName()
{
$result = "";
$inventoryGroup = $this->inventoryGroup;
if (isset($inventoryGroup)) {
$result = $inventoryGroup->name;
}
return $result;
}
public function getProductCategory() {
return $this->hasOne ( ProductCategory::className (), [
'id_product_category' => 'id_product_category'
] );
public function getProductCategory()
{
return $this->hasOne(ProductCategory::className(), [
'id_product_category' => 'id_product_category'
]);
}
public function getProductCategoryName() {
return $this->productCategory->name;
public function getProductCategoryName()
{
return $this->productCategory->name;
}
/**
* @formatter:on
*/
static function statuses() {
return [
self::STATUS_ACTIVE => Yii::t ( 'common/product', 'Active' ),
self::STATUS_DELETED => Yii::t ( 'common/product', 'Inactive' )
];
static function statuses()
{
return [
self::STATUS_ACTIVE => Yii::t('common/product', 'Active'),
self::STATUS_DELETED => Yii::t('common/product', 'Inactive')
];
}
public function getStatusHuman() {
$result = null;
$s = self::statuses ( );
if (array_key_exists ( $this->status, $s )) {
$result = $s [$this->status];
}
return $result;
}
/**
* $param int $forceIncludeAccount id warehouse, that should be included in list, even if it is inactive
* */
public static function read($forceIncludeObjectWithId = null){
$warehouses = null;
if ( $forceIncludeObjectWithId == null){
$warehouses = Product::find()->andWhere(['status' => Product::STATUS_ACTIVE])->orderBy(['product.name' => SORT_ASC])->all();
}else{
$warehouses = Product::find()->andWhere( ['or', ['status' => Product::STATUS_ACTIVE], ['id_product' => $forceIncludeObjectWithId ] ])->orderBy(['product.name' => SORT_ASC])->all();
}
return $warehouses;
}
/**
* $param int $forceIncludeAccount id warehouse, that should be included in list, even if it is inactive
* */
public static function readForDefaultAccount($forceIncludeObjectWithId = null){
$result = null;
$account = Account::readDefault();
if ( $forceIncludeObjectWithId == null){
$query = Product::find()->andWhere(['status' => Product::STATUS_ACTIVE])->orderBy(['product.name' => SORT_ASC]);
if ( Helper::isProductVisibilityAccount() && $account )
$query->andWhere(["product.id_account" => $account]);
$result = $query->all();
}else{
$query = Product::find()->andWhere( ['or', ['status' => Product::STATUS_ACTIVE], ['id_product' => $forceIncludeObjectWithId ] ])->orderBy(['product.name' => SORT_ASC]);
if ( Helper::isProductVisibilityAccount() && $account )
$query->andWhere(["product.id_account" => $account]);
$result = $query->all();
}
return $result;
}
public static function findProduct($query, $account = null){
$result = [];
$product = null;
$query = Product::find()
->andWhere(
['or',
['product_number' => $query ],
['barcode' => $query ],
]
)->andWhere(['status' =>Product::STATUS_ACTIVE]);
if ( Helper::isProductVisibilityAccount() && $account ){
$query->andFilterWhere(['product.id_account' => $account]);
}
$products = $query->all();
if ( count($products) == 1 ){
$product = $products[0];
}
return $product;
}
public static function modelToArray($product,$default = null){
if ( $product == null ){
return $default;
}
return ArrayHelper::toArray($product, [
'common\models\Product' => [
'id_product',
'name',
'product_number',
'barcode',
'sale_price',
'stock',
'id_account',
'category' => function ($product) {
return $product->productCategoryName;
},
],
]);
}
public static function modelToMapIdName($product,$default = null){
if ( $product == null ){
return $default;
}
return ArrayHelper::toArray($product, [
'common\models\Product' => [
'id_product',
'name',
],
]);
}
public static function modelToMapIdNameLong($product,$default = null){
if ( $product == null ){
return $default;
}
return ArrayHelper::toArray($product, [
'common\models\Product' => [
'id_product',
'name' => function ($product) {
return $product->name . " - " .$product->productCategoryName . " (" . $product->accountName . ")";
},
],
]);
}
public static function sellProduct($product,$count){
$product->stock = $product->stock - $count;
}
public static function readProductsNotPartOfInventoryGroup( $id_account = null ){
$query = Product::find();
$query->andWhere("id_inventory_group is null");
$query->andWhere(['status' => Product::STATUS_ACTIVE]);
return $query->all();
}
public static function readInventoryGroups(){
$query = InventoryGroup::find();
$query->andWhere(['status' => Product::STATUS_ACTIVE]);
return $query->all();
}
public static function buildProductAndInventoryGroupList($id_account = null){
$productOptions = [];
$products = Product::readProductsNotPartOfInventoryGroup($id_account);
$inventoryGroups = Product::readInventoryGroups();
foreach ($products as $product ){
$productOptions[]= [ 'type' =>'product', 'id' => $product->id_product ,'name' => $product->name . " (Termék/" .$product->productCategoryName ."/" . $product->accountName .")" ];
}
foreach ($inventoryGroups as $inventoryGroup ){
$productOptions[] = ['type' =>'group', 'id' =>$inventoryGroup->id_inventory_group ,'name' =>$inventoryGroup->name ."/Termékcsoport" ];
}
return $productOptions;
public function getStatusHuman()
{
$result = null;
$s = self::statuses();
if (array_key_exists($this->status, $s)) {
$result = $s [$this->status];
}
return $result;
}
/**
* $param int $forceIncludeAccount id warehouse, that should be included in list, even if it is inactive
* */
public static function read($forceIncludeObjectWithId = null)
{
$warehouses = null;
if ($forceIncludeObjectWithId == null) {
$warehouses = Product::find()->andWhere(['status' => Product::STATUS_ACTIVE])->orderBy(['product.name' => SORT_ASC])->all();
} else {
$warehouses = Product::find()->andWhere(['or', ['status' => Product::STATUS_ACTIVE], ['id_product' => $forceIncludeObjectWithId]])->orderBy(['product.name' => SORT_ASC])->all();
}
return $warehouses;
}
/**
* $param int $forceIncludeAccount id warehouse, that should be included in list, even if it is inactive
* */
public static function readForDefaultAccount($forceIncludeObjectWithId = null)
{
$result = null;
$account = Account::readDefault();
if ($forceIncludeObjectWithId == null) {
$query = Product::find()->andWhere(['status' => Product::STATUS_ACTIVE])->orderBy(['product.name' => SORT_ASC]);
if (Helper::isProductVisibilityAccount() && $account)
$query->andWhere(["product.id_account" => $account]);
$result = $query->all();
} else {
$query = Product::find()->andWhere(['or', ['status' => Product::STATUS_ACTIVE], ['id_product' => $forceIncludeObjectWithId]])->orderBy(['product.name' => SORT_ASC]);
if (Helper::isProductVisibilityAccount() && $account)
$query->andWhere(["product.id_account" => $account]);
$result = $query->all();
}
return $result;
}
public static function findProduct($query, $account = null)
{
$product = null;
$query = Product::find()
->andWhere(
['or',
['product_number' => $query],
['barcode' => $query],
]
)->andWhere(['status' => Product::STATUS_ACTIVE]);
if (Helper::isProductVisibilityAccount() && $account) {
$query->andFilterWhere(['product.id_account' => $account]);
}
$products = $query->all();
if (count($products) == 1) {
$product = $products[0];
}
return $product;
}
public static function modelToArray($product, $default = null)
{
if ($product == null) {
return $default;
}
return ArrayHelper::toArray($product, [
'common\models\Product' => [
'id_product',
'name',
'product_number',
'barcode',
'sale_price',
'stock',
'id_account',
'category' => function ($product) {
return $product->productCategoryName;
},
],
]);
}
public static function modelToMapIdName($product, $default = null)
{
if ($product == null) {
return $default;
}
return ArrayHelper::toArray($product, [
'common\models\Product' => [
'id_product',
'name',
],
]);
}
public static function modelToMapIdNameLong($product, $default = null)
{
if ($product == null) {
return $default;
}
return ArrayHelper::toArray($product, [
'common\models\Product' => [
'id_product',
'name' => function ($product) {
return $product->name . " - " . $product->productCategoryName . " (" . $product->accountName . ")";
},
],
]);
}
public static function sellProduct($product, $count)
{
$product->stock = $product->stock - $count;
}
public static function readProductsNotPartOfInventoryGroup($id_account = null)
{
$query = Product::find();
$query->andWhere("id_inventory_group is null");
$query->andWhere(['status' => Product::STATUS_ACTIVE]);
return $query->all();
}
public static function readInventoryGroups()
{
$query = InventoryGroup::find();
$query->andWhere(['status' => Product::STATUS_ACTIVE]);
return $query->all();
}
public static function buildProductAndInventoryGroupList($id_account = null)
{
$productOptions = [];
$products = Product::readProductsNotPartOfInventoryGroup($id_account);
$inventoryGroups = Product::readInventoryGroups();
foreach ($products as $product) {
$productOptions[] = ['type' => 'product', 'id' => $product->id_product, 'name' => $product->name . " (Termék/" . $product->productCategoryName . "/" . $product->accountName . ")"];
}
foreach ($inventoryGroups as $inventoryGroup) {
$productOptions[] = ['type' => 'group', 'id' => $inventoryGroup->id_inventory_group, 'name' => $inventoryGroup->name . "/Termékcsoport"];
}
return $productOptions;
}
public function beforeSave($insert)
{
$result = parent::beforeSave($insert);
if ($result) {
//automatically set net price
//net price = purchase_price -(purchase_price * tax /100)
$purchase_price_brutto = 0;
$tax = 0;
if (isset($this->purchase_price)) {
$purchase_price_brutto = $this->purchase_price;
}
if (isset($this->tax)) {
$tax = $this->tax;
}
$this->purchase_net_price = $purchase_price_brutto - ($purchase_price_brutto * $tax / 100);
}
return $result;
}
}

2
common/models/Transfer.php
View File

@@ -40,6 +40,7 @@ use yii\web\NotAcceptableHttpException;
* @property integer $id_customer
* @property int|string paid_by
* @property int payment_method
* @property \common\models\Ticket ticket
*/
class Transfer extends \common\models\BaseFitnessActiveRecord {
const TYPE_PRODUCT = 10;
@@ -597,7 +598,6 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
public function beforeDelete() {
parent::beforeDelete ();
if ($this->type == Transfer::TYPE_TICKET) {
/** @noinspection PhpUndefinedFieldInspection */
$ticket = $this->ticket;
if ($ticket != null) {
$ticket->delete ();