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

Add company to login email

Browse Source
This commit is contained in:
Roland Schneider
2016-02-16 18:45:24 +01:00
parent 769b5d16de
commit 6221945bb7
7 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/controllers/SiteController.php
View File

@@ -91,7 +91,8 @@ class SiteController extends Controller
$user = User::findOne(\Yii::$app->user->id); $user = User::findOne(\Yii::$app->user->id);
$message = \Yii::$app->mailer->compose('login_admin', [ $message = \Yii::$app->mailer->compose('login_admin', [
'model' => $user, 'model' => $user,
'geoip' => $geoip 'geoip' => $geoip,
'company' => Helper::getCompany()
]); ]);
$message->setFrom( \Yii::$app->params['infoEmail'] ) $message->setFrom( \Yii::$app->params['infoEmail'] )

4
changelog.txt
View File

@@ -1,3 +1,7 @@
-0.0.35
- Forgóvilla direction mező feldolgozása
- manuális olvasás irása a door_log táblába
- Bejelentkezés email küldés: company csatolása
-0.0.34 -0.0.34
- Forgóvilla táblák hozzáadása - Forgóvilla táblák hozzáadása
-0.0.33 -0.0.33

4
common/components/Helper.php
View File

@@ -256,6 +256,10 @@ class Helper {
return \Yii::$app->params ['user_cart_item_visibility'] == 'user'; return \Yii::$app->params ['user_cart_item_visibility'] == 'user';
} }
public static function getCompany() {
return \Yii::$app->params ['company'] ;
}
public static function isCompanyMovar() { public static function isCompanyMovar() {
return \Yii::$app->params ['company'] == 'movar'; return \Yii::$app->params ['company'] == 'movar';
} }

2
common/config/params.php
View File

@@ -4,7 +4,7 @@ return [
'supportEmail' => 'rocho02@gmail.com', 'supportEmail' => 'rocho02@gmail.com',
'infoEmail' => 'info@rocho-net.hu', 'infoEmail' => 'info@rocho-net.hu',
'user.passwordResetTokenExpire' => 3600, 'user.passwordResetTokenExpire' => 3600,
'version' => 'v0.0.34', 'version' => 'v0.0.35',
'company' => 'movar',//gyor 'company' => 'movar',//gyor
'company_name' => "Freimann Kft.", 'company_name' => "Freimann Kft.",
'product_visiblity' => 'account',// on reception which products to display. account or global 'product_visiblity' => 'account',// on reception which products to display. account or global

2
common/mail/login_admin.php
View File

@@ -9,4 +9,6 @@ if ( isset($geoip->city)){
?> ?>
<b>Ip cím:</b> <?php echo $geoip->ip?><br> <b>Ip cím:</b> <?php echo $geoip->ip?><br>
<b>Város:</b> <?php echo $geoip->city?><br> <b>Város:</b> <?php echo $geoip->city?><br>
<?php }?> <?php }?>
<b>Cég:</b> <?php echo $company?><br>

1
common/mail/login_frontend.php
View File

@@ -10,3 +10,4 @@ if ( isset($geoip->city)){
<b>Ip cím:</b> <?php echo $geoip->ip?><br> <b>Ip cím:</b> <?php echo $geoip->ip?><br>
<b>Város:</b> <?php echo $geoip->city?><br> <b>Város:</b> <?php echo $geoip->city?><br>
<?php }?> <?php }?>
<b>Cég:</b> <?php echo $company?><br>

3
frontend/controllers/SiteController.php
View File

@@ -106,7 +106,8 @@ class SiteController extends Controller
$user = User::findOne(\Yii::$app->user->id); $user = User::findOne(\Yii::$app->user->id);
$message = \Yii::$app->mailer->compose('login_frontend', [ $message = \Yii::$app->mailer->compose('login_frontend', [
'model' => $user, 'model' => $user,
'geoip' => $geoip 'geoip' => $geoip,
'company' => Helper::getCompany()
]); ]);
$message->setFrom( \Yii::$app->params['infoEmail'] ) $message->setFrom( \Yii::$app->params['infoEmail'] )