DGNum/gestioCOF
13
2
Fork 2
Code Issues 82 Pull requests 18 Projects Releases 12 Packages Wiki Activity Actions

K-Psul - Edition

Browse source 
- Via "F8", possible de faire des charges sans modifier la caisse si
  l'utilisateur a la permission `kfet.edit_balance_account`. Un
commentaire est alors nécessaire sur la commande.
This commit is contained in:
Aurélien Delobelle 2016-08-31 01:36:58 +02:00
parent 95fd6ed655
commit 3444426114
5 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
kfet/templates/kfet/kpsul.html
View file

@ -543,8 +543,8 @@ $(document).ready(function() {
var articleSelect = $('#article_autocomplete');
var articleId = $('#article_id');
var articleNb = $('#article_number');
// 8:Backspace|9:Tab|13:Enter|46:DEL|112-117:F1-6|120-123:F9-F12
var normalKeys = /^(8|9|13|46|112|113|114|115|116|117|120|121|122|123)$/;
// 8:Backspace|9:Tab|13:Enter|46:DEL|112-117:F1-6|119-123:F8-F12
var normalKeys = /^(8|9|13|46|112|113|114|115|116|117|119|120|121|122|123)$/;
var articlesList = [];
function deleteNonMatching(array, str) {
@ -694,14 +694,15 @@ $(document).ready(function() {
updateBasketRel();
}
function addDeposit(amount) {
function addDeposit(amount, is_checkout=1) {
var deposit_basket_html = $(item_basket_default_html);
var amount = parseFloat(amount).toFixed(2);
var index = addDepositToFormset(amount);
var index = addDepositToFormset(amount, is_checkout);
var text = is_checkout ? 'Charge' : 'Édition';
deposit_basket_html
.attr('data-opeindex', index)
.find('.number').text(amount+"€").end()
.find('.name').text('Charge').end()
.find('.name').text(text).end()
.find('.amount').text(amountToUKF(amount, account_data['is_cof']));
basket_container.prepend(deposit_basket_html);
updateBasketRel();
@ -809,9 +810,10 @@ $(document).ready(function() {
// Ask deposit or withdraw
// -----
function askDeposit() {
function askDeposit(is_checkout=1) {
var title = is_checkout ? 'Montant de la charge' : "Montant de l'édition";
$.confirm({
title: 'Montant de la charge',
title: title,
content: '<input type="number" step="0.01" min="0.01" on autofocus placeholder="€">',
backgroundDismiss: true,
animation:'top',
@ -821,7 +823,7 @@ $(document).ready(function() {
var amount = this.$content.find('input').val();
if (!$.isNumeric(amount) || amount <= 0)
return false;
addDeposit(amount);
addDeposit(amount, is_checkout);
},
onOpen: function() {
var that = this
@ -1150,6 +1152,10 @@ $(document).ready(function() {
articleSelect.focus();
}
return false;
case 119:
// F8 - Edition
askDeposit(0);
return false;
case 120:
// F9 - Addcost
askAddcost();