Merge branch 'master' of git.task-on.com:ktask/task-on.com

common/components/UnisenderAPI.php

@@ -101,7 +101,9 @@ class UnisenderAPI {
             'createCampaign',
             [
                 'message_id' => $message_id,
-                'defer' => 1
+                'defer' => 1,
+                'track_links' => 1,
+                'track_read' => 1
             ]
         );
     }

common/modules/triggers/controllers/TriggerAdminController.php

@@ -16,6 +16,7 @@ use common\modules\triggers\models\TriggerTrigger;
 use yii\data\ActiveDataProvider;
 use yii\helpers\Json;
 use yii\web\NotFoundHttpException;
+use \common\components\UnisenderAPI;
 
 class TriggerAdminController extends AdminController {
     /**
@@ -52,7 +53,7 @@ class TriggerAdminController extends AdminController {
     }
 
     public function actionGetresult($id){
-        $obj=new \UnisenderAPI();
+        $obj = new UnisenderAPI();
         $result = $obj->getVisitedLinks($id);
         var_dump($result);
     }

common/modules/triggers/views/trigger-admin/testing.php

@@ -11,9 +11,9 @@ $newListObject=Json::decode($newList);
 if (array_key_exists('result', $newListObject) && array_key_exists('id', $newListObject['result'])) {
     $newListId=$newListObject['result']['id'];
     // Subscribe user to new List
-    $subscribe = $sender->subscribe(['list_ids' => $newListId, 'fields[email]' => $email]);
+    $subscribe = $sender->subscribe(['list_ids' => $newListId, 'fields[email]' => $email, 'double_optin' => 1]);
     // Create new message
-    $newMessage=$sender->createEmailMessage('bystrov', $email, 'Testing Subject', 'Testing Body <br><a href="http://www.google.com/">Testing link</a><a href="{{_UnsubscribeUrl}}">Отписаться</a>', $newListId);
+    $newMessage=$sender->createEmailMessage('bystrov', $email, 'Testing Subject', 'Testing Body <br><a href="http://www.google.com/">Testing link</a><br><a href="{{_UnsubscribeUrl}}">Отписаться</a>', $newListId);
     // Decode result
     $newMessageObject=Json::decode($newMessage);
     if (array_key_exists('result', $newMessageObject) && array_key_exists('message_id', $newMessageObject['result'])) {
@@ -21,19 +21,16 @@ if (array_key_exists('result', $newListObject) && array_key_exists('id', $newLis
         $newMessageId=$newMessageObject['result']['message_id'];
         // Create new campaign
         $newCampaign = $sender->createCampaign($newMessageId);
+        // Parse the result
+        $newCampaignObject = Json::decode($newCampaign);
+        if (array_key_exists('result', $newCampaignObject) && array_key_exists('campaign_id', $newCampaignObject['result'])) {
+            $newCampaignId = $newCampaignObject['result']['campaign_id'];
+        }
     }
 }
 
-echo 'Рассылка: '.((isset($newCampaign)) ? $newCampaign : 'Not found');
+echo 'Рассылка: '.((isset($newCampaignId)) ? $newCampaignId : 'Not found');
 echo '<br>';
 echo 'Список: '.((isset($newListId)) ? $newListId : 'Not found');
 echo '<br>';
-echo 'Сообщение: '.((isset($newMessageId)) ? $newMessageId : 'Not found');
-echo '<br>';
-echo "<pre>";
-print_r(Json::decode($subscribe));
-echo "</pre>";
-echo '<br>';
-echo "<pre>";
-print_r(Json::decode($sender->getContactCount($newListId, ['params[search]' => 'email/phone substring'])));
-echo "</pre>";
\ No newline at end of file
+echo 'Сообщение: '.((isset($newMessageId)) ? $newMessageId : 'Not found');
\ No newline at end of file