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
939860da
Commit
939860da
authored
May 05, 2016
by
Shakarim Sapa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Проверяем триггеры
parent
b05a3af5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
common/modules/triggers/models/TriggerSchedule.php
common/modules/triggers/models/TriggerSchedule.php
+0
-1
common/modules/triggers/models/TriggerTrigger.php
common/modules/triggers/models/TriggerTrigger.php
+4
-2
No files found.
common/modules/triggers/models/TriggerSchedule.php
View file @
939860da
...
@@ -69,7 +69,6 @@ class TriggerSchedule extends \yii\db\ActiveRecord
...
@@ -69,7 +69,6 @@ class TriggerSchedule extends \yii\db\ActiveRecord
public
static
function
sendMessage
(
$email
,
$template_id
,
$templateData
,
$trigger_id
=
null
)
public
static
function
sendMessage
(
$email
,
$template_id
,
$templateData
,
$trigger_id
=
null
)
{
{
return
false
;
$time_now
=
new
\DateTime
();
$time_now
=
new
\DateTime
();
/** @var MessageTemplate $templateModel */
/** @var MessageTemplate $templateModel */
$templateModel
=
MessageTemplate
::
findOne
(
$template_id
);
$templateModel
=
MessageTemplate
::
findOne
(
$template_id
);
...
...
common/modules/triggers/models/TriggerTrigger.php
View file @
939860da
...
@@ -259,8 +259,10 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
...
@@ -259,8 +259,10 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
$dbg
[
'trigger_id'
]
=
$this
->
id
;
$dbg
[
'trigger_id'
]
=
$this
->
id
;
$dbg
[
'template'
]
=
$this
->
messageTemplate
->
name
;
$dbg
[
'template'
]
=
$this
->
messageTemplate
->
name
;
$dbg
[
'unique'
]
=
((
$params
[
'unique'
]
===
true
)
?
'Да'
:
'Нет'
);
$dbg
[
'unique'
]
=
((
$params
[
'unique'
]
===
true
)
?
'Да'
:
'Нет'
);
// return TriggerSchedule::sendMessage($email, $this->message_template_id, $templateData, $this->id);
if
(
TriggerSchedule
::
find
()
->
count
()
<=
3
)
}
return
TriggerSchedule
::
sendMessage
(
$email
,
$this
->
message_template_id
,
$templateData
,
$this
->
id
);
else
echo
'Единожды: '
.
$dbg
[
'unique'
]
.
'; ID: '
.
$dbg
[
'trigger_id'
]
.
'; EMAIL:'
.
$dbg
[
'email'
]
.
'; Шаблон: '
.
$dbg
[
'template'
]
.
'<br>'
;
echo
'Единожды: '
.
$dbg
[
'unique'
]
.
'; ID: '
.
$dbg
[
'trigger_id'
]
.
'; EMAIL:'
.
$dbg
[
'email'
]
.
'; Шаблон: '
.
$dbg
[
'template'
]
.
'<br>'
;
}
}
}
}
}
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