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

add contract started_at field

Browse Source
This commit is contained in:
Roland Schneider
2016-03-03 07:57:17 +01:00
parent b2c1cc0a6d
commit fd4122a983
13 changed files with 222 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/models/Contract.php
View File

@@ -22,6 +22,7 @@ use common\components\Helper;
* @property string $expired_at
* @property string $created_at
* @property string $updated_at
* @property string $started_at
*/
class Contract extends \yii\db\ActiveRecord
{
@@ -82,6 +83,7 @@ class Contract extends \yii\db\ActiveRecord
'expired_at' => Yii::t('common/contract', 'Lejárati dátum'),
'created_at' => Yii::t('common/contract', 'Létrehozva'),
'updated_at' => Yii::t('common/contract', 'Módosítva'),
'started_at' => Yii::t('common/contract', 'Érvényesség kezdete'),
];
}

21
common/models/TicketInstallmentRequest.php
View File

@@ -123,7 +123,12 @@ class TicketInstallmentRequest extends \yii\db\ActiveRecord
}
public function getTicketExpirationDate(){
return strtotime( $this->request_target_time_at . " +1 month -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);
return $date->getTimestamp();
}
@@ -244,11 +249,13 @@ class TicketInstallmentRequest extends \yii\db\ActiveRecord
$discount = $ticket->discount;
$money = $type->installment_money;
if ( isset( $discount ) ){
$money = Discount::applyDiscount($money, $discount);
$money = Discount::applyDiscount( $money, $discount );
}
$ticketCreatedAt = time();
for ( $i = 1; $i <= $count; $i++){
$request = TicketInstallmentRequest::createInstallment($ticket, $type, $customer, $contract, $money, $ticketCreatedAt, $i);
$request = TicketInstallmentRequest::createInstallment($ticket, $type, $customer, $contract, $money, null, $i);
$result[] = $request;
}
@@ -262,7 +269,11 @@ class TicketInstallmentRequest extends \yii\db\ActiveRecord
$request->id_customer = $customer->id_customer;
$request->status = TicketInstallmentRequest::$STATUS_PENDING;
$request->priority = $index;
$request->request_target_time_at = date('Y-m-d H:i:s', strtotime("+".$index." month" ));
$date = \DateTime::createFromFormat("Y.m.d", $contract->started_at, new \DateTimeZone( 'UTC'));
$date->modify("+$index month");
// $date->modify("-1 day");
$date->setTime(0, 0, 0);
$request->request_target_time_at = $date->format ( 'Y-m-d H:i:s' );
$request->request_processed_at = null;
$request->request_sent_at = null;
$request->money = $money;

4
common/models/Transfer.php
View File

@@ -672,8 +672,8 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
self::notInInterval ( $query, 'transfer.created_at', $start, $end );
}
echo "start date is: ". $start;
echo "start date is: " . gettype( $start );
// echo "start date is: ". $start;
// echo "start date is: " . gettype( $start );
if ( !RoleDefinition::isAdmin() ){
Helper::restrictIfNotAdminTheStartDate($query, $start);