diff --git a/app/Http/Controllers/Admin/FolderCrudController.php b/app/Http/Controllers/Admin/FolderCrudController.php index ad9c44f8..d6af772d 100644 --- a/app/Http/Controllers/Admin/FolderCrudController.php +++ b/app/Http/Controllers/Admin/FolderCrudController.php @@ -56,6 +56,19 @@ class FolderCrudController extends CrudController return $query->orderBy('id','ASC')->get(); }) ], + //Select + [ + 'label'=>'Tablisa nirä degişli?', + 'name'=>'usage_name', + 'type'=>'select_from_array', + 'options' => [ + 'TV' => 'TV', + 'Radio' => 'Radio', + 'Belet' => 'Belet', + 'Subtitle' => 'Subtitle', + 'Website' => 'Website', + ] + ], //Total Price ['label'=>'Umumy bahsy (Total price)','name'=>'total_price','type'=>'text'], ['label'=>'TV','name'=>'on_tv','type'=>'checkbox'], diff --git a/app/Models/Folder.php b/app/Models/Folder.php index 85691b2d..7bf3b827 100644 --- a/app/Models/Folder.php +++ b/app/Models/Folder.php @@ -30,7 +30,8 @@ class Folder extends Model 'on_radio', 'on_subtitle', 'on_web', - 'on_belet' + 'on_belet', + 'usage_name' ]; // protected $hidden = []; // protected $dates = []; diff --git a/database/migrations/2021_08_12_134558_add_type_to_folders_table.php b/database/migrations/2021_08_12_134558_add_type_to_folders_table.php new file mode 100644 index 00000000..725579f1 --- /dev/null +++ b/database/migrations/2021_08_12_134558_add_type_to_folders_table.php @@ -0,0 +1,32 @@ +string('usage_name')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('folders', function (Blueprint $table) { + // + }); + } +} diff --git a/public/assets/js/mahabat_scripts.js b/public/assets/js/mahabat_scripts.js index d294fdb2..691a66ab 100644 --- a/public/assets/js/mahabat_scripts.js +++ b/public/assets/js/mahabat_scripts.js @@ -103,13 +103,8 @@ document.body.onload = function () { } let title = $('#folder_select option:selected').text(); - // let val = $('#folder_select option:selected').val(); let f_val = $('#folder_select option:selected').attr('folder_propId'); - // $('#selected_folder_id').html(f_val); - $('#selected_folder_text').html(title); - // let id=$('#selected_folder_id').text(); - // let name=$('#selected_folder_text').text(); - // let f_numb=parseInt(name.replace(/\D+/g,"")) + $('#selected_folder_text').html(title); var f_choice_time = $('#folder_select option:selected').attr('choiceTime'); var f_numb=parseInt(f_choice_time); var time=0; @@ -172,7 +167,6 @@ document.body.onload = function () { $('select option').removeAttr('selected'); }) - //calculator script $(document).ready(function () { $('#hasapla-btn').click(function () { @@ -253,10 +247,10 @@ document.body.onload = function () { var time= $('#select_time1 option:selected').text(); time_price = parseFloat($('#select_time1 option:selected').val()); if(folder_name.includes('Altyn')){ - beletadd_price = 300; + beletadd_price = 200; } else{ - beletadd_price = 150; + beletadd_price = 100; } }else @@ -264,10 +258,10 @@ document.body.onload = function () { var time= $('#select_time2 option:selected').text(); time_price = parseFloat($('#select_time2 option:selected').val()); if(folder_name.includes('Altyn')){ - beletadd_price = 300; + beletadd_price = 200; } else{ - beletadd_price = 150; + beletadd_price = 100; } }else if(folder_prop_id == 3 && f_numb==1){ @@ -278,10 +272,10 @@ document.body.onload = function () { // bukja_price=parseInt(str.replace(/\D+/g,"")); bukja_price=parseFloat(str); if(folder_name.includes('Altyn')){ - beletadd_price = 300; + beletadd_price = 127; } else{ - beletadd_price = 380; + beletadd_price = 253; } } if(sec>0 && day>0 && time_price >=1){ @@ -302,7 +296,8 @@ document.body.onload = function () { 'folder_name':folder_name, 'day':day, 'time':time, - 'total':total + 'total':total, + 'belet_price':belet_price } choices.push(folder_obj); @@ -312,6 +307,7 @@ document.body.onload = function () {