+
field($model, 'created_in_interval')->checkbox( ) ?>
-
+
field($model, 'expire_in_interval')->checkbox( ) ?>
+
+ field($model, 'paid_in_interval')->checkbox( ) ?>
+
\ No newline at end of file
diff --git a/backend/views/ticket/view.php b/backend/views/ticket/view.php
index 5a6e79e..97bf41c 100644
--- a/backend/views/ticket/view.php
+++ b/backend/views/ticket/view.php
@@ -11,47 +11,43 @@ $this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket', 'Tickets'),
$this->params['breadcrumbs'][] = $this->title;
?>
-
title) ?>
-
-
$model,
'attributes' => [
'id_ticket',
- [
- 'attribute' => 'id_user',
- 'value' => $model->user->username,
-
- ],
- [
- 'attribute' => 'id_ticket_type',
- 'value' => $model->ticketTypeName,
-
- ],
- [
- 'attribute' => 'id_account',
- 'value' => $model->accountName,
-
- ],
- [
- 'attribute' => 'id_discount',
- 'value' => $model->discountName,
-
- ],
- 'start:datetime',
- 'end:datetime',
+ [
+ 'attribute' => 'id_user',
+ 'value' => $model->user->username,
+
+ ],
+ [
+ 'attribute' => 'id_ticket_type',
+ 'value' => $model->ticketTypeName,
+
+ ],
+ [
+ 'attribute' => 'id_account',
+ 'value' => $model->accountName,
+
+ ],
+ [
+ 'attribute' => 'id_discount',
+ 'value' => $model->discountName,
+
+ ],
+ 'start:date',
+ 'end:date',
'max_usage_count',
'usage_count',
- [
- 'attribute' => 'status',
- 'value' => $model->statusName
- ],
+ [
+ 'attribute' => 'status',
+ 'value' => $model->statusName
+ ],
'price_brutto',
'comment:raw',
- 'created_at',
- 'updated_at',
+ 'created_at:datetime',
+ 'updated_at:datetime',
],
]) ?>
-
diff --git a/backend/web/css/ticket-index-pdf.css b/backend/web/css/ticket-index-pdf.css
new file mode 100644
index 0000000..c537995
--- /dev/null
+++ b/backend/web/css/ticket-index-pdf.css
@@ -0,0 +1,17 @@
+*{
+ font-family: "Times New Roman";
+}
+
+table{
+ border-collapse: collapse;
+}
+
+th, td {
+ padding: 3px;
+ border: 1px solid #e2e2e2;
+}
+
+
+.filter-table th{
+ text-align: left;
+}
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index 4eae589..cd5587a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+-0.0.76
+ - add backend ticket changes
+ - add backend ticket export xls/pdf
-0.0.75
- add unpaid tickets display
-0.0.74
diff --git a/common/config/params.php b/common/config/params.php
index a5b82df..9961e15 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -5,7 +5,7 @@ return [
'supportEmail' => 'rocho02@gmail.com',
'infoEmail' => 'info@rocho-net.hu',
'user.passwordResetTokenExpire' => 3600,
- 'version' => 'v0.0.75',
+ 'version' => 'v0.0.76',
'company' => 'movar',//gyor
'company_name' => "Freimann Kft.",
'product_visiblity' => 'account',// on reception which products to display. account or global
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index add47ae..18fef6a 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -478,6 +478,17 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
return $result;
}
+
+ public static function toStatusName($id) {
+ $result = "";
+ $arr = static::statuses();
+
+ if (array_key_exists ( $id, $arr )) {
+ $result = $arr [$id];
+ }
+
+ return $result;
+ }
public static function readUserSoldTransfers($user) {
$transfers = [ ];
diff --git a/tests/codeception/backend/acceptance.suite.yml b/tests/codeception/backend/acceptance.suite.yml
index 1828a04..e0062e5 100644
--- a/tests/codeception/backend/acceptance.suite.yml
+++ b/tests/codeception/backend/acceptance.suite.yml
@@ -11,18 +11,18 @@
class_name: AcceptanceTester
modules:
enabled:
- - PhpBrowser
+ # - PhpBrowser
- tests\codeception\common\_support\FixtureHelper
# you can use WebDriver instead of PhpBrowser to test javascript and ajax.
# This will require you to install selenium. See http://codeception.com/docs/04-AcceptanceTests#Selenium
# "restart" option is used by the WebDriver to start each time per test-file new session and cookies,
# it is useful if you want to login in your app in each test.
-# - WebDriver
+ - WebDriver
config:
- PhpBrowser:
+# PhpBrowser:
# PLEASE ADJUST IT TO THE ACTUAL ENTRY POINT WITHOUT PATH INFO
- url: http://localhost:8080
-# WebDriver:
-# url: http://localhost:8080
-# browser: firefox
-# restart: true
+# url: http://localhost/fitness-web
+ WebDriver:
+ url: http://localhost
+ browser: firefox
+ restart: true
diff --git a/tests/codeception/backend/acceptance/LoginCept.php b/tests/codeception/backend/acceptance/LoginCept.php
index 898b1c9..f01b172 100644
--- a/tests/codeception/backend/acceptance/LoginCept.php
+++ b/tests/codeception/backend/acceptance/LoginCept.php
@@ -10,11 +10,22 @@ $I->wantTo('ensure login page works');
$loginPage = LoginPage::openBy($I);
+if (method_exists($I, 'wait')) {
+ $I->wait(10); // only for selenium
+}
+
+$I->expectTo('see that login button');
+$I->see('Fitness');
+
+/*
$I->amGoingTo('submit login form with no data');
$loginPage->login('', '');
if (method_exists($I, 'wait')) {
$I->wait(3); // only for selenium
}
+*/
+
+/*
$I->expectTo('see validations errors');
$I->see('Username cannot be blank.', '.help-block');
$I->see('Password cannot be blank.', '.help-block');
@@ -27,16 +38,16 @@ if (method_exists($I, 'wait')) {
}
$I->expectTo('see validations errors');
$I->see('Incorrect username or password.', '.help-block');
+*/
$I->amGoingTo('try to login with correct credentials');
-$loginPage->login('erau', 'password_0');
+$loginPage->login('admin', 'test');
if (method_exists($I, 'wait')) {
- $I->wait(3); // only for selenium
+ $I->wait(10); // only for selenium
}
$I->expectTo('see that user is logged');
-$I->seeLink('Logout (erau)');
-$I->dontSeeLink('Login');
-$I->dontSeeLink('Signup');
+$I->see('Üdvözöljük adminisztrációs felületünkön');
+//$I->dontSeeLink('Signup');
/** Uncomment if using WebDriver
* $I->click('Logout (erau)');
* $I->dontSeeLink('Logout (erau)');
diff --git a/tests/codeception/backend/acceptance/ObjectCept.php b/tests/codeception/backend/acceptance/ObjectCept.php
new file mode 100644
index 0000000..af7b158
--- /dev/null
+++ b/tests/codeception/backend/acceptance/ObjectCept.php
@@ -0,0 +1,30 @@
+wantTo('entrar al sistema');
+ $I->amOnPage('/');
+ $I->seeInCurrentUrl('/admin/login');
+ $I->fillField('user','perry');
+ $I->fillField('pass','pass-perry');
+ $I->click('Login');
+ $I->see('You\'re logged!');
+ $this->cookie = $I->grabCookie('your-session-cookie-name');
+ }
+ */
+}
\ No newline at end of file
diff --git a/tests/codeception/backend/codeception.yml b/tests/codeception/backend/codeception.yml
index 99f1bb2..fadb7f0 100644
--- a/tests/codeception/backend/codeception.yml
+++ b/tests/codeception/backend/codeception.yml
@@ -14,4 +14,4 @@ settings:
config:
# the entry script URL (with host info) for functional and acceptance tests
# PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
- test_entry_url: http://localhost:8080/backend/web/index-test.php
+ test_entry_url: http://localhost/fitness-web/backend/web/index-test.php
diff --git a/tests/codeception/backend/functional/LoginCept.php b/tests/codeception/backend/functional/LoginCept.php
index 7e7e26d..d9ff749 100644
--- a/tests/codeception/backend/functional/LoginCept.php
+++ b/tests/codeception/backend/functional/LoginCept.php
@@ -5,6 +5,7 @@ use tests\codeception\common\_pages\LoginPage;
/* @var $scenario Codeception\Scenario */
+/*
$I = new FunctionalTester($scenario);
$I->wantTo('ensure login page works');
@@ -28,3 +29,4 @@ $I->expectTo('see that user is logged');
$I->seeLink('Logout (erau)');
$I->dontSeeLink('Login');
$I->dontSeeLink('Signup');
+*/
\ No newline at end of file
diff --git a/tests/codeception/common/fixtures/data/init_login.php b/tests/codeception/common/fixtures/data/init_login.php
index 841e279..ca6d9d1 100644
--- a/tests/codeception/common/fixtures/data/init_login.php
+++ b/tests/codeception/common/fixtures/data/init_login.php
@@ -11,4 +11,14 @@ return [
'updated_at' => '1392559490',
'email' => 'sfriesen@jenkins.info',
],
+ [
+ 'username' => 'admin',
+ 'auth_key' => 'TzZY5KoLbg4VTxwaxs5OoxhFwNt_VeIv',
+ 'password_hash' => '$2y$13$oWyHf7oSB7XktVe0pEhfROahmxr9NWbYo0o3z69aH6rnBf0oyhTSe',
+ 'password_reset_token' => 'RkD_Jw0_8HEedzLk7MM-ZKEFfYR7VbMr_1392559490',
+ 'email' => 'admin@rocho-net.hu',
+ 'status' => 10,
+ 'created_at' => '1446658188',
+ 'updated_at' => '1461356211',
+ ],
];
diff --git a/tests/codeception/config/backend/fixtures/initdb.php b/tests/codeception/config/backend/fixtures/initdb.php
new file mode 100644
index 0000000..7ba9fef
--- /dev/null
+++ b/tests/codeception/config/backend/fixtures/initdb.php
@@ -0,0 +1 @@
+INSERT INTO user (id,username,auth_key,password_hash,password_reset_token,email,status,created_at,updated_at) VALUES (1,'admin','TzZY5KoLbg4VTxwaxs5OoxhFwNt_VeIv','$2y$13$oWyHf7oSB7XktVe0pEhfROahmxr9NWbYo0o3z69aH6rnBf0oyhTSe',null,'admin@rocho-net.hu',10,1446658188,1461356211);
diff --git a/tests/codeception/config/config.php b/tests/codeception/config/config.php
index b478679..6f23d05 100644
--- a/tests/codeception/config/config.php
+++ b/tests/codeception/config/config.php
@@ -14,7 +14,10 @@ return [
],
'components' => [
'db' => [
- 'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_tests',
+ 'dsn' => 'mysql:host=localhost;dbname=fitness_codecept',
+ 'username' => 'root',
+ 'password' => '',
+ 'charset' => 'utf8',
],
'mailer' => [
'useFileTransport' => true,