From fcc2ab8810adb8a5a937ca21948b65c54c2660ec Mon Sep 17 00:00:00 2001
From: Qwann <narmanli@clipper.ens.fr>
Date: Fri, 17 Mar 2017 19:17:36 +0100
Subject: [PATCH] frontend working

---
 kfet/templates/kfet/kpsul.html | 9 ++++++---
 kfet/views.py                  | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 264422f0..7b907f80 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -646,7 +646,7 @@ $(document).ready(function() {
             });
         $after.after(article_html);
         // Pour l'autocomplétion
-        articlesList.push([article['name'],article['id'],article['category_id'],article['price'], article['stock']]);
+        articlesList.push([article['name'],article['id'],article['category_id'],article['price'], article['stock'],article['category__has_addcost']]);
     }
 
     function getArticles() {
@@ -830,8 +830,11 @@ $(document).ready(function() {
         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;
+        if (settings['addcost_for']
+            && settings['addcost_amount']
+            && account_data['trigramme'] != settings['addcost_for']
+            && article_data['5'])
+                amount_euro -= settings['addcost_amount'] * nb;
         var reduc_divisor = 1;
         if (account_data['is_cof'])
             reduc_divisor = 1 + settings['subvention_cof'] / 100;
diff --git a/kfet/views.py b/kfet/views.py
index bf7efc1d..b0415c30 100644
--- a/kfet/views.py
+++ b/kfet/views.py
@@ -1393,7 +1393,8 @@ def history_json(request):
 def kpsul_articles_data(request):
     articles = (
         Article.objects
-        .values('id', 'name', 'price', 'stock', 'category_id', 'category__name')
+        .values('id', 'name', 'price', 'stock', 'category_id',
+                'category__name', 'category__has_addcost')
         .filter(is_sold=True))
     return JsonResponse({ 'articles': list(articles) })