diff --git a/kfet/static/kfet/css/kpsul.css b/kfet/static/kfet/css/kpsul.css index 9fd53604..e7950914 100644 --- a/kfet/static/kfet/css/kpsul.css +++ b/kfet/static/kfet/css/kpsul.css @@ -8,7 +8,7 @@ input[type=number]::-webkit-outer-spin-button { margin: 0; } -#account, #checkout, input, #history, #basket, #basket_rel, #articles_data { +#account, #checkout, input, #history, #basket, #basket_rel, #previous_op, #articles_data { background:#fff; } @@ -335,12 +335,13 @@ input[type=number]::-webkit-outer-spin-button { padding:0; } -#basket, #basket_rel { +#basket, #basket_rel, #previous_op { height:100%; } -#basket_rel { +#basket_rel, #previous_op { border-top:1px solid #C8102E; + padding-left: 3px; } #basket { @@ -354,6 +355,11 @@ input[type=number]::-webkit-outer-spin-button { #basket_rel { border-top:0; margin-left:7px; + margin-right:7px; + } + #previous_op { + border-top:0; + margin-left:7px; } } @@ -385,6 +391,16 @@ input[type=number]::-webkit-outer-spin-button { /* History */ +#previous_op .trigramme { + width:100%; + background-color:rgba(200,16,46,0.85); + color:#FFF; + font-weight:bold; + padding:3px; + margin-left: -3px; + margin-bottom: 3px; +} + .kpsul_middle_right_col { overflow:auto; } diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html index 26c98e55..7c0437fa 100644 --- a/kfet/templates/kfet/kpsul.html +++ b/kfet/templates/kfet/kpsul.html @@ -138,10 +138,14 @@ -
+
+
+
+
+
@@ -476,6 +480,7 @@ $(document).ready(function() { }, }) .done(function(data) { + updatePreviousOp(); coolReset(); lock = 0; }) @@ -1048,6 +1053,20 @@ $(document).ready(function() { }); } + var previousop_container = $('#previous_op'); + + function updatePreviousOp() { + var previousop_html = ''; + var trigramme = account_data['trigramme']; + previousop_html += '
Trigramme : '+trigramme+'
'; + previousop_html += basketrel_container.html(); + previousop_container.html(previousop_html); + } + + function resetPreviousOp() { + previousop_container.html(''); + } + // ----- // Addcost // ----- @@ -1216,6 +1235,7 @@ $(document).ready(function() { coolReset(give_tri_focus); checkoutInput.trigger('change'); resetArticles(); + resetPreviousOp(); khistory.reset(); resetSettings(); getArticles();