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

add payment method

Browse Source
This commit is contained in:
Roland Schneider
2016-01-17 16:21:37 +01:00
parent abb69ce92d
commit d043759b1d
20 changed files with 751 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/models/Ticket.php
View File

@@ -75,6 +75,7 @@ class Ticket extends \common\models\BaseFitnessActiveRecord
'updated_at' => Yii::t('common/ticket', 'Updated At'),
'id_card' => Yii::t('backend/ticket','Card'),
'id_customer' => Yii::t('backend/ticket','Customer'),
'payment_method' => Yii::t('common/transfer', 'Fizetési mód'),
];
}

18
common/models/Transfer.php
View File

@@ -50,6 +50,8 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
const DIRECTION_OUT = 10;// MONEY GOES OUT FROM ACCOUNT ( COMPANY LOST MONEY )
const DIRECTION_IN = 20;//MONEY GOES IN TO THE ACCOUNT ( COMPANY EARN MONEY )
const PAYMENT_METHOD_CASH = 10;
const PAYMENT_METHOD_TRANSFER = 20;
/**
* @inheritdoc
@@ -118,6 +120,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
'types' => Yii::t('common/transfer', 'Types'),
'start' => Yii::t('common/transfer', 'Start'),
'end' => Yii::t('common/transfer', 'End'),
'payment_method' => Yii::t('common/transfer', 'Fizetési mód'),
];
}
@@ -457,6 +460,12 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
self::TYPE_TICKET => Yii::t('common/transfer','Ticket'),
];
}
public static function paymentMethods( ) {
return [
self::PAYMENT_METHOD_CASH=> Yii::t('common/transfer','Készpénz'),
self::PAYMENT_METHOD_TRANSFER => Yii::t('common/transfer','Bankkártyás fizetés'),
];
}
public static function statuses( ) {
return [
self::STATUS_NOT_PAID => Yii::t('common/transfer','Nincs fizetve'),
@@ -471,6 +480,14 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
}
return $status;
}
public function getPaymentMethodName( ) {
$status = null;
$statuses = self::paymentMethods();
if ( array_key_exists($this->payment_method, $statuses)){
$status = $statuses[$this->payment_method];
}
return $status;
}
public function beforeDelete(){
parent::beforeDelete();
@@ -721,6 +738,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
$query->andFilterWhere(['or' , $created_condition , $paid_condition]);
$query->andWhere(['transfer.status' => Transfer::STATUS_PAID]);
$query->andWhere(['account.type' => Account::TYPE_ALL]);
$query->andWhere(['transfer.payment_method' => Transfer::PAYMENT_METHOD_CASH]);
return $query->scalar();
}

4
common/models/TransferListSearch.php
View File

@@ -254,6 +254,9 @@ class TransferListSearch extends Transfer
$query->andFilterWhere(['or' , $created_condition , $paid_condition]);
$query->andWhere(['transfer.status' => Transfer::STATUS_PAID]);
if ( !$this->isModeAdmin()){
$query->andWhere(['transfer.payment_method' => Transfer::PAYMENT_METHOD_CASH]);
}
}
@@ -379,6 +382,7 @@ class TransferListSearch extends Transfer
$query->select(['coalesce(sum(transfer.count * GREATEST(( product.sale_price - coalesce(product.purchase_price,0)),0)),0) AS product_money' ]);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->andWhere(['transfer.payment_method' => Transfer::PAYMENT_METHOD_CASH]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$query->innerJoin("product", "sale.id_product = product.id_product");
$this->addQueryFilters($query);