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

fix merge conflicts

Browse Source
This commit is contained in:
Roland Schneider
2016-01-16 19:11:01 +01:00
parent c27ca44a5b a782232ad8
commit 272d2d4f8a
11 changed files with 65 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/models/Account.php
View File

@@ -152,11 +152,29 @@ class Account extends \yii\db\ActiveRecord
}
/** read id_transfer from session (default account )
*
* @return int id_transfer
* */
public static function readDefault( ){
$session = Yii::$app->session;
$result = $session->get('id_account');
return $result;
}
/**
* read default transfer object
* return the default account or null, if not found
* @return common\models\Account
* */
public static function readDefaultObject( ){
$account = null;
$id_account = self::readDefault();
if ( isset($id_account)){
$account = Account::findOne($id_account);
}
return $account;
}

5
common/models/AccountState.php
View File

@@ -63,11 +63,10 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
public function rules()
{
return [
[['id_account','money' ], 'required'],
[['id_account', 'type', 'money', 'banknote_5_ft', 'banknote_10_ft', 'banknote_20_ft', 'banknote_50_ft', 'banknote_100_ft', 'banknote_200_ft', 'banknote_500_ft', 'banknote_1000_ft', 'banknote_2000_ft', 'banknote_5000_ft', 'banknote_10000_ft', 'banknote_20000_ft' ], 'integer'],
[['money' ], 'required'],
[['type', 'money', 'banknote_5_ft', 'banknote_10_ft', 'banknote_20_ft', 'banknote_50_ft', 'banknote_100_ft', 'banknote_200_ft', 'banknote_500_ft', 'banknote_1000_ft', 'banknote_2000_ft', 'banknote_5000_ft', 'banknote_10000_ft', 'banknote_20000_ft' ], 'integer'],
[['comment' ], 'string' ,'max' => 255],
[['prev_state' ], 'integer'],
[['id_account'] , 'validatePrevState'],
];
}

1
common/models/Product.php
View File

@@ -46,6 +46,7 @@ class Product extends \common\models\BaseFitnessActiveRecord {
[['id_product_category', 'id_account', 'name'], 'required'],
[['id_product_category', 'id_account', 'purchase_price', 'sale_price', 'profit_margins', 'status'], 'integer'],
[['product_number', 'barcode'], 'string', 'max' => 20],
[['product_number', 'barcode'], 'filter', 'filter' => 'trim', 'skipOnArray' => true],
[['name'], 'string', 'max' => 128],
[['description'], 'string', 'max' => 255],
// [['product_number'], 'unique' ],

25
common/models/TransferListSearch.php
View File

@@ -23,33 +23,28 @@ class TransferListSearch extends Transfer
public $mode = "reception";//reception or admin
/**start date string*/
public $start;
/**end date string*/
public $end;
/**start date*/
public $timestampStart;
/** end date*/
public $timestampEnd;
/**if include cassa open*/
public $includeCassaOpen = false;
/**total with cassa open*/
public $totalWithCassa;
/**last cassa open*/
public $cassaOpen;
// public $totalsCreatedAt = ['total' => 0, 'accounts' =>[] ];
// public $totalsCreatedAtNotPaid= ['total' => 0, 'accounts' =>[]];
// public $totalsCreatedAtPaid= ['total' => 0, 'accounts' =>[]];
// public $totalsPaidAt= ['total' => 0, 'accounts' =>[]];
// public $totalsPaidAtNotCreatedAt= ['total' => 0, 'accounts' =>[]];
public $totals;
/**The accounts*/
public $accounts;
/**types*/
public $types;
/**users*/
public $users;
/**
* all money gained with ticket sell
* */