oreolek/kangana
1
0
Fork 0
mirror of https://github.com/Oreolek/kangana.git synced 2024-06-16 15:01:09 +03:00
Code Issues Releases Wiki Activity

DAR-15: instant subscription fix

Browse source
This commit is contained in:
Alexander Yakovlev 2014-02-19 17:16:55 +07:00
parent 6fd8e47247
commit 4edd40a245
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
application/classes/Controller/Subscription.php
View file

@ -99,9 +99,9 @@ class Controller_Subscription extends Controller_Layout {
$instant = ORM::factory('Instant');
$instant->subscription_id = $id;
$instant->subject = __('You were subscribed to ').$subscription->title;
$instant->text = $subscription->welcome;
$instant->create();
$instant->send($model->email);
$instant->text = __('From now on you will receive letters from this subscription.');
$instant->send($model->email, $model->token);
// instant is not saved because it's just a welcome email
}
else
{

1
application/classes/Model/Subscription.php
View file

@ -47,7 +47,6 @@ class Model_Subscription extends ORM {
protected $_labels = array(
'title' => 'Title',
'price' => 'Subscription price',
'welcome' => 'Welcome message',
'description' => 'Description (for the clients)'
);

4
application/i18n/ru.php
View file

@ -65,5 +65,7 @@ return array(
'First letter' => 'Первое письмо',
'Subject' => 'Тема',
'Message body' => 'Тело письма',
'Subscription code' => 'Код подписки'
'Subscription code' => 'Код подписки',
'You were subscribed to ' => 'Вы были подписаны на',
'From now on you will receive letters from this subscription.' => 'Теперь вы будете получать письма из этой рассылки.'
);