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

Finish payment_type_later

Browse Source
This commit is contained in:
Roland Schneider
2016-03-25 20:06:42 +01:00
parent 13443886c1 51b28134c1
commit be4fd59339
18 changed files with 539 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/controllers/AccountStateController.php
View File

@@ -69,7 +69,6 @@ class AccountStateController extends \backend\controllers\BackendController
* @return mixed
*/
public function actionView($id) {
echo "view";
$accountState = $this->findModel ( $id );
$output = Yii::$app->getRequest ()->getQueryParam ( 'output' );
$details = null;

39
backend/controllers/TransferController.php
View File

@@ -15,6 +15,8 @@ use backend\models\TransferSaleSearch;
use common\models\ProductCategory;
use common\models\Product;
use backend\models\TransferListUserGroupedSearch;
use backend\models\TransferLaterSearch;
use yii\helpers\Url;
/**
* TransferController implements the CRUD actions for Transfer model.
@@ -29,7 +31,14 @@ class TransferController extends \backend\controllers\BackendController
'rules' => [
// allow authenticated users
[
'actions' => [ 'index','view','summary','list',"sale","sale-pdf" ,'list-user-grouped'],
'actions' => [ 'index',
'view',
'summary',
'list',
"sale",
"sale-pdf" ,
'list-user-grouped',
'payment-later'],
'allow' => true,
'roles' => ['admin','employee','reception'],
],
@@ -40,6 +49,34 @@ class TransferController extends \backend\controllers\BackendController
}
public function actionPaymentLater(){
$searchModel = new TransferLaterSearch();
if ( \Yii::$app->request->isPost){
$searchModel->load(Yii::$app->request->post());
if ( $searchModel->doPayout()) {
return $this->redirect(['transfer/payment-later' ]);
}
}
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
$accounts = Account::read();
$users = User::read();
Url::remember("payment_later",Url::current());
return $this->render('payment_later', [
'searchModel' => $searchModel,
'dataProvider' => $dataProvider,
'accounts' => $accounts,
'users' => $users,
]);
}
/**
* Lists all Transfer models.
* @return mixed

195
backend/models/TransferLaterSearch.php Normal file
View File

@@ -0,0 +1,195 @@
<?php
namespace backend\models;
use Yii;
use yii\base\Model;
use yii\data\ActiveDataProvider;
use common\models\Transfer;
use yii\db\Expression;
use yii\base\Object;
use yii\db\Query;
use yii\helpers\ArrayHelper;
use common\models\Account;
use common\components\Helper;
use common\components\RoleDefinition;
/**
* TransferSearch represents the model behind the search form about `common\models\Transfer`.
*/
class TransferLaterSearch extends Transfer
{
public $start;
public $end;
public $timestampStart;
public $timestampEnd;
public $id_ticket_type;
public $ticket_type;
public $selected = [];
public $total_money;
/**
* @inheritdoc
*/
public function rules()
{
return [
[[ 'id_ticket_type','id_user'], 'integer'],
[[ 'start', ], 'date', 'format' =>Yii::$app->formatter->datetimeFormat , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
[[ 'end' , ], 'date' ,'format' =>Yii::$app->formatter->datetimeFormat , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
['selected', 'each', 'rule' => ['integer']],
];
}
/**
* @inheritdoc
*/
public function scenarios()
{
// bypass scenarios() implementation in the parent class
return Model::scenarios();
}
/**
* Creates data provider instance with search query applied
*
* @param array $params
*
* @return ActiveDataProvider
*/
public function search($params)
{
$query = new Query();
$query->select([
'transfer.id_transfer as transfer_id_transfer',
'transfer.created_at as transfer_created_at',
'transfer.money as transfer_money',
'transfer.status as transfer_status',
'user.username as user_username',
'customer.name as customer_name',
'ticket_type.name as ticket_type_name',
'product.name as product_name',
'ticket.start as ticket_start',
'ticket.end as ticket_end',
]);
$query->from("transfer");
$query->innerJoin('user', " user.id = transfer.id_user");
$query->leftJoin('customer', " transfer.id_customer = customer.id_customer");
$query->leftJoin('ticket', " transfer.type = ".Transfer::TYPE_TICKET." and transfer.id_object = ticket.id_ticket");
$query->leftJoin('ticket_type', " ticket.id_ticket_type = ticket_type.id_ticket_type");
$query->leftJoin('sale', " transfer.type = ".Transfer::TYPE_PRODUCT." and transfer.id_object = sale.id_sale");
$query->leftJoin('product', " product.id_product = sale.id_product");
$query->andWhere(["transfer.payment_method" => Transfer::PAYMENT_METHOD_TRANSFER_LATER ]);
$query->andWhere(['transfer.status' => Transfer::STATUS_NOT_PAID]);
$dataProvider = new ActiveDataProvider([
'query' => $query,
'sort' =>[
'defaultOrder' =>[
'transfer_created_at' => SORT_DESC
],
'attributes' => Helper::mkYiiSortItems([
['transfer_created_at'],
['transfer_money'],
['transfer_status'],
['user_username'],
['customer_name'],
['ticket_type_name'],
['product_name'],
['ticket_start'],
['ticket_end'],
])
]
]);
// $query->addSelect( ['*' ]);
$this->load($params);
if (!$this->validate()) {
// uncomment the following line if you do not want to return any records when validation fails
$query->where('0=1');
return $dataProvider;
}
$query->andFilterWhere([
'ticket_type.id_ticket_type' => $this->id_ticket_type,
'transfer.id_user' => $this->id_user,
]);
$created_condition = ['and',[ '>=', 'transfer.created_at', $this->timestampStart ] ,[ '<', 'transfer.created_at', $this->timestampEnd ] ];
$paid_condition = ['and',[ '>=', 'transfer.paid_at', $this->timestampStart ] ,[ '<', 'transfer.paid_at', $this->timestampEnd ] ];
$query->andFilterWhere(['or' , $created_condition , $paid_condition]);
$qtotal = Query::create($query);
$qtotal->select([ new Expression("coalesce(sum(transfer.money),0) as transfer_money" )]);
$this->total_money = $qtotal->scalar();
return $dataProvider;
}
public function totalsTransfers( ){
}
public function doPayout(){
if ( !isset($this->selected) || count($this->selected) == 0){
Helper::flash("error", "Nincs kiválasztott tranzakció");
return false;
}
$transfers = Transfer::find()
->andWhere(['status' => Transfer::STATUS_NOT_PAID ])
->andWhere(['payment_method' => Transfer::PAYMENT_METHOD_TRANSFER_LATER])
->andWhere(['in','transfer.id_transfer',$this->selected])
->all();
if ( count($transfers) != count($this->selected)){
Helper::flash("warning", "A kiválasztott tranzakciókban időközben változás történt");
return false;
}
$db = \Yii::$app->db;
$tx = $db->beginTransaction();
try{
foreach ($transfers as $transfer){
if ( !$transfer->payout($transfer->id_account) ){
\Yii::error("Failed to payout transaction: " .$transfer->id_transfer);
throw new \Exception("Nem sikerült mententi a tranzakciókat");
}
}
$tx->commit();
Helper::flash("success", "Tranzakciók fizetettnek jelölve: " .count($transfers) . " db");
}catch (\Exception $e){
$tx->rollBack();
Helper::flash("error", "Hiba történt a művelet közben");
return false;
}
return true;
}
}

1
backend/models/TransferSearch.php
View File

@@ -143,7 +143,6 @@ class TransferSearch extends Transfer
return $dataProvider;
}
echo "start date:" .$this->timestampStart;
$query->andFilterWhere([
'transfer.id_account' => $this->id_account,

1
backend/views/account-state/_item_view.php
View File

@@ -7,6 +7,7 @@ use yii\base\Widget;
<?php
echo AccountStateBanknoteCountWidget::widget([
'model' => $model,
'showDailyDownload' =>false
]);
?>

65
backend/views/transfer/_search_payment_later.php Normal file
View File

@@ -0,0 +1,65 @@
<?php
use yii\helpers\Html;
use yii\widgets\ActiveForm;
use kartik\widgets\DatePicker;
use frontend\components\HtmlHelper;
use common\models\Transfer;
use kartik\widgets\DateTimePicker;
use common\models\TicketType;
use common\models\User;
/* @var $this yii\web\View */
/* @var $model common\models\TransferSearch */
/* @var $form yii\widgets\ActiveForm */
?>
<?php
$userOptions = ['' => 'Mind'] + HtmlHelper::mkOptions(User::find()->all(),'id','username');
$ticketTypeOptions = ['' => 'Mind'] + HtmlHelper::mkTicketTypeOptions(TicketType::find()->all());
?>
<div class="transfer-search">
<?php $form = ActiveForm::begin([
// 'action' => ['list'],
'method' => 'get',
]); ?>
<div class="row">
<div class="col-md-4">
<?= $form->field($model, 'start')->widget(DateTimePicker::classname(), [
'pluginOptions' => [
'autoclose'=>true,
'format' => 'yyyy.mm.dd hh:ii'
]
]) ?>
</div>
<div class="col-md-4">
<?= $form->field($model, 'end') ->widget(DateTimePicker::classname(), [
'pluginOptions' => [
'autoclose'=>true,
'format' => 'yyyy.mm.dd hh:ii'
]
]) ?>
</div>
</div>
<div class="row">
<div class="col-md-4">
<?= $form->field($model, 'id_ticket_type')->dropDownList($ticketTypeOptions)->label("Bérlet típus") ?>
</div>
<div class="col-md-4">
<?= $form->field($model, 'id_user')->dropDownList($userOptions) ?>
</div>
</div>
<div class="form-group">
<?= Html::submitButton(Yii::t('frontend/transfer', 'Search'), ['class' => 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
</div>

129
backend/views/transfer/payment_later.php Normal file
View File

@@ -0,0 +1,129 @@
<?php
use yii\helpers\Html;
use yii\grid\GridView;
use yii\widgets\DetailView;
use yii\base\Widget;
use yii\base\Object;
use yii\data\ArrayDataProvider;
use common\components\AccountStatisticWidget;
use common\components\DataProviderTotal;
use common\components\Helper;
use common\models\Transfer;
use yii\helpers\VarDumper;
use yii\widgets\ActiveForm;
use yii\helpers\Url;
/* @var $this yii\web\View */
/* @var $searchModel backend\models\TransferSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
$this->title = "Tranzakciók későbbi utalás fizetés típussal";
$this->params['breadcrumbs'][] = $this->title;
?>
<style>
.table-transfer .money,
.table-transfer .count,
.table-transfer .item-price
{
text-align: right;
}
</style>
<div class="transfer-index">
<h1><?= Html::encode($this->title) ?></h1>
<?php echo $this->render('_search_payment_later', ['model' => $searchModel, ]); ?>
<div style="margin-bottom: 6px;">
<?php
echo Html::a("Összes kiválasztása",null, ['class' => 'btn btn-primary select-all' ,'style' => 'margin-right: 6px;',
'onclick' => "$('.table-transfer').find(\"input[type='checkbox']\").prop('checked',true);"
]);
echo Html::a("Egyiket sem",null, ['class' => 'btn btn-primary deselect-all',
'onclick' => "$('.table-transfer').find(\"input[type='checkbox']\").prop('checked',false);"
]);
?>
</div>
<div class="transfer-form">
<?php $form = ActiveForm::begin(
[ 'action' => Url::current() ]
); ?>
<p>
Összesen: <?php echo $searchModel->total_money;?> Ft
</p>
<?= GridView::widget([
'tableOptions' => ['class' => 'table table-striped table-bordered table-transfer'],
'dataProvider' => $dataProvider,
'showFooter'=>TRUE,
'columns' => [
[
'label' => '',
'value' => function ($model, $key, $index, $column) use ( &$searchModel){
return Html::checkbox(Html::getInputName($searchModel, 'selected[]') , in_array($model['transfer_id_transfer'], $searchModel->selected) , [ 'class' => 'cart-item', 'value' => $model['transfer_id_transfer']] );
},
'format' => 'raw'
],
[
'attribute' => 'user_username',
'label' => 'Felhasználó'
],
[
'attribute' => 'customer_name',
'label' => 'Vendég'
],
[
'attribute' => 'ticket_type_name',
'label' => 'Bérlet típus'
],
[
'attribute' => 'ticket_start',
'label' => 'Érvényes -tól',
'format' => 'date'
],
[
'attribute' => 'ticket_end',
'label' => 'Érvényes -ig',
'format' => 'date'
],
[
'attribute' => 'product_name',
'label' => 'Termék'
],
[
'attribute' => 'transfer_created_at',
'label' => 'Kiadva',
'format' => 'datetime'
],
[
'attribute' => 'transfer_money',
'label' => 'Összeg'
],
[
'attribute' => 'transfer_status',
'label' => 'Státusz',
'value' => function ($model, $key, $index, $column){
return Helper::getArrayValue(Transfer::statuses(), $model['transfer_status'],'');
},
],
],
]); ?>
<div class="form-group">
<?= Html::submitButton( 'Fizetettnek jelöl', [ 'class' => 'btn btn-success' ] ) ?>
</div>
<?php ActiveForm::end(); ?>
</div>
</div>

2
common/mail/login_frontend.php
View File

@@ -5,7 +5,7 @@
<b>Felhasználó:</b> <?php echo $model->username ;?><br>
<b>Idő:</b> <?php echo \Yii::$app->formatter->asDatetime(time());?><br>
<?php
if ( isset($geoip->city)){
if ( isset($geoip) && isset($geoip->city)){
?>
<b>Ip cím:</b> <?php echo $geoip->ip?><br>
<b>Város:</b> <?php echo $geoip->city?><br>

43
common/models/Transfer.php
View File

@@ -53,6 +53,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
const PAYMENT_METHOD_CAFETERY = 40; // SZÉCHENYI KÁRTYA
// const PAYMENT_METHOD_DEBIT_MANDATE = 50;//CSOPORTOS BESZEDÉSI MEGBÍZÁS
const PAYMENT_METHOD_TRANSFER_LATER = 50;
/**
* @inheritdoc
*/
@@ -526,11 +527,24 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
self::PAYMENT_METHOD_CASH => Yii::t ( 'common/transfer', 'Készpénz' ),
self::PAYMENT_METHOD_BANCCARD => Yii::t ( 'common/transfer', 'Bankkártyás fizetés' ),
self::PAYMENT_METHOD_TRANSFER => Yii::t ( 'common/transfer', 'Átutalás' ),
self::PAYMENT_METHOD_CAFETERY => Yii::t ( 'common/transfer', 'Széchenyi kártya' )
self::PAYMENT_METHOD_CAFETERY => Yii::t ( 'common/transfer', 'Széchenyi kártya' ),
self::PAYMENT_METHOD_TRANSFER_LATER => Yii::t ( 'common/transfer', 'Átutalás később' )
]
// self::PAYMENT_METHOD_DEBIT_MANDATE => Yii::t('common/transfer','Csoportos beszedési megbízás'),
;
}
public static function paymentMethodsForProduct() {
return [
self::PAYMENT_METHOD_CASH => Yii::t ( 'common/transfer', 'Készpénz' ),
self::PAYMENT_METHOD_BANCCARD => Yii::t ( 'common/transfer', 'Bankkártyás fizetés' ),
self::PAYMENT_METHOD_TRANSFER => Yii::t ( 'common/transfer', 'Átutalás' ),
self::PAYMENT_METHOD_CAFETERY => Yii::t ( 'common/transfer', 'Széchenyi kártya' ),
]
// self::PAYMENT_METHOD_DEBIT_MANDATE => Yii::t('common/transfer','Csoportos beszedési megbízás'),
;
}
public static function statuses() {
return [
self::STATUS_NOT_PAID => Yii::t ( 'common/transfer', 'Nincs fizetve' ),
@@ -946,7 +960,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
ShoppingCart::deleteAll(['id_transfer' => $this->id_transfer]);
UserSoldItem::deleteAll(['id_transfer' => $this->id_transfer]);
}
public function payout() {
public function payout($id_account = null) {
if ($this->status != Transfer::STATUS_NOT_PAID) {
return false;
@@ -956,14 +970,18 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
$this->paid_at = Helper::getDateTimeString ();
$this->paid_by = \Yii::$app->user->id;
if( Helper::isUserCartVisibilityAll() ){
$this->id_account = Account::readDefault();
if ( isset($id_account)){
$this->id_account = $id_account;
}else{
if( Helper::isUserCartVisibilityAll() ){
$this->id_account = Account::readDefault();
}
}
ShoppingCart::deleteAll ( [ 'id_transfer' => $this->id_transfer ] );
UserSoldItem::deleteAll ( [ 'id_transfer' => $this->id_transfer
] );
return $this->save ();
return $this->save (false);
}
@@ -1067,4 +1085,19 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
return [$transfer,$ticket];
}
public static function canBeAddedToCart($payment_method) {
if ( $payment_method == Transfer::PAYMENT_METHOD_TRANSFER_LATER){
return false;
}
return true;
}
public static function canMarkPaidByReception($payment_method) {
if ( $payment_method == Transfer::PAYMENT_METHOD_TRANSFER_LATER){
return false;
}
return true;
}
}

20
common/views/total/total_detailed_money_movement.php
View File

@@ -23,18 +23,24 @@
</tr>
<?php } ?>
<?php if ( count($model->moneyMovements ) == 0 ) {
?>
<tr>
<td colspan="7" style="text-align: right; padding: 3px;">
Nincs találat
</td>
</tr>
<?php
}?>
</tbody>
</table>
<?php if ( count($model->moneyMovements ) == 0 ) {
?>
Nincs találat
<?php
}else{?>
<?php if ( count($model->moneyMovements ) > 0 ) {
?>
<div class="row">
<div class="col-md-12 text-right" style="text-decoration: underline;">
Összesen: <?php echo \Yii::$app->formatter->asInteger( $model->moneyMovementMoneis); ?> Ft
</div>
</div>
<?php

13
frontend/components/AccountStateBanknoteCountWidget.php
View File

@@ -22,6 +22,7 @@ class AccountStateBanknoteCountWidget extends Widget{
public $model;
public $layout;
public $index;
public $showDailyDownload = true;
public function run(){
@@ -60,11 +61,13 @@ class AccountStateBanknoteCountWidget extends Widget{
$s .= Html::a( Html::tag("span","",['class' =>'glyphicon glyphicon-download-alt']) ."&nbsp;Pdf", Url::to([ 'view', 'id' =>$this->model->id_account_state, 'output' =>'pdf']) ,['class' => 'btn btn-primary btn-pdf','style' =>'margin-bottom: 12px; margin-right: 6px;']);
if ( $this->model->isTypeClose() ){
$s .= Html::a('<span class="glyphicon glyphicon-eye-open"></span>&nbsp;Napi összefoglaló', Url::toRoute(['mixed','id' =>$this->model->id_account_state]), [
'title' => 'Napi összefoglaló',
'class' => 'btn btn-success',
'style' =>'margin-bottom: 12px; margin-right: 6px;'
]);
if ( $this->showDailyDownload ){
$s .= Html::a('<span class="glyphicon glyphicon-eye-open"></span>&nbsp;Napi összefoglaló', Url::toRoute(['mixed','id' =>$this->model->id_account_state]), [
'title' => 'Napi összefoglaló',
'class' => 'btn btn-success',
'style' =>'margin-bottom: 12px; margin-right: 6px;'
]);
}
}
$s .= Html::a('<span class="glyphicon glyphicon-eye-open"></span>&nbsp;Részletek', Url::toRoute(['view','id' =>$this->model->id_account_state]), [

5
frontend/controllers/SiteController.php
View File

@@ -94,8 +94,11 @@ class SiteController extends Controller
$geoip = Helper::getGeoIp();
$message = "";
$user = User::findOne(\Yii::$app->user->id);
$message = "Bejelentkezés: " .$user->username. " Ip cím:". $geoip->ip . " Város: " . $geoip->city;
if ( isset($geoip)){
$message = "Bejelentkezés: " .$user->username. " Ip cím:". $geoip->ip . " Város: " . $geoip->city;
}
Log::log([
'type' =>Log::$TYPE_LOGIN,

24
frontend/models/ProductSaleForm.php
View File

@@ -192,7 +192,9 @@ class ProductSaleForm extends Model
$customer = null;
$paid_at;
$status = Transfer::STATUS_PAID;
if ( $this->isAppendToUserCart() ){
if ( !Transfer::canMarkPaidByReception($this->payment_method)){
$status = Transfer::STATUS_NOT_PAID;
}else if ( $this->isAppendToUserCart() ){
$status = Transfer::STATUS_NOT_PAID;
}else if ( $this->isAppendToCustomerCart() ){
$status = Transfer::STATUS_NOT_PAID;
@@ -237,10 +239,12 @@ class ProductSaleForm extends Model
public function appendToUserCart(){
if ( $this->isAppendToUserCart() ){
$item = new UserSoldItem();
$item->id_transfer = $this->transfer->id_transfer;
$item->id_user = Yii::$app->user->id;
$item->save(false);
if ( Transfer::canBeAddedToCart($this->payment_method)){
$item = new UserSoldItem();
$item->id_transfer = $this->transfer->id_transfer;
$item->id_user = Yii::$app->user->id;
$item->save(false);
}
}
}
public function isAppendToCustomerCart(){
@@ -253,10 +257,12 @@ class ProductSaleForm extends Model
public function appendToCustomerCart(){
if ( $this->isAppendToCustomerCart() && isset($this->customer) ){
$item = new ShoppingCart();
$item->id_customer = $this->customer->id_customer;
$item->id_transfer = $this->transfer->id_transfer;
$item->save(false);
if ( Transfer::canBeAddedToCart($this->payment_method)){
$item = new ShoppingCart();
$item->id_customer = $this->customer->id_customer;
$item->id_transfer = $this->transfer->id_transfer;
$item->save(false);
}
}
}
}

25
frontend/models/TicketCreate.php
View File

@@ -217,7 +217,10 @@ class TicketCreate extends Ticket{
$transfer->id_account = $this->_account->id_account;
$status = Transfer::STATUS_PAID;
if ( $this->isAppendToUserCart() ){
if ( !Transfer::canMarkPaidByReception( $this->payment_method ) ){
$status = Transfer::STATUS_NOT_PAID;
}else if ( $this->isAppendToUserCart() ){
$status = Transfer::STATUS_NOT_PAID;
}else if ( $this->isAppendToCustomerCart() ){
$status = Transfer::STATUS_NOT_PAID;
@@ -284,15 +287,17 @@ class TicketCreate extends Ticket{
}
public function appendToCustomerCart(){
if ( $this->isAppendToCustomerCart() && isset($this->customer) ){
$item = new ShoppingCart();
$item->id_customer = $this->customer->id_customer;
$item->id_transfer = $this->_transfer->id_transfer;
if ( !$item->save(false) ){
\Yii::error("Nem sikerült menteni a bérletet! Vendég kosár hozzárendelés sikertelen!");
throw new \Exception("Nem sikerült menteni a bérletet! Vendég kosár hozzárendelés sikertelen!");
}
if ( Transfer::canBeAddedToCart($this->payment_method)){
if ( $this->isAppendToCustomerCart() && isset($this->customer) ){
$item = new ShoppingCart();
$item->id_customer = $this->customer->id_customer;
$item->id_transfer = $this->_transfer->id_transfer;
if ( !$item->save(false) ){
\Yii::error("Nem sikerült menteni a bérletet! Vendég kosár hozzárendelés sikertelen!");
throw new \Exception("Nem sikerült menteni a bérletet! Vendég kosár hozzárendelés sikertelen!");
}
}
}
}

2
frontend/views/account-state/_mixed.php
View File

@@ -4,6 +4,8 @@ use common\components\total\TotalDetailedMoneyMovementWidget;
?>
<p>Bérletek típus szerint</p>
<?php echo TotalMediumTicketsWidget::widget(['dailyListing' => $details]);?>
<p>Termékek kategória szerint</p>

9
frontend/views/account-state/mixed_pdf.php
View File

@@ -3,7 +3,14 @@ use common\components\accountstate\AccountStateWidget;
use common\components\total\TotalDifferenceWidget;
?>
<style>
.table td{
padding: 2px;
}
.table th{
padding: 2px;
}
</style>
<div class="account-state-view ">
<table class="table-top">

7
frontend/views/card/index.php
View File

@@ -45,11 +45,14 @@ $this->params['breadcrumbs'][] = $this->title;
['class' => 'yii\grid\ActionColumn',
'template' => '{ticket} {ticket_history} {keys} {contract}',
'template' => '{ticket} {product} {ticket_history} {keys} {contract}',
'buttons' => [
'ticket' => function ($url, $model, $key) {
return Html::a('Új bérlet', $url, ['class'=> 'btn btn-xs btn-success' ]) ;
},
'product' => function ($url, $model, $key) {
return Html::a('Új termék', $url, ['class'=> 'btn btn-xs btn-success' ]) ;
},
'ticket_history' => function ($url, $model, $key) {
return Html::a('Befizetések', $url, ['class'=> 'btn btn-xs btn-success' ]) ;
},
@@ -64,6 +67,8 @@ $this->params['breadcrumbs'][] = $this->title;
$url = "";
if ( 'ticket' == $action ){
$url = Url::to(['ticket/create','number' => $model['card_number']]);
}else if ( 'product' == $action ){
$url = Url::to(['product/sale','number' => $model['card_number']]);
}else if ( 'ticket_history' == $action ){
$url = Url::to(['ticket/index','number' => $model['card_number']]);
}else if ( 'keys' == $action ){

2
frontend/views/product/_sale_form.php
View File

@@ -98,7 +98,7 @@ $discountOptions = mkOptions( ArrayHelper::map($discounts, 'id_discount', 'name'
</div>
<div class="row">
<div class='col-md-12'>
<?php echo $form->field($model,'payment_method')->dropDownList(Transfer::paymentMethods()) ?>
<?php echo $form->field($model,'payment_method')->dropDownList(Transfer::paymentMethodsForProduct()) ?>
</div>
</div>
<div class="row">