Просмотр исходного кода

Ticket #5604 - API: Add full support for Mass Mailer module.

AntonLV 2 месяцев назад
Родитель
Сommit
218141da26

+ 0 - 13
modules/boonex/massmailer/classes/BxMassMailerDb.php

@@ -151,19 +151,6 @@ class BxMassMailerDb extends BxBaseModGeneralDb
         $this->query("DELETE FROM `" . $CNF['TABLE_UNSUBSCRIBE'] . "` WHERE `" . $CNF['FIELD_CAMPAIGN_ID'] . "` = :campaign_id", $aBindings);
     }
     
-    public function getLettersByCampaignId ($iCampaignId, $iStart = false, $iPerPage = false)
-    {
-        $CNF = &$this->_oConfig->CNF;
-
-        $sLimitClause = "";
-        if($iStart !== false && $iPerPage !== false)
-            $sLimitClause = " LIMIT " . (int)$iStart . ", " . (int)$iPerPage;
-
-        return $this->getAll("SELECT * FROM `" . $CNF['TABLE_LETTERS'] . "` WHERE `" . $CNF['FIELD_CAMPAIGN_ID'] . "` = :id" . $sLimitClause, [
-            'id' => $iCampaignId
-        ]);
-    }
-    
     public function getClicksByCampaignId ($iCampaignId)
     {
         $CNF = &$this->_oConfig->CNF;

+ 2 - 29
modules/boonex/massmailer/classes/BxMassMailerTemplate.php

@@ -11,36 +11,11 @@
 
 class BxMassMailerTemplate extends BxBaseModGeneralTemplate
 {
-    function __construct(&$oConfig, &$oDb)
+    public function __construct(&$oConfig, &$oDb)
     {
         parent::__construct($oConfig, $oDb);
     }
-    
-    function getSubscribers($aData)
-    {
-        $aList = [];
-        foreach($aData as $aItem)
-            $aList[] = [
-                'email' => $aItem['email'], 
-                'date_sent' => $this->_bIsApi ? $aItem['date_sent'] : ($aItem['date_sent'] > 0 ? bx_time_js($aItem['date_sent']) : ''), 
-                'date_seen' => $this->_bIsApi ? $aItem['date_seen'] : ($aItem['date_seen'] > 0 ? bx_time_js($aItem['date_seen']) : ''), 
-                'date_click' => $this->_bIsApi ? $aItem['date_click'] : ($aItem['date_click'] > 0 ? bx_time_js($aItem['date_click']) : '')
-            ];
-
-        if($this->_bIsApi)
-            return $aList;
 
-        $this->addJs(array(BX_DIRECTORY_PATH_MODULES . 'boonex/massmailer/plugins/datatables/|datatables.min.js'));
-        $this->addCss(array('main.css', BX_DIRECTORY_PATH_MODULES . 'boonex/massmailer/plugins/datatables/|datatables.min.css'));
-        return $this->parseHtmlByName('campaign_subscribers.html', array(
-             'bx_repeat:items' => $aList,
-             'email_title' => _t('_bx_massmailer_txt_title_email'),
-             'date_sent_title' => _t('_bx_massmailer_txt_title_date_sent'),
-             'date_seen_title' => _t('_bx_massmailer_txt_title_date_seen'),
-             'date_click_title' => _t('_bx_massmailer_txt_title_date_click'),
-            ));
-    }
-    
     function getClicks($aData)
     {
         $aList = [];
@@ -70,9 +45,7 @@ class BxMassMailerTemplate extends BxBaseModGeneralTemplate
              'last_click_title' => _t('_bx_massmailer_txt_last_click_title'),
             ));
     }
-    
-    
-    
+
     function getInfo($CampaignId)
     {
         $CNF = &$this->getModule()->_oConfig->CNF;

+ 2 - 2
modules/boonex/massmailer/install/sql/enable.sql

@@ -40,8 +40,8 @@ INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `lay
 INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES
 ('bx_massmailer_view_campaign', 1, @sName, '_bx_massmailer_page_block_title_entry_breadcrumb', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:13:"bx_massmailer";s:6:"method";s:17:"entity_breadcrumb";}', 0, 0, 0),
 ('bx_massmailer_view_campaign', 1, @sName, '_bx_massmailer_page_block_title_view_campaign_info', 11, 128, 'service', 'a:2:{s:6:"module";s:13:"bx_massmailer";s:6:"method";s:12:"campagn_info";}', 0, 0, 1),
-('bx_massmailer_view_campaign', 1, @sName, '_bx_massmailer_page_block_title_view_campaign_subscribers', 11, 128, 'service', 'a:2:{s:6:"module";s:13:"bx_massmailer";s:6:"method";s:19:"campagn_subscribers";}', 0, 0, 2),
-('bx_massmailer_view_campaign', 1, @sName, '_bx_massmailer_page_block_title_view_campaign_links', 11, 128, 'service', 'a:2:{s:6:"module";s:13:"bx_massmailer";s:6:"method";s:13:"campagn_links";}', 0, 0, 3);
+('bx_massmailer_view_campaign', 1, @sName, '_bx_massmailer_page_block_title_view_campaign_links', 11, 128, 'service', 'a:2:{s:6:"module";s:13:"bx_massmailer";s:6:"method";s:13:"campagn_links";}', 0, 0, 2),
+('bx_massmailer_view_campaign', 1, @sName, '_bx_massmailer_page_block_title_view_campaign_subscribers', 11, 128, 'service', 'a:2:{s:6:"module";s:13:"bx_massmailer";s:6:"method";s:19:"campagn_subscribers";}', 0, 0, 3);
 
 -- PAGE: campaigns administration
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES