add daily listing by paid_by, add customer cart details

This commit is contained in:
2016-01-27 09:01:02 +01:00
parent 9fb349ee64
commit 2291ca5ff4
28 changed files with 577 additions and 81 deletions

View File

@@ -198,6 +198,23 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
"id_sale" => "id_object"
] );
}
public function getPaidByUser() {
return $this->hasOne ( User::className (), [
"id" => "paid_by"
] );
}
public function getPaidByName() {
$result = "";
$user = $this->paidByUser;
if (isset ( $this->paidByUser )) {
$result = $user->username;
}
return $result;
}
public function getObjectName() {
$result = "";
if ($this->type == Transfer::TYPE_TICKET) {
@@ -470,9 +487,11 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
$query = Transfer::find ();
$query->innerJoinWith ( 'userSoldItem' );
$query->andWhere ( [
'user_sold_item.id_user' => $user->id
] );
if ( Helper::isUserCartVisibilityUser()){
$query->andWhere ( [
'user_sold_item.id_user' => $user->id
] );
}
$transfers = $query->all ();
return $transfers;
@@ -823,7 +842,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
$query->from ( 'transfer' );
$query->innerJoin ( "account", "account.id_account = transfer.id_account" );
$query->andWhere ( [
'transfer.id_user' => $idUser
'transfer.paid_by' => $idUser
] );
$created_condition = [