Add company to login email

2016-02-16 18:45:24 +01:00 · 2016-02-16 18:45:24 +01:00 · 6221945bb7
commit 6221945bb7
parent 769b5d16de
7 changed files with 16 additions and 3 deletions
--- a/backend/controllers/SiteController.php
+++ b/backend/controllers/SiteController.php
@ -91,7 +91,8 @@ class SiteController extends Controller
    		$user  = User::findOne(\Yii::$app->user->id);
    		$message = \Yii::$app->mailer->compose('login_admin', [
    				'model' => $user,
-    				'geoip' => $geoip
+    				'geoip' => $geoip,
+    				'company' => Helper::getCompany()
    		]);
    		 
    		$message->setFrom(  \Yii::$app->params['infoEmail'] )
--- a/changelog.txt
+++ b/changelog.txt
@ -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
 	- Forgóvilla táblák hozzáadása
 -0.0.33
--- a/common/components/Helper.php
+++ b/common/components/Helper.php
@ -256,6 +256,10 @@ class Helper {
 		return \Yii::$app->params ['user_cart_item_visibility'] == 'user';
 	}
 	
+	public static function getCompany() {
+		return \Yii::$app->params ['company']  ;
+	}
+	
 	public static function isCompanyMovar() {
 		return \Yii::$app->params ['company'] == 'movar';
 	}
--- a/common/config/params.php
+++ b/common/config/params.php
@ -4,7 +4,7 @@ return [
    'supportEmail' => 'rocho02@gmail.com',
    'infoEmail' => 'info@rocho-net.hu',
    'user.passwordResetTokenExpire' => 3600,
-	'version' => 'v0.0.34',
+	'version' => 'v0.0.35',
 	'company' => 'movar',//gyor
 	'company_name' => "Freimann Kft.",
 	'product_visiblity' => 'account',// on reception which products to display. account or global
--- a/common/mail/login_admin.php
+++ b/common/mail/login_admin.php
@ -9,4 +9,6 @@ if ( isset($geoip->city)){
 ?>
 	<b>Ip cím:</b> <?php echo $geoip->ip?><br>
 	<b>Város:</b> <?php echo $geoip->city?><br>
+	
 <?php }?>
+<b>Cég:</b> <?php echo $company?><br>
--- a/common/mail/login_frontend.php
+++ b/common/mail/login_frontend.php
@ -10,3 +10,4 @@ if ( isset($geoip->city)){
 	<b>Ip cím:</b> <?php echo $geoip->ip?><br>
 	<b>Város:</b> <?php echo $geoip->city?><br>
 <?php }?>
+	<b>Cég:</b> <?php echo $company?><br>
--- a/frontend/controllers/SiteController.php
+++ b/frontend/controllers/SiteController.php
@ -106,7 +106,8 @@ class SiteController extends Controller
 	    	$user  = User::findOne(\Yii::$app->user->id);
 	    	$message = \Yii::$app->mailer->compose('login_frontend', [
 	    			'model' => $user,
-	    			'geoip' => $geoip
+	    			'geoip' => $geoip,
+	    			'company' => Helper::getCompany()
 	    	]);
 	    	
 	    	$message->setFrom(  \Yii::$app->params['infoEmail'] )