From abb4be62aada3f7d08379a8a8c4148046b113d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= <aurelien.delobelle@ens.fr>
Date: Mon, 22 Aug 2016 16:42:03 +0200
Subject: [PATCH] Le panier prend en compte la majoration

---
 kfet/static/kfet/js/kfet.js    | 1 -
 kfet/templates/kfet/kpsul.html | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/kfet/static/kfet/js/kfet.js b/kfet/static/kfet/js/kfet.js
index f9a4b040..151a7bd5 100644
--- a/kfet/static/kfet/js/kfet.js
+++ b/kfet/static/kfet/js/kfet.js
@@ -1,6 +1,5 @@
 $(document).ready(function() {
     $(window).scroll(function() {
-        console.log($(this).scrollTop());
         if ($(window).width() >= 768 && $(this).scrollTop() > 72.6) {
             $('.col-content-left').css({'position':'fixed', 'top':'50px'});
             $('.col-content-right').addClass('col-sm-offset-4 col-md-offset-3');
diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 8b8a335a..dcdca3ad 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -687,14 +687,18 @@ $(document).ready(function() {
         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;
         var reduc_divisor = 1;
         if (account_data['is_cof'])
             reduc_divisor = 1 + settings['subvention_cof'] / 100;
-        return - article_data[3] * nb / reduc_divisor;
+        return amount_euro / reduc_divisor;
     }
 
     function addPurchase(id, nb) {
         var amount_euro = amountEuroPurchase(id, nb).toFixed(2);
+        console.log(amount_euro);
         var index = addPurchaseToFormset(article_data[1], nb, amount_euro);
         article_basket_html = $(item_basket_default_html);
         article_basket_html