Skip to content

Commit

Permalink
added the sql for updated permissions
Browse files Browse the repository at this point in the history
  • Loading branch information
danielkerr committed Jun 26, 2016
1 parent 8328b66 commit da6d9a8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 62 deletions.
61 changes: 0 additions & 61 deletions upload/admin/view/template/sale/order_list.tpl
Expand Up @@ -264,67 +264,6 @@ $('#button-delete').on('click', function(e) {
return false;
}
});
$(document).delegate('#button-ip-add', 'click', function() {
$.ajax({
url: 'index.php?route=user/api/addip&token=<?php echo $token; ?>&api_id=<?php echo $api_id; ?>',
type: 'post',
data: 'ip=<?php echo $api_ip; ?>',
dataType: 'json',
beforeSend: function() {
$('#button-ip-add').button('loading');
},
complete: function() {
$('#button-ip-add').button('reset');
},
success: function(json) {
$('.alert').remove();
if (json['error']) {
$('#content > .container-fluid').prepend('<div class="alert alert-danger"><i class="fa fa-exclamation-circle"></i> ' + json['error'] + ' <button type="button" class="close" data-dismiss="alert">&times;</button></div>');
}
if (json['success']) {
$('#content > .container-fluid').prepend('<div class="alert alert-success"><i class="fa fa-check-circle"></i> ' + json['success'] + ' <button type="button" class="close" data-dismiss="alert">&times;</button></div>');
$(node).parents("tr").remove();
}
},
error: function(xhr, ajaxOptions, thrownError) {
alert(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
}
});
});
// Login to the API
var token = '';
$.ajax({
url: '<?php echo $catalog; ?>index.php?route=api/login',
type: 'post',
data: 'key=<?php echo $api_key; ?>',
dataType: 'json',
crossDomain: true,
success: function(json) {
$('.alert').remove();
if (json['error']) {
if (json['error']['key']) {
$('#content > .container-fluid').prepend('<div class="alert alert-danger"><i class="fa fa-exclamation-circle"></i> ' + json['error']['key'] + ' <button type="button" class="close" data-dismiss="alert">&times;</button></div>');
}
if (json['error']['ip']) {
$('#content > .container-fluid').prepend('<div class="alert alert-danger"><i class="fa fa-exclamation-circle"></i> ' + json['error']['ip'] + ' <button type="button" id="button-ip-add" data-loading-text="<?php echo $text_loading; ?>" class="btn btn-danger btn-xs pull-right"><i class="fa fa-plus"></i> <?php echo $button_ip_add; ?></button></div>');
}
}
if (json['token']) {
token = json['token'];
}
},
error: function(xhr, ajaxOptions, thrownError) {
alert(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
}
});
//--></script>
<script src="view/javascript/jquery/datetimepicker/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
<link href="view/javascript/jquery/datetimepicker/bootstrap-datetimepicker.min.css" type="text/css" rel="stylesheet" media="screen" />
Expand Down

0 comments on commit da6d9a8

Please sign in to comment.