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
70bfd0e4
Commit
70bfd0e4
authored
Mar 01, 2016
by
Олег Гиммельшпах
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small fix
parent
0d7a4ce1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
0 deletions
+22
-0
common/modules/bids/models/SearchBid.php
common/modules/bids/models/SearchBid.php
+5
-0
common/modules/bids/views/bid/mail-all.php
common/modules/bids/views/bid/mail-all.php
+9
-0
common/modules/sessions/models/Session.php
common/modules/sessions/models/Session.php
+8
-0
No files found.
common/modules/bids/models/SearchBid.php
View file @
70bfd0e4
...
...
@@ -47,6 +47,11 @@ class SearchBid extends Bid
$dataProvider
=
new
ActiveDataProvider
([
'query'
=>
$query
,
'sort'
=>
[
'defaultOrder'
=>
[
'created_at'
=>
SORT_DESC
]
]
]);
$this
->
load
(
$params
);
...
...
common/modules/bids/views/bid/mail-all.php
View file @
70bfd0e4
<?php
use
yii\helpers\Html
;
use
yii\helpers\Url
;
use
common\modules\bids\models\BidFile
;
?>
...
...
@@ -27,6 +28,10 @@ Email: <?=$model->email?><br>
<?php
if
(
$session
)
:
?>
<?php
$last
=
$session
->
lastUrl
;
?>
Запрос отправлен со страницы:
<a
href=
"
<?=
Url
::
to
([
$last
->
url
],
true
)
?>
"
>
<?=
Url
::
to
([
$last
->
url
],
true
)
?>
</a>
<hr>
<?php
if
(
$session
->
utmUrls
)
:
?>
...
...
@@ -46,6 +51,10 @@ Email: <?=$model->email?><br>
<?php
endforeach
;
?>
<?php
else
;
?>
<h3>
Данных UTM нет
</h3>
<?php
endif
;
?>
<?php
endif
;
?>
\ No newline at end of file
common/modules/sessions/models/Session.php
View file @
70bfd0e4
...
...
@@ -100,4 +100,12 @@ class Session extends \common\components\ActiveRecordModel
{
return
$this
->
hasMany
(
SessionUrl
::
className
(),
[
'session_id'
=>
'id'
])
->
where
([
'utm'
=>
1
]);
}
/**
* @return \yii\db\ActiveQuery
*/
public
function
getLastUrl
()
{
return
$this
->
hasOne
(
SessionUrl
::
className
(),
[
'session_id'
=>
'id'
])
->
orderBy
([
'created_at'
=>
SORT_DESC
]);
}
}
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