Changeset 1525935
- Timestamp:
- 11/01/2016 12:50:25 PM (9 years ago)
- Location:
- webcourier-email-marketing
- Files:
-
- 64 added
- 9 edited
-
tags/1.1 (added)
-
tags/1.1/css (added)
-
tags/1.1/css/angular-datatables.min.css (added)
-
tags/1.1/css/bootstrap-datepicker.css (added)
-
tags/1.1/css/bootstrap-datetimepicker.css (added)
-
tags/1.1/css/bootstrap-multiselect.css (added)
-
tags/1.1/css/bootstrap.min.css (added)
-
tags/1.1/css/dataTables.bootstrap.min.css (added)
-
tags/1.1/css/styles_mail_marketing.css (added)
-
tags/1.1/css/sweetalert.css (added)
-
tags/1.1/fonts (added)
-
tags/1.1/fonts/glyphicons-halflings-regular.eot (added)
-
tags/1.1/fonts/glyphicons-halflings-regular.svg (added)
-
tags/1.1/fonts/glyphicons-halflings-regular.ttf (added)
-
tags/1.1/fonts/glyphicons-halflings-regular.woff (added)
-
tags/1.1/fonts/glyphicons-halflings-regular.woff2 (added)
-
tags/1.1/js (added)
-
tags/1.1/js/angular-datatables.js (added)
-
tags/1.1/js/angular-datatables.min.js (added)
-
tags/1.1/js/angular.min.js (added)
-
tags/1.1/js/bootstrap-datepicker.js (added)
-
tags/1.1/js/bootstrap-datetimepicker.min.js (added)
-
tags/1.1/js/bootstrap-multiselect.js (added)
-
tags/1.1/js/bootstrap.min.js (added)
-
tags/1.1/js/controller_campanha.js (added)
-
tags/1.1/js/controller_campanha_add.js (added)
-
tags/1.1/js/controller_templates.js (added)
-
tags/1.1/js/dataTables.bootstrap.min.js (added)
-
tags/1.1/js/jquery.dataTables.min.js (added)
-
tags/1.1/js/locales (added)
-
tags/1.1/js/locales/bootstrap-datepicker.pt-BR.min.js (added)
-
tags/1.1/js/moment-with-locales.js (added)
-
tags/1.1/js/moment.min.js (added)
-
tags/1.1/js/summernote-master (added)
-
tags/1.1/js/summernote-master/dist (added)
-
tags/1.1/js/summernote-master/dist/font (added)
-
tags/1.1/js/summernote-master/dist/font/summernote.eot (added)
-
tags/1.1/js/summernote-master/dist/font/summernote.ttf (added)
-
tags/1.1/js/summernote-master/dist/font/summernote.woff (added)
-
tags/1.1/js/summernote-master/dist/lang (added)
-
tags/1.1/js/summernote-master/dist/lang/summernote-pt-BR.js (added)
-
tags/1.1/js/summernote-master/dist/summernote.css (added)
-
tags/1.1/js/summernote-master/dist/summernote.js (added)
-
tags/1.1/js/summernote-master/dist/summernote.min.js (added)
-
tags/1.1/js/sweetalert.min.js (added)
-
tags/1.1/js/template_upload.js (added)
-
tags/1.1/locales (added)
-
tags/1.1/locales/bootstrap-datepicker.pt-BR.min.js (added)
-
tags/1.1/readme.txt (added)
-
tags/1.1/src (added)
-
tags/1.1/src/MailLoader.php (added)
-
tags/1.1/src/WebcourierFunctions.php (added)
-
tags/1.1/views (added)
-
tags/1.1/views/campanhas.php (added)
-
tags/1.1/views/campanhas_add.php (added)
-
tags/1.1/views/config.php (added)
-
tags/1.1/views/error.php (added)
-
tags/1.1/views/forwarder.php (added)
-
tags/1.1/views/geral_webcourier_mail.php (added)
-
tags/1.1/views/templates.php (added)
-
tags/1.1/views/templates_code.php (added)
-
tags/1.1/views/templates_list.php (added)
-
tags/1.1/views/templates_upload.php (added)
-
tags/1.1/webcourier_email_marketing.php (added)
-
trunk/js/controller_campanha.js (modified) (2 diffs)
-
trunk/js/controller_campanha_add.js (modified) (3 diffs)
-
trunk/js/controller_templates.js (modified) (1 diff)
-
trunk/readme.txt (modified) (1 diff)
-
trunk/src/WebcourierFunctions.php (modified) (1 diff)
-
trunk/views/campanhas_add.php (modified) (5 diffs)
-
trunk/views/geral_webcourier_mail.php (modified) (1 diff)
-
trunk/views/templates_list.php (modified) (1 diff)
-
trunk/webcourier_email_marketing.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
webcourier-email-marketing/trunk/js/controller_campanha.js
r1522117 r1525935 140 140 }).done(function (data) { 141 141 if (data.status == "success") { 142 window.open(elem.href);143 142 document.location = elem.href; 144 143 } else { … … 156 155 }); 157 156 }); 158 159 157 function showSpamsinModal(msg, success) 160 158 { -
webcourier-email-marketing/trunk/js/controller_campanha_add.js
r1521970 r1525935 14 14 return Math.ceil(templateIds.length / cat.pageSize); 15 15 } 16 console.log(cat.angularTemplates); 16 17 cat.nextPage = function (state) { 17 18 state ? cat.currentPage++ : cat.currentPage--; … … 35 36 window.location.href = url; 36 37 }); 37 38 38 39 jQuery('#AplCampanha_dt_p_envio').datetimepicker({ 39 40 format: "DD/MM/YYYY HH:mm:ss", 40 41 locale: "pt-br", 41 }); 42 43 // jQuery('#AplCampanha_dt_p_envio').datepicker({ 44 // format: "dd/mm/yyyy HH:ii:ss", 45 // startDate: 'd', 46 // language: "pt-BR", 47 // orientation: "top auto", 48 // autoclose: true, 49 // todayHighlight: true, 50 // }); 42 }); 43 51 44 jQuery('#criarCampanha').on('click', function (e) { 52 45 e.preventDefault(); … … 57 50 id: (edit == "true" ? id : undefined) 58 51 }).done(function (response) { 59 console.log(response);60 52 if (!response.status) { 61 53 jQuery('#divResponseMessageSuccess').hide(); -
webcourier-email-marketing/trunk/js/controller_templates.js
r1418759 r1525935 26 26 jQuery('.template-search').on('click', function(e){ 27 27 e.preventDefault(); 28 jQuery('#iframe-modal h5').text(jQuery(this).closest('.darken').find('h4').text());29 jQuery('#my-iframe').attr('src', jQuery(this).closest('.darken').find('img').attr('src'));30 jQuery('#iframe-modal').modal({31 backdrop: false,32 keyboard: false33 });28 jQuery('#iframe-modal h5').text(jQuery(this).closest('.darken').find('h4').text()); 29 jQuery('#my-iframe').attr('src', jQuery(this).closest('.darken').find('img').attr('src')); 30 jQuery('#iframe-modal').modal({ 31 backdrop: false, 32 keyboard: false 33 }); 34 34 }); 35 35 -
webcourier-email-marketing/trunk/readme.txt
r1522069 r1525935 39 39 = 1.1 = 40 40 * Modificações para atualizar com o webcourier atual. 41 42 = 1.2 = 43 * Adicionado nome remetente nas campanhas 44 * Desacoplado completamente o relatório das campanhas da aplicação -
webcourier-email-marketing/trunk/src/WebcourierFunctions.php
r1415835 r1525935 26 26 27 27 public function getCampanhas($api) { 28 return $this->makeRequest('getcampanhas', ['api' => $api]);28 return $this->makeRequest('getcampanhas', array('api' => $api)); 29 29 } 30 30 31 31 public function getCampanhaById($api, $id) { 32 return $this->makeRequest('copy', ['api' => $api, 'id' => $id]);32 return $this->makeRequest('copy', array('api' => $api, 'id' => $id)); 33 33 } 34 34 35 35 public function checkCampanha($api) { 36 return $this->makeRequest('checkcampanha', ['api' => $api]);36 return $this->makeRequest('checkcampanha', array('api' => $api)); 37 37 } 38 38 39 39 public function getGrupos($api) { 40 return $this->makeRequest('getgrupos', ['api' => $api]);40 return $this->makeRequest('getgrupos', array('api' => $api)); 41 41 } 42 42 43 43 public function getSubGrupos($api, $id) { 44 return $this->makeRequest('getsubgrupos', ['api' => $api, 'id' => $id]);44 return $this->makeRequest('getsubgrupos', array('api' => $api, 'id' => $id)); 45 45 } 46 46 47 47 public function getFiltros($api) { 48 return $this->makeRequest('getfiltros', ['api' => $api]);48 return $this->makeRequest('getfiltros', array('api' => $api)); 49 49 } 50 50 51 51 public function getAllFiltroOptions($api, $id){ 52 return $this->makeRequest('getallfiltrooptions', ['api' => $api, 'id' => $id]);52 return $this->makeRequest('getallfiltrooptions', array('api' => $api, 'id' => $id)); 53 53 } 54 54 55 55 public function createWordpressGroups($api, $groupFull, $groupSubscribers, $groupCustomers){ 56 return $this->makeRequest('createwordpressgroups', ['api' => $api, 'groupFull' => $groupFull, 'groupSubscribers' => $groupSubscribers, 'groupCustomers' => $groupCustomers]);56 return $this->makeRequest('createwordpressgroups', array('api' => $api, 'groupFull' => $groupFull, 'groupSubscribers' => $groupSubscribers, 'groupCustomers' => $groupCustomers)); 57 57 } 58 58 59 59 public function getTemplates($api){ 60 return $this->makeRequest('gettemplates', ['api' => $api]);60 return $this->makeRequest('gettemplates', array('api' => $api)); 61 61 } 62 62 63 63 public function getCampanhasWordpress($api) { 64 return $this->makeRequest('getcampanhaswordpress', ['api' => $api]);64 return $this->makeRequest('getcampanhaswordpress', array('api' => $api)); 65 65 } 66 66 67 67 public function getClienteIdx($api){ 68 return $this->makeRequest('getclienteidx', ['api' => $api]);68 return $this->makeRequest('getclienteidx', array('api' => $api)); 69 69 } 70 70 71 71 public function getTemplateById($api, $id, $tipo){ 72 return $this->makeRequest('gettemplatebyid', ['api' => $api, 'id' => $id, 'tipo' => $tipo]);72 return $this->makeRequest('gettemplatebyid', array('api' => $api, 'id' => $id, 'tipo' => $tipo)); 73 73 } 74 74 -
webcourier-email-marketing/trunk/views/campanhas_add.php
r1521997 r1525935 7 7 var templates = <?= json_encode($templates); ?>; 8 8 var campanha = <?= json_encode($campanha); ?>; 9 var edit = '<?= $edit ? 'true' : ' false'; ?>';10 var add = '<?= $add ? 'true' : ' false'; ?>';9 var edit = '<?= $edit ? 'true' : ''; ?>'; 10 var add = '<?= $add ? 'true' : ''; ?>'; 11 11 var id = <?= $add ? 0 : $id; ?>; 12 12 var url = '<?= $url ? $url : '' ?>'; … … 41 41 <option value="<?= $filtros_ids[1]->filtro_idx ?>">Grupo Inscritos</option> 42 42 <option value="<?= $filtros_ids[2]->filtro_idx ?>">Grupo WooCommerce</option> 43 44 43 </select> 45 44 </div> … … 47 46 <div class="row"> 48 47 <div class="form-group col-md-5"> 48 <label for="inputNomeRemetente" class="control-label">Nome Remetente</label> 49 <input name="AplCampanha[nome_sender]" type="inputNomeRemetente" class="form-control" value="<?= !$add ? $campanha->nome_sender : ''; ?>" required> 50 </div> 51 <div class="form-group col-md-5"> 49 52 <label for="inputEmail" class="control-label">Email remetente</label> 50 53 <input name="AplCampanha[email_sender]" type="inputEmail" class="form-control" value="<?= !$add ? $campanha->email_sender : '' ?>" required> 51 54 </div> 55 </div> 56 <div class="row"> 52 57 <div class="form-group col-md-5"> 53 58 <label for="inputData" class="control-label">Data Prevista Envio</label> 54 59 <input id="AplCampanha_dt_p_envio" name="AplCampanha[dt_p_envio]" type="inputData" class="form-control" value="<?= !$add ? date('dd/mm/yyyy H:i:s') : '' ?>" required> 55 60 </div> 56 </div>57 <div class="row">58 61 <div class="form-group col-md-5"> 59 62 <button type="button" id="template-choose" data-toggle="modal" data-target="#template-modal" class="btn btn-xs btn-primary pull-right">Escolher</button> … … 82 85 <?php //endif; ?> 83 86 </form> 87 </div> 84 88 </div> 85 </div>86 89 87 90 <div id="template-modal" class="modal"> … … 113 116 </div> 114 117 </div> 115 116 118 </body> 117 118 119 -
webcourier-email-marketing/trunk/views/geral_webcourier_mail.php
r1418986 r1525935 90 90 $groupCustomers = $wpdb->get_results($query); 91 91 $resultGroup = $requestGroup->createWordpressGroups($api, $groupFull, $groupSubscriber, $groupCustomers); 92 var_dump($resultGroup);93 92 } 94 93 -
webcourier-email-marketing/trunk/views/templates_list.php
r1521881 r1525935 12 12 function changeHeight(iframe) 13 13 { 14 var height = ((window.innerHeight/2)-400)*2; 14 var formulaHeight = (((window.innerHeight/2)-400)*2); 15 var height = formulaHeight < 100 ? 100 : formulaHeight; 15 16 iframe.parentElement.parentElement.style.marginTop = height + 'px'; 16 17 jQuery('iframe').parents().eq(3).find('h5').css("margin-top", height-40); -
webcourier-email-marketing/trunk/webcourier_email_marketing.php
r1522106 r1525935 5 5 Description: Plugin utilizado para adicionar usuários que são cadastrados através do wordpress do cliente 6 6 Author: WebCourier 7 Version: 1. 18 Stable tag: 1. 17 Version: 1.2 8 Stable tag: 1.2 9 9 Author URI: https://www.webcourier.com.br/ 10 10 License: GPLv2
Note: See TracChangeset
for help on using the changeset viewer.