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

add contract controller(s) changes

Browse Source
This commit is contained in:
Roland Schneider
2018-09-10 07:40:50 +02:00
parent dd0d6c50c9
commit 792d0caab5
7 changed files with 266 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/models/Ticket.php
View File

@@ -35,6 +35,7 @@ use common\components\Helper;
* @property string $original_end;
*
* @property \common\models\Card card
* @property \common\models\Ticket transfer
*/
class Ticket extends \common\models\BaseFitnessActiveRecord
{

29
common/models/TicketInstallmentRequest.php
View File

@@ -135,14 +135,6 @@ class TicketInstallmentRequest extends \yii\db\ActiveRecord
$started_at = $contract->started_at;
$date = \DateTime::createFromFormat("Y-m-d H:i:s", $started_at, new \DateTimeZone( 'UTC'));
$date = DateUtil::addMonth( $date,$this->priority + 1 );
// $date = \DateTime::createFromFormat("Y-m-d H:i:s", $this->request_target_time_at, new \DateTimeZone( 'UTC'));
// $date = DateUtil::addMonth( $date, 1 );
// $date->modify("+1 month");
// $date->modify("-1 day");
// $date = \DateTime::createFromFormat("Y-m-d H:i:s", $this->request_target_time_at, new \DateTimeZone( 'UTC'));
// $date->modify("+1 month");
// $date->modify("-1 day");
$date->setTime(0, 0, 0);
@@ -201,7 +193,6 @@ class TicketInstallmentRequest extends \yii\db\ActiveRecord
if ( $status == static::$STATUS_ACCEPTED || $status == static::$STATUS_ACCEPTED_MANUAL){
if ( !$this->isStatusAccepted() ){
$contract->part_paid = $contract->part_paid +1;
// $tranfer = $this->addTransfer();
$result = Transfer::sellContractTicket($contract, $this, Account::findOne(1), Transfer::STATUS_PAID, Transfer::PAYMENT_METHOD_TRANSFER);
$transfer = $result[0];
$ticket = $result[1];
@@ -236,15 +227,6 @@ class TicketInstallmentRequest extends \yii\db\ActiveRecord
}
}
// protected function applyNewTicketState($partRequired = false){
// if ( $partRequired ){
// $this->ticket->setPartRequired($this);
// }
// $this->ticket->applyTicketInstallmentRequest($this);
// $this->ticket->save(false);
// }
/**
* @return Transfer
*/
@@ -340,7 +322,11 @@ class TicketInstallmentRequest extends \yii\db\ActiveRecord
TicketInstallmentRequest::$STATUS_ACCEPTED_MANUAL=> 'Személyesen fizetve',
];
}
/**
* @param $id_status
* @return mixed|string
*/
public static function toStatusName($id_status){
$result = "Ismeretlen";
$statuses = TicketInstallmentRequest::statuses();
@@ -349,7 +335,10 @@ class TicketInstallmentRequest extends \yii\db\ActiveRecord
}
return $result;
}
/**
* @return mixed|string
*/
public function getStatusName(){
return static::toStatusName($this->status);
}