Skip to content

Commit

Permalink
Versiyon 1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bakcay committed Oct 1, 2023
1 parent 3206b03 commit d49329d
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 77 deletions.
74 changes: 24 additions & 50 deletions modules/addons/dnaextended/assets/module.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
/**
*
* Created by Bunyamin on 27.07.2017.
* Project name kriweb
* 27.07.2017 16:02
* Bünyamin AKÇAY <bunyamin@bunyam.in>
*/
let modulename = $('#module-name').val();
let loadinghtml = '<div style="width: 100%; text-align: center; margin-top: 70px;"><span class="module-loader" style="line-height: 100px;">'+window._lang.loading+'</span></div>';
let currentmodalid='';


let modules = [
'domains',
'settings'
];
let dt_var = {
const modulename = $('#module-name').val();
const loadinghtml = `<div style="width: 100%; text-align: center; margin-top: 70px;">
<span class="module-loader" style="line-height: 100px;">${window._lang.loading}</span>
</div>`;
const modules = ['domains', 'settings'];
const dt_var = {
dom: '<\'row\'<\'col-sm-6 actionbuttons\'><\'col-sm-6 actionbuttons2\'f>><\'row\'<\'col-sm-12\'r><\'col-sm-12\'t>><\'row\'<\'col-sm-4\'l><\'col-sm-4\'i><\'col-sm-4\'p>>',
//language: {
// "url": "https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/Turkish.json"
//},
processing: true,
serverSide: true,
searching: true,
Expand All @@ -27,71 +19,53 @@ let dt_var = {
lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
};

$(document).ready(function () {

$(document).ready(() => {
if($("#modulebody").find("div").length < 1) {
drawlayout('dashboard', {});
}

$.each(modules, function (k, v) {
$('body').append('<script src="../modules/addons/'+modulename+'/assets/module.' + v + '.js?v='+vvv+'1"></script>');
modules.forEach(module => {
$('body').append(`<script src="../modules/addons/${modulename}/assets/module.${module}.js?v=${vvv}1"></script>`);
});


$(".moduleurl").click(function() {
var target = $(this).attr("data-target");

if(target==''){
return 0;
}

if($(this).parent("li").hasClass("active")){
return 0;
}

const target = $(this).attr("data-target");
if (target && !$(this).parent("li").hasClass("active")) {
$("ul.moduletopbarnav li").removeClass("active");
$(this).parent("li").addClass("active");

drawlayout(target, {});
}
});

$("#whmcsdevbanner").remove();
});


function drawlayout(layout, parameters,conainer='modulebody',viewtype='html') {
const containerSelector = `#${conainer}`;
$(containerSelector).html(loadinghtml);

$('#'+conainer).html(loadinghtml)

$.post( generateUrl(layout,viewtype), parameters, function (data) {

$('#'+conainer).html(data);


if($('#'+conainer+' .subnav').length>0){

$('.module-actions').html('<ul class="nav nav-tabs">'+$('#'+conainer+' .subnav').html()+'</li>');
$('#'+conainer+' .subnav').remove();

$.post(generateUrl(layout, viewtype), parameters, data => {
$(containerSelector).html(data);

if ($(containerSelector + ' .subnav').length > 0) {
$('.module-actions').html(`<ul class="nav nav-tabs">${$(containerSelector + ' .subnav').html()}</li>`);
$(containerSelector + ' .subnav').remove();
}else{

$('.module-actions').html('');

$('.module-actions').empty();
}

$(document).trigger('event.' + layout);


$(document).trigger(`event.${layout}`);
});

}

function generateUrl(controller,viewtype='json',extraparams={}){
let _url= whmcsBaseUrl+adminBaseRoutePath+'/';
_url +='addonmodules.php?module=' + modulename + '&appcontroller='+controller+'&viewtype='+viewtype;
$.each(extraparams, function (k, v) {
_url+='&'+k+'='+v;
let _url = `${whmcsBaseUrl}${adminBaseRoutePath}/addonmodules.php?module=${modulename}&appcontroller=${controller}&viewtype=${viewtype}`;
$.each(extraparams, (k, v) => {
_url += `&${k}=${v}`;
});
return _url;
}
Expand Down
51 changes: 25 additions & 26 deletions modules/addons/dnaextended/assets/module.settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,64 +6,63 @@
* Bünyamin AKÇAY <bunyamin@bunyam.in>
*/

const $saveSettingsBtn = $('#savesettings');
const $settingsForm = $('#settingsform');
const $generalModal = $('#generalmodal');
const $cronResult = $('<div class="cronresult" style="min-height: 200px;width: 100%;overflow-x: scroll;background-color: lightgray; margin-left: 1px;"> </div>');

$(document).on("click",'#savesettings', function(){

$('#savesettings').button('loading');
$saveSettingsBtn.button('loading');

$.ajax({
url : generateUrl('settings','json',{settingaction:'save'}),
type : 'POST',
data : $('#settingsform').serialize(),
data: $settingsForm.serialize(),
dataType: 'json',
success : function(data) {
$('#savesettings').button('reset');
success: function() {
$saveSettingsBtn.button('reset');
}
});

});


$(document).on("click",'#runmanualcron', function(){

$('#generalmodal').modal('show');
$('#generalmodal .modal-title').html(window._lang.manually_run_cron);
$('#generalmodal .modal-footer .extrabuttons').html('');
$('#generalmodal .modal-body').html('<div class=" cronresult" style="min-height: 200px;width: 100%;overflow-x: scroll;background-color: lightgray; margin-left: 1px;"> </div>');

$('.cronresult').append('<li style="color: green;">'+window._lang.cron_started+'</li>');
$('.cronresult').append('<i class="fa fa-cog fa-spin fa-fw"></i>');

makeSyncRequest()


showGeneralModal();
$cronResult.append(`<li style="color: green;">${window._lang.cron_started}</li>`);
$cronResult.append('<i class="fa fa-cog fa-spin fa-fw"></i>');
makeSyncRequest();
});

function showGeneralModal() {
$generalModal.modal('show');
$generalModal.find('.modal-title').html(window._lang.manually_run_cron);
$generalModal.find('.modal-footer .extrabuttons').empty();
$generalModal.find('.modal-body').html($cronResult);
}

function makeSyncRequest(){


$.ajax({
url : generateUrl('settings','json',{settingaction:'sync'}),
type : 'POST',
data : [],
dataType: 'json',
success : function(data) {

if(data.result.apiresp=='OK'){

$('.cronresult').append('<li style="color: green;">Page num:' + data.result.query.PageNumber + ' of request. '+data.result.domaincount+' records processed.</li>');
if (data.result.apiresp === 'OK') {
$cronResult.append(`<li style="color: green;">Page num: ${data.result.query.PageNumber} of request. ${data.result.domaincount} records processed.</li>`);

if(data.result.domaincount<data.result.query.PageSize) {
$('.cronresult').append('<li style="color: green;">Manual Run Cron finished <i class="fa fa-check"></i></li>');
$('.fa-cog').remove();
$cronResult.append('<li style="color: green;">Manual Run Cron finished <i class="fa fa-check"></i></li>');
$cronResult.find('.fa-cog').remove();
}else{
makeSyncRequest();
}

}else{
$('.cronresult').append('<li style="color: red;">Manual Run Cron failed due to api response</li>')
$cronResult.append('<li style="color: red;">Manual Run Cron failed due to api response</li>');
}
},
}
});

}
Expand Down
2 changes: 1 addition & 1 deletion modules/addons/dnaextended/whmcs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"schema": "1.0",
"schema": "1.1",
"type": "whmcs-addons",
"name": "dnaextended",
"license": "proprietary",
Expand Down

0 comments on commit d49329d

Please sign in to comment.