kfet/static/kfet/js/kfet.js

@@ -38,7 +38,7 @@ function amountDisplay(amount, is_cof=false, tri='') {
 }
 
 function amountToUKF(amount, is_cof=false) {
-    var coef_cof = is_cof ? 1 + settings['subvention_cof'] / 100 : 1;
+    var coef_cof = is_cof ? 1 + window.settings['subvention_cof'] / 100 : 1;
     return Math.round(amount * coef_cof * 10);
 }
 

kfet/templates/kfet/kpsul.html

@@ -170,16 +170,17 @@
 
 <script type="text/javascript">
 $(document).ready(function() {
+    'use strict';
     // -----
     // General
     // -----
 
     // Lock to avoid multiple requests
-    lock = 0;
+    var lock = 0;
 
     // Retrieve settings
 
-    settings = {}
+    window.settings = {}
 
     function resetSettings() {
         $.ajax({
@@ -188,9 +189,9 @@ $(document).ready(function() {
             method  : "POST",
         })
         .done(function(data) {
-            settings['addcost_for'] = data['addcost_for'];
+            window.settings['addcost_for'] = data['addcost_for'];
-            settings['addcost_amount'] = parseFloat(data['addcost_amount']);
+            window.settings['addcost_amount'] = parseFloat(data['addcost_amount']);
-            settings['subvention_cof'] = parseFloat(data['subvention_cof']);
+            window.settings['subvention_cof'] = parseFloat(data['subvention_cof']);
             displayAddcost();
         });
     }
@@ -813,10 +814,7 @@ $(document).ready(function() {
     var basket_container = $('#basket table');
     var arrowKeys = /^(37|38|39|40)$/;
 
-    function amountEuroPurchase(id,nb) {
+    function amountEuroPurchase(article_data, nb) {
-        var i = 0;
-        while (i<articlesList.length && id != articlesList[i][1]) i++;
-        article_data = articlesList[i];
         var amount_euro = - article_data[3] * nb ;
         if (settings['addcost_for'] && settings['addcost_amount'] && account_data['trigramme'] != settings['addcost_for'])
             amount_euro -= settings['addcost_amount'] * nb;
@@ -827,9 +825,14 @@ $(document).ready(function() {
     }
 
     function addPurchase(id, nb) {
-        var amount_euro = amountEuroPurchase(id, nb).toFixed(2);
+
+        var i = 0;
+        while (i<articlesList.length && id != articlesList[i][1]) i++;
+        var article_data = articlesList[i];
+
+        var amount_euro = amountEuroPurchase(article_data, nb).toFixed(2);
         var index = addPurchaseToFormset(article_data[1], nb, amount_euro);
-        article_basket_html = $(item_basket_default_html);
+        var article_basket_html = $(item_basket_default_html);
         article_basket_html
             .attr('data-opeindex', index)
             .find('.number').text(nb).end()
@@ -1079,7 +1082,7 @@ $(document).ready(function() {
     // History
     // -----
 
-    khistory = new KHistory();
+    var khistory = new KHistory();
 
     function getHistory() {
         var data = {
@@ -1222,14 +1225,14 @@ $(document).ready(function() {
     // Synchronization
     // -----
 
-    websocket_msg_default = {'opegroups':[],'opes':[],'checkouts':[],'articles':[]}
+    var websocket_msg_default = {'opegroups':[],'opes':[],'checkouts':[],'articles':[]}
 
     var websocket_protocol = window.location.protocol == 'https:' ? 'wss' : 'ws';
     var location_host = window.location.host;
     var location_url = window.location.pathname.startsWith('/gestion/') ? location_host + '/gestion' : location_host;
-    socket = new ReconnectingWebSocket(websocket_protocol+"://" + location_url + "/ws/k-fet/k-psul/");
+    var socket = new ReconnectingWebSocket(websocket_protocol+"://" + location_url + "/ws/k-fet/k-psul/");
     socket.onmessage = function(e) {
-        data = $.extend({}, websocket_msg_default, JSON.parse(e.data));
+        var data = $.extend({}, websocket_msg_default, JSON.parse(e.data));
 
         for (var i=0; i<data['opegroups'].length; i++) {
             if (data['opegroups'][i]['add']) {
@@ -1250,7 +1253,7 @@ $(document).ready(function() {
             }
         }
         for (var i=0; i<data['articles'].length; i++) {
-            article = data['articles'][i];
+            var article = data['articles'][i];
             articles_container.find('#data-article-'+article['id']+' .stock')
                 .text(article['stock']);
         }