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

fix account_state ( collection_money ), display product/ticket on reception only for selected account, add daily transfers (reception/admin)

Browse Source
This commit is contained in:
Schneider Roland
2015-12-31 13:52:22 +01:00
parent 72fc139674
commit f59eadd8cc
26 changed files with 1153 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/views/account-state/close.php
View File

@@ -13,7 +13,6 @@ $this->params['breadcrumbs'][] = $this->title;
AccountStateAsset::register($this);
$options = [];
$this->registerJs ( 'new AccountState( '. json_encode($options).');' );
?>
<div class="account-state-create">

9
frontend/views/layouts/main.php
View File

@@ -68,7 +68,14 @@ AppAsset::register($this);
<div class="container">
<p class="pull-left">&copy; <?= Yii::$app->name ?> <?= Yii::$app->params['version'] ?> Fitness - WebAdmin <?= date('Y') ?></p>
<p class="pull-right"><?= Yii::powered() ?></p>
</div>
<div class="container">
<div>
Az oldalon szereplő adatok csak tájékoztató jellegűek.<br>
Az adatok helyességéért és igazságtartalmáért felelősséget nem vállalunk.<br>
Az oldal nem használható hivatalos adatforrásként.<br>
</div>
</div>
</footer>

3
frontend/views/product/sale.php
View File

@@ -6,6 +6,7 @@ use frontend\assets\ProductSellAsset;
use frontend\components\ReceptionWidget;
use yii\bootstrap\ActiveForm;
use yii\helpers\Url;
use yii\helpers\ArrayHelper;
/* @var $this yii\web\View */
/* @var $form yii\bootstrap\ActiveForm */
@@ -82,7 +83,7 @@ $this->params['breadcrumbs'][] = Yii::t('frontend/product', 'Sale');
}
</style>
<?php echo ReceptionWidget::widget( ['form' => $receptionForm, 'route' => ['customer/reception'] ] )?>
<div class='row '>

1
frontend/views/ticket/create.php
View File

@@ -30,6 +30,7 @@ $options['clear_cart_url'] = Url::toRoute(['product/clear-list']);
$options['types'] = TicketType::modelsToArray($ticketTypes);
$options['user_cart'] = $model->userCart;
$options['customer_cart'] = $model->customerCart;
$options['selected_type'] = count($ticketTypes) > 0 ? $ticketTypes[0]->id_ticket_type : 0;
$this->registerJs ( 'new TicketSell( '. json_encode($options).');' );
?>

4
frontend/views/transfer/_view.php
View File

@@ -1,6 +1,7 @@
<?php
use yii\helpers\Html;
use common\models\Transfer;
/* @var $this yii\web\View */
@@ -35,6 +36,9 @@ $formatter = Yii::$app->formatter;
<dl class="dl-horizontal dl-transfer">
<dt><?php echo $model->getAttributeLabel( 'type') ?></dt>
<dd><?php echo Html::getAttributeValue($model, 'transferTypeName') ?></dd>
<dt>Megnevezés</dt>
<dd><?php echo Html::getAttributeValue($model, 'objectName') ?></dd>
<dt><?php echo $model->getAttributeLabel( 'id_user') ?></dt>
<dd><?php echo Html::getAttributeValue($model, 'userName') ?></dd>

36
frontend/views/transfer/list.php
View File

@@ -232,6 +232,11 @@ td.name{
</div>
<div role="tabpanel" class="tab-pane" id="detailed">
<h2>Részletes összesítés</h2>
<?php
//////////////////////////
// Bérletek
////////////////////////
?>
<h3>Bérletek</h3>
<table class="table table-bordered table-striped table-summary">
<thead>
@@ -239,6 +244,7 @@ td.name{
<th>Kiadva</th>
<th>Fizetve</th>
<th>Kassza</th>
<th>Felhasználó</th>
<th>Bérlet típus</th>
<th>Egység ár</th>
<th>Mennyiség</th>
@@ -248,13 +254,14 @@ td.name{
<tbody>
<?php foreach ($searchModel->tickets as $t ){?>
<tr>
<td><?php echo $t['ticket_created_at']?> </td>
<td><?php echo $t['ticket_paid_at']?> </td>
<td><?php echo $t['account_name']?> </td>
<td><?php echo $t['ticket_type_name'] ?></td>
<td class='money'><?php echo $t['ticket_item_price']?> Ft</td>
<td class='count'><?php echo $t['ticket_count']?> Db</td>
<td class='money'><?php echo $t['ticket_money']?> FT</td>
<td><?php echo $t['ticket_created_at']?> </td>
<td><?php echo $t['ticket_paid_at']?> </td>
<td><?php echo $t['account_name']?> </td>
<td><?php echo $t['user_name']?> </td>
<td><?php echo $t['ticket_type_name'] ?></td>
<td class='money'><?php echo $t['ticket_item_price']?> Ft</td>
<td class='count'><?php echo $t['ticket_count']?> Db</td>
<td class='money'><?php echo $t['ticket_money']?> FT</td>
</tr>
<?php } ?>
@@ -275,6 +282,11 @@ td.name{
<?php
}
?>
<?php
//////////////////////////
// Termék eladás
////////////////////////
?>
<h3>Termék eladások</h3>
<table class="table table-bordered table-striped table-summary">
<thead>
@@ -282,6 +294,7 @@ td.name{
<th>Kiadva</th>
<th>Fizetve</th>
<th>Kassza</th>
<th>Felhasználó</th>
<th>Kategória</th>
<th>Termék</th>
<th>Egység ár</th>
@@ -295,6 +308,7 @@ td.name{
<td><?php echo $p['product_created_at']?> </td>
<td><?php echo $p['product_paid_at']?> </td>
<td><?php echo $p['account_name']?> </td>
<td><?php echo $p['user_name']?> </td>
<td><?php echo $p['product_category_name'] ?></td>
<td><?php echo $p['product_name'] ?></td>
<td class='money'><?php echo $p['product_item_price']?> Ft</td>
@@ -320,13 +334,18 @@ td.name{
<?php
}
?>
<?php
//////////////////////////
// Pénzmozgások
////////////////////////
?>
<h3>Pénzmozgások</h3>
<table class="table table-bordered table-striped table-summary">
<thead>
<tr>
<th>Dátum</th>
<th>Kassza</th>
<th>Felhasználó</th>
<th>Név</th>
<th>Típus</th>
<th>Összeg</th>
@@ -337,6 +356,7 @@ td.name{
<tr>
<td><?php echo $p['money_movement_created_at']?> </td>
<td><?php echo $p['account_name']?> </td>
<td><?php echo $p['user_name']?> </td>
<td><?php echo $p['money_movement_name'] ?></td>
<td><?php echo $p['money_movement_type_name'] ?></td>
<td class='money'><?php echo $p['signed_money']?> Ft</td>