| Dátum | @@ -7,20 +6,20 @@Felhasználó | Név | Típus | -Összeg | Megjegyzés | +Összeg | ||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| - | - | - | - | + | + | + | + | + | + | formatter->asInteger( $p['signed_money'])?> Ft | -
| Bérlet típus | diff --git a/common/views/total/total_product_by_category.php b/common/views/total/total_product_by_category.php new file mode 100644 index 0000000..0a7e190 --- /dev/null +++ b/common/views/total/total_product_by_category.php @@ -0,0 +1,37 @@ +productMoneies; + + ?> + +
|---|
| Kategória | +Mennyiség | +Összeg | +
|---|---|---|
| + | Db | +formatter->asInteger( $p['product_money'])?> FT | +
+
\ No newline at end of file
diff --git a/frontend/components/AccountStateBanknoteCountWidget.php b/frontend/components/AccountStateBanknoteCountWidget.php
index b4c05fd..31ad4ea 100644
--- a/frontend/components/AccountStateBanknoteCountWidget.php
+++ b/frontend/components/AccountStateBanknoteCountWidget.php
@@ -59,6 +59,11 @@ class AccountStateBanknoteCountWidget extends Widget{
$s .= Html::a( Html::tag("span","",['class' =>'glyphicon glyphicon-download-alt']) ." 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;']);
+ $s .= Html::a(' 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(' Részletek', Url::toRoute(['view','id' =>$this->model->id_account_state]), [
'title' => 'Részletek',
'class' => 'btn btn-success',
diff --git a/frontend/controllers/AccountStateController.php b/frontend/controllers/AccountStateController.php
index f19fa98..403fdd7 100644
--- a/frontend/controllers/AccountStateController.php
+++ b/frontend/controllers/AccountStateController.php
@@ -27,7 +27,8 @@ class AccountStateController extends Controller {
'index',
'open',
'close',
- 'view'
+ 'view' ,
+ 'mixed'
],
'rules' => [
// allow authenticated users
@@ -301,4 +302,63 @@ class AccountStateController extends Controller {
] );
}
}
+
+
+ public function actionMixed($id){
+ $accountState = $this->findModel ( $id );
+ $output = Yii::$app->getRequest ()->getQueryParam ( 'output' );
+ $details = null;
+
+ if ($accountState->isTypeClose ()) {
+
+ $prev;
+ if ($accountState->type == AccountState::TYPE_CLOSE) {
+ if (isset ( $accountState->prev_state )) {
+ $prev = AccountState::findOne ( $accountState->prev_state );
+ }
+ if (isset ( $prev )) {
+ $accountState->start_date = $prev->created_at;
+ }
+ }
+ $details = new DailyListing ();
+ $details->loadAccountState ( $accountState );
+
+ $details->readTotalEasy ();
+ $details->readTotalDetailed ();
+ $details->readTotalMedium ();
+
+ }
+
+
+ if ($output == 'pdf') {
+ $user = User::findOne(\Yii::$app->user->id);
+ $mpdf=new \mPDF('utf-8', 'A4');
+ $mpdf->useSubstitutions=false;
+ $mpdf->simpleTables = true;
+ $mpdf->SetHeader( \Yii::$app->params[ "company_name" ] . " - Létrehozva: " .$user->username . ", ".\Yii::$app->formatter->asDatetime(time()) );
+ $mpdf->setFooter('{PAGENO} / {nb}');
+
+ $stylesheet = file_get_contents( \Yii::getAlias('@vendor'.'/bower/bootstrap/dist/css/bootstrap.css')); // external css
+ $mpdf->WriteHTML($stylesheet,1);
+
+ $stylesheet = file_get_contents( \Yii::getAlias('@frontend'.'/web/css/account_close.css')); // external css
+ $mpdf->WriteHTML($stylesheet,1);
+
+
+ $mpdf->WriteHTML($this->renderPartial("@frontend/views/account-state/mixed_pdf", [
+ 'model' => $accountState,
+ 'details' => $details
+ ]));
+ $type = $accountState->isTypeOpen() ? "kassza_nyitas" : "kassza_zaras";
+ $dt= "_letrehozva_".date("Ymd_His"). "_" . $user->username;
+ $fn= $type .$dt.".pdf";
+ $mpdf->Output($fn, 'D');
+ exit();
+
+ }
+ return $this->render ( 'mixed', [
+ 'model' => $accountState,
+ 'details' => $details
+ ] );
+ }
}
diff --git a/frontend/views/account-state/_mixed.php b/frontend/views/account-state/_mixed.php
new file mode 100644
index 0000000..72c3186
--- /dev/null
+++ b/frontend/views/account-state/_mixed.php
@@ -0,0 +1,21 @@
+
+
+
+ Összesen:
+ formatter->asInteger( $model->productsByCategory ['total']);
+ ?> Ft
+
+Bérletek típus szerint
+ $details]);?> +Termékek kategória szerint
+ $details]);?> +Pénzmozgások
+ $details]);?> + +Összesen
+| Végösszeg bruttó | +formatter->asInteger( $model->money)?> FT | +
|---|
+
+
+
+
+
+render('_mixed', [
+ 'model' => $model,
+ 'details' => $details
+ ] ); ?>
+
\ No newline at end of file
diff --git a/frontend/views/account-state/mixed_pdf.php b/frontend/views/account-state/mixed_pdf.php
new file mode 100644
index 0000000..8eaf501
--- /dev/null
+++ b/frontend/views/account-state/mixed_pdf.php
@@ -0,0 +1,45 @@
+
+
+
+Napi összefoglaló
+ + hasDifferenceToPrevState() ){ + if ( $model->hasMinus()){ + ?> +Negatív különbözet
+
+ Pozitív különbözet
+
+ $model]) ?>
+
+ 'glyphicon glyphicon-download-alt'])." Pdf", Url::current(['output' =>'pdf']) ,['class' => 'btn btn-primary btn-pdf']);
+ ?>
+
+ hasDifferenceToPrevState() ){
+ ?>
+ Különbözet
+ $model] ); + + } + +?> +
+
+
+
+
+
+
+
+
+render('_mixed', [
+ 'model' => $model,
+ 'details' => $details
+ ] ); ?>
+
\ No newline at end of file
diff --git a/frontend/views/account-state/view.php b/frontend/views/account-state/view.php
index aeaab98..93ed468 100644
--- a/frontend/views/account-state/view.php
+++ b/frontend/views/account-state/view.php
@@ -15,6 +15,7 @@ use yii\base\Widget;
use common\models\AccountState;
use yii\helpers\Url;
use common\components\accountstate\AccountStateWidget;
+use common\components\total\TotalProductsByCategoryWidget;
/* @var $this yii\web\View */
/* @var $model common\models\AccountState */
@@ -81,6 +82,8 @@ $this->params['breadcrumbs'][] = $this->title;
role="tab" data-toggle="tab">Részletes összesítő
|
+ Zárás összefoglaló + $model]) ?> + |
+
+ hasDifferenceToPrevState() ){
+ ?>
+ hasMinus()){
+ ?>
+ Negatív különbözet + +Pozitív különbözet + $model] ); + + } + ?> + |
+
Címletek
$model]);?> +
+
diff --git a/frontend/views/contract/_contract.php b/frontend/views/contract/_contract.php
index f0f08a7..c1cd48b 100644
--- a/frontend/views/contract/_contract.php
+++ b/frontend/views/contract/_contract.php
@@ -32,7 +32,6 @@ use common\components\Azaz;
$img = "Részletek
+ $details]);?> + $details]);?> + $details]);?> +![](" . \Yii::getAlias("@webroot") . DIRECTORY_SEPARATOR. "images" . DIRECTORY_SEPARATOR . "alairas.jpg)
";
-
?>