From e1c7f74e4928786ab1f97e52ed2cddfdc7e2ce72 Mon Sep 17 00:00:00 2001 From: ilmedova Date: Thu, 26 Aug 2021 13:42:09 +0500 Subject: [PATCH] try this changes in price belet --- public/assets/js/mahabat_scripts.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/public/assets/js/mahabat_scripts.js b/public/assets/js/mahabat_scripts.js index 0e50a4d3..c7e4dced 100644 --- a/public/assets/js/mahabat_scripts.js +++ b/public/assets/js/mahabat_scripts.js @@ -181,7 +181,9 @@ document.body.onload = function () { var f_numb=parseInt(f_choice_time); var beletprice; var count = $('#choices_count').html(); + if(count == ''){count=0} + if(folder_id == 1){ if(folder_name.includes('Altyn')){ beletprice = 200; @@ -190,6 +192,7 @@ document.body.onload = function () { beletprice = 100; } } + if(folder_id == 2){ if(folder_name.includes('Altyn')){ beletprice = 200; @@ -198,6 +201,7 @@ document.body.onload = function () { beletprice = 100; } } + if(folder_id == 3){ if(folder_name.includes('Gold')){ beletprice = 253; @@ -225,20 +229,18 @@ document.body.onload = function () { } else {var time='Bukjada görkezilen hemme wagt aralyklary.' time_price = NaN; - // bukja_price=parseInt(str.replace(/\D+/g,"")); bukja_price=parseFloat(str); } sec = parseInt(sec); day = parseInt(day); - // count = parseInt(count); var total = 0; if (sec>0 && day>0 && time_price>=1 && !bukja_price>=0){ if(folder_name.includes('Altyn')){ - total = ((sec*day*time_price)/60)+(day**200); + total = ((sec*day*time_price)/60)+(day*beletprice); total=total.toFixed(2); } else{ - total = ((sec*day*time_price)/60)+(day*100); + total = ((sec*day*time_price)/60)+(day*beletprice); total=total.toFixed(2); } } @@ -256,7 +258,6 @@ document.body.onload = function () { alert('Hasaplamak üçin ähli öýjükler saýlanan bolmaly!'); } $('#all_price').html(total); - // console.log(total); }) $('#add_new_calc').click(function () { @@ -310,21 +311,22 @@ document.body.onload = function () { if(folder_prop_id == 1 && f_numb==1){ var time= $('#select_time1 option:selected').text(); time_price = parseFloat($('#select_time1 option:selected').val()); - }else - if(folder_prop_id == 2 && f_numb==1){ + } + else if(folder_prop_id == 2 && f_numb==1){ var time= $('#select_time2 option:selected').text(); time_price = parseFloat($('#select_time2 option:selected').val()); - }else - if(folder_prop_id == 3 && f_numb==1){ + } + else if(folder_prop_id == 3 && f_numb==1){ var time= $('#select_time3 option:selected').text(); time_price = parseFloat($('#select_time3 option:selected').val()); - } else {var time='Bukjada görkezilen hemme wagt aralyklary.' + } + else {var time='Bukjada görkezilen hemme wagt aralyklary.' time_price = 0; // bukja_price=parseInt(str.replace(/\D+/g,"")); bukja_price=parseFloat(str); } if(sec>0 && day>0 && time_price >=1){ - var total = ((sec*day*time_price)/60)+(day**beletadd_price); + var total = ((sec*day*time_price)/60)+(day*beletadd_price); total = total.toFixed(2); } if(sec>0 && day>0 && bukja_price >=1){