Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taskonsite-архив-перенесен
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Korolev
taskonsite-архив-перенесен
Commits
ad325524
Commit
ad325524
authored
Mar 01, 2016
by
Олег Гиммельшпах
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#958 - Активировать формы обратной связи на сайте.
parent
2e0d32c1
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
77 additions
and
7 deletions
+77
-7
common/modules/bids/models/Bid.php
common/modules/bids/models/Bid.php
+4
-4
common/modules/bids/views/bid/mail-all.php
common/modules/bids/views/bid/mail-all.php
+20
-2
common/modules/sessions/controllers/DefaultController.php
common/modules/sessions/controllers/DefaultController.php
+1
-0
common/modules/sessions/models/SearchSession.php
common/modules/sessions/models/SearchSession.php
+3
-0
common/modules/sessions/models/SearchSessionUrl.php
common/modules/sessions/models/SearchSessionUrl.php
+3
-0
common/modules/sessions/models/Session.php
common/modules/sessions/models/Session.php
+8
-0
common/modules/sessions/models/SessionUrl.php
common/modules/sessions/models/SessionUrl.php
+20
-1
console/migrations/m160301_055203_fix_sessions.php
console/migrations/m160301_055203_fix_sessions.php
+18
-0
No files found.
common/modules/bids/models/Bid.php
View file @
ad325524
...
@@ -119,16 +119,16 @@ class Bid extends \common\components\ActiveRecordModel
...
@@ -119,16 +119,16 @@ class Bid extends \common\components\ActiveRecordModel
try
try
{
{
$session
=
null
;
$session
=
null
;
if
(
Yii
::
$app
->
session
->
has
(
'Session'
))
if
(
Yii
::
$app
->
session
->
has
(
'Session
Id
'
))
{
{
$session
=
Session
::
findOne
(
Yii
::
$app
->
session
->
get
(
'Session'
));
$session
=
Session
::
findOne
(
Yii
::
$app
->
session
->
get
(
'Session
Id
'
));
}
}
$email
=
Settings
::
getValue
(
'bids-support-email'
);
$email
=
Settings
::
getValue
(
'bids-support-email'
);
$message
=
Yii
::
$app
->
controller
->
view
->
render
(
'@common/modules/bids/views/bid/mail-all'
,
[
$message
=
Yii
::
$app
->
controller
->
view
->
render
(
'@common/modules/bids/views/bid/mail-all'
,
[
'model'
=>
$this
,
'model'
=>
$this
,
'session'
=>
$session
'session'
=>
$session
,
]);
]);
$headers
=
"MIME-Version: 1.0
\r\n
"
.
$headers
=
"MIME-Version: 1.0
\r\n
"
.
...
...
common/modules/bids/views/bid/mail-all.php
View file @
ad325524
...
@@ -24,10 +24,28 @@ Email: <?=$model->email?><br>
...
@@ -24,10 +24,28 @@ Email: <?=$model->email?><br>
Дата добавления заявки:
<?=
date
(
'd.m.Y H:i:s'
,
$model
->
created_at
)
?>
<br>
Дата добавления заявки:
<?=
date
(
'd.m.Y H:i:s'
,
$model
->
created_at
)
?>
<br>
<?php
if
(
$session
)
:
?>
<?php
if
(
$session
)
:
?>
Реферер:
<?=
$session
->
referer
?>
<b
r>
<h
r>
Заявка отправлена со страницы:
<?=
$session
->
url
?>
<br>
<?php
if
(
$session
->
utmUrls
)
:
?>
<h2>
UTM:
</h2>
<?php
foreach
(
$session
->
utmUrls
as
$url
)
:
$params
=
$url
->
parseUrl
();
?>
<p>
<strong>
Дата посещения:
</strong>
<?=
date
(
'd.m.Y H:i:s'
,
$url
->
created_at
)
?>
<br>
<strong>
Время пребывания на посадочной странице:
</strong>
<?=
date
(
'H:i:s'
,
mktime
(
0
,
0
,
$url
->
time
))
?>
<br>
Источники:
<?=
$params
[
'utm_source'
]
?>
<br>
Маркетинговые каналы:
<?=
$params
[
'utm_medium'
]
?>
<br>
Ключевое слово в компании:
<?=
$params
[
'utm_term'
]
?>
<br>
Компания :
<?=
$params
[
'campaign_id'
]
?>
<br>
</p>
<?php
endforeach
;
?>
<?php
endif
;
?>
<?php
endif
;
?>
<?php
endif
;
?>
\ No newline at end of file
common/modules/sessions/controllers/DefaultController.php
View file @
ad325524
...
@@ -54,6 +54,7 @@ class DefaultController extends BaseController
...
@@ -54,6 +54,7 @@ class DefaultController extends BaseController
$sUrl
->
session_id
=
$session
->
id
;
$sUrl
->
session_id
=
$session
->
id
;
$sUrl
->
url
=
$url
;
$sUrl
->
url
=
$url
;
$sUrl
->
referer
=
$referer
;
$sUrl
->
referer
=
$referer
;
$sUrl
->
utm
=
$sUrl
->
isUtm
();
$sUrl
->
save
();
$sUrl
->
save
();
...
...
common/modules/sessions/models/SearchSession.php
View file @
ad325524
...
@@ -49,6 +49,9 @@ class SearchSession extends Session
...
@@ -49,6 +49,9 @@ class SearchSession extends Session
$dataProvider
=
new
ActiveDataProvider
([
$dataProvider
=
new
ActiveDataProvider
([
'query'
=>
$query
,
'query'
=>
$query
,
'sort'
=>
[
'defaultOrder'
=>
[
'created_at'
=>
SORT_DESC
]
]
]);
]);
$this
->
load
(
$params
);
$this
->
load
(
$params
);
...
...
common/modules/sessions/models/SearchSessionUrl.php
View file @
ad325524
...
@@ -51,6 +51,9 @@ class SearchSessionUrl extends SessionUrl
...
@@ -51,6 +51,9 @@ class SearchSessionUrl extends SessionUrl
$dataProvider
=
new
ActiveDataProvider
([
$dataProvider
=
new
ActiveDataProvider
([
'query'
=>
$query
,
'query'
=>
$query
,
'sort'
=>
[
'defaultOrder'
=>
[
'created_at'
=>
SORT_DESC
]
]
]);
]);
$this
->
load
(
$params
);
$this
->
load
(
$params
);
...
...
common/modules/sessions/models/Session.php
View file @
ad325524
...
@@ -92,4 +92,12 @@ class Session extends \common\components\ActiveRecordModel
...
@@ -92,4 +92,12 @@ class Session extends \common\components\ActiveRecordModel
{
{
return
$this
->
hasMany
(
SessionUrl
::
className
(),
[
'session_id'
=>
'id'
]);
return
$this
->
hasMany
(
SessionUrl
::
className
(),
[
'session_id'
=>
'id'
]);
}
}
/**
* @return \yii\db\ActiveQuery
*/
public
function
getUtmUrls
()
{
return
$this
->
hasMany
(
SessionUrl
::
className
(),
[
'session_id'
=>
'id'
])
->
where
([
'utm'
=>
1
]);
}
}
}
common/modules/sessions/models/SessionUrl.php
View file @
ad325524
...
@@ -40,7 +40,7 @@ class SessionUrl extends \common\components\ActiveRecordModel
...
@@ -40,7 +40,7 @@ class SessionUrl extends \common\components\ActiveRecordModel
{
{
return
[
return
[
[[
'session_id'
],
'required'
],
[[
'session_id'
],
'required'
],
[[
'session_id'
,
'created_at'
,
'updated_at'
],
'integer'
],
[[
'session_id'
,
'created_at'
,
'updated_at'
,
'utm'
],
'integer'
],
[[
'url'
,
'referer'
],
'string'
],
[[
'url'
,
'referer'
],
'string'
],
[[
'session_id'
],
'exist'
,
'skipOnError'
=>
true
,
'targetClass'
=>
Session
::
className
(),
'targetAttribute'
=>
[
'session_id'
=>
'id'
]],
[[
'session_id'
],
'exist'
,
'skipOnError'
=>
true
,
'targetClass'
=>
Session
::
className
(),
'targetAttribute'
=>
[
'session_id'
=>
'id'
]],
];
];
...
@@ -74,4 +74,23 @@ class SessionUrl extends \common\components\ActiveRecordModel
...
@@ -74,4 +74,23 @@ class SessionUrl extends \common\components\ActiveRecordModel
{
{
return
$this
->
updated_at
-
$this
->
created_at
;
return
$this
->
updated_at
-
$this
->
created_at
;
}
}
public
function
parseUrl
()
{
parse_str
(
parse_url
(
$this
->
url
,
PHP_URL_QUERY
),
$params
);
return
$params
;
}
public
function
isUtm
()
{
$params
=
$this
->
parseUrl
();
if
(
isset
(
$params
[
'utm_source'
]))
{
return
1
;
}
return
0
;
}
}
}
console/migrations/m160301_055203_fix_sessions.php
0 → 100644
View file @
ad325524
<?php
use
yii\db\Schema
;
use
yii\db\Migration
;
class
m160301_055203_fix_sessions
extends
Migration
{
// Use safeUp/safeDown to run migration code within a transaction
public
function
safeUp
()
{
$this
->
addColumn
(
'sessions_url'
,
'utm'
,
Schema
::
TYPE_INTEGER
.
'(1) NOT NULL DEFAULT 0 AFTER referer'
);
}
public
function
safeDown
()
{
$this
->
dropColumn
(
'sessions_url'
,
'utm'
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment