From 15b2fbbf5a302a4acdb49971cc38831acf430fd1 Mon Sep 17 00:00:00 2001 From: ilmedova Date: Wed, 27 Oct 2021 16:19:00 +0500 Subject: [PATCH] beletli prices added --- .../Admin/FolderCrudController.php | 1 + app/Models/Folder.php | 3 +- ...5216_add_beletmahabat_to_folders_table.php | 32 ++++++ public/assets/js/mahabat_scripts.js | 97 +++++++++++-------- resources/views/web/bukjalar.blade.php | 30 +++--- 5 files changed, 105 insertions(+), 58 deletions(-) create mode 100644 database/migrations/2021_10_26_175216_add_beletmahabat_to_folders_table.php diff --git a/app/Http/Controllers/Admin/FolderCrudController.php b/app/Http/Controllers/Admin/FolderCrudController.php index 1c7b0253..1cd8adcf 100644 --- a/app/Http/Controllers/Admin/FolderCrudController.php +++ b/app/Http/Controllers/Admin/FolderCrudController.php @@ -77,6 +77,7 @@ class FolderCrudController extends CrudController ['label'=>'Web','name'=>'on_web','type'=>'checkbox'], ['label'=>'Belet','name'=>'on_belet','type'=>'checkbox'], //checkBox + ['label'=>'Üstüne goşmaça baha goýmalymy?','name'=>'beletli','type'=>'checkbox'], ['label'=>'Ulanyjy wagt aralygyny saýlamaly.', 'name'=>'choice_time','type'=>'checkbox'], //Table [ diff --git a/app/Models/Folder.php b/app/Models/Folder.php index 7bf3b827..0aa7b141 100644 --- a/app/Models/Folder.php +++ b/app/Models/Folder.php @@ -31,7 +31,8 @@ class Folder extends Model 'on_subtitle', 'on_web', 'on_belet', - 'usage_name' + 'usage_name', + 'beletli' ]; // protected $hidden = []; // protected $dates = []; diff --git a/database/migrations/2021_10_26_175216_add_beletmahabat_to_folders_table.php b/database/migrations/2021_10_26_175216_add_beletmahabat_to_folders_table.php new file mode 100644 index 00000000..16fac4ae --- /dev/null +++ b/database/migrations/2021_10_26_175216_add_beletmahabat_to_folders_table.php @@ -0,0 +1,32 @@ +boolean('beletli')->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 c7e4dced..109260eb 100644 --- a/public/assets/js/mahabat_scripts.js +++ b/public/assets/js/mahabat_scripts.js @@ -104,6 +104,7 @@ document.body.onload = function () { let title = $('#folder_select option:selected').text(); let f_val = $('#folder_select option:selected').attr('folder_propId'); + let beletli = $('#folder_select option:selected').attr('beletli'); $('#selected_folder_text').html(title); var f_choice_time = $('#folder_select option:selected').attr('choiceTime'); var f_numb=parseInt(f_choice_time); @@ -184,32 +185,39 @@ document.body.onload = function () { if(count == ''){count=0} - if(folder_id == 1){ - if(folder_name.includes('Altyn')){ - beletprice = 200; + if(beletli){ + if(folder_id == 1){ + if(folder_name.includes('Altyn')){ + beletprice = 200; + } + else{ + beletprice = 100; + } } - else{ - beletprice = 100; + + if(folder_id == 2){ + if(folder_name.includes('Altyn')){ + beletprice = 200; + } + else{ + beletprice = 100; + } + } + + if(folder_id == 3){ + if(folder_name.includes('Gold')){ + beletprice = 253; + } + else{ + beletprice = 127; + } } } + else{ + beletprice = 0; + } + - if(folder_id == 2){ - if(folder_name.includes('Altyn')){ - beletprice = 200; - } - else{ - beletprice = 100; - } - } - - if(folder_id == 3){ - if(folder_name.includes('Gold')){ - beletprice = 253; - } - else{ - beletprice = 127; - } - } if(folder_id == 1 && f_numb == 1){ var time= $('#select_time1 option:selected').text(); time_price = parseFloat($('#select_time1 option:selected').val()); @@ -284,29 +292,34 @@ document.body.onload = function () { var count = $('#choices_count').html(); if(count == ''){count=0} count = parseInt(count); - if(folder_prop_id == 1){ - if(folder_name.includes('Altyn')){ - beletadd_price = 200; + if(beletli){ + if(folder_prop_id == 1){ + if(folder_name.includes('Altyn')){ + beletadd_price = 200; + } + else{ + beletadd_price = 100; + } } - else{ - beletadd_price = 100; + if(folder_prop_id == 2){ + if(folder_name.includes('Altyn')){ + beletadd_price = 200; + } + else{ + beletadd_price = 100; + } + } + if(folder_prop_id == 3){ + if(folder_name.includes('Gold')){ + beletadd_price = 253; + } + else{ + beletadd_price = 127; + } } } - if(folder_prop_id == 2){ - if(folder_name.includes('Altyn')){ - beletadd_price = 200; - } - else{ - beletadd_price = 100; - } - } - if(folder_prop_id == 3){ - if(folder_name.includes('Gold')){ - beletadd_price = 253; - } - else{ - beletadd_price = 127; - } + else{ + beletadd_price = 0; } if(folder_prop_id == 1 && f_numb==1){ var time= $('#select_time1 option:selected').text(); diff --git a/resources/views/web/bukjalar.blade.php b/resources/views/web/bukjalar.blade.php index 61230409..8f1310cd 100644 --- a/resources/views/web/bukjalar.blade.php +++ b/resources/views/web/bukjalar.blade.php @@ -337,19 +337,19 @@ @foreach($folders as $folder) @if($folder->property->filter_value == 1) @if($folder->usage_name == 'on_tv') - + @endif @if($folder->usage_name == 'on_radio') - + @endif @if($folder->usage_name == 'on_subtitle') - + @endif @if($folder->usage_name == 'on_web') - + @endif @if($folder->usage_name == 'on_belet') - + @endif @endif @endforeach @@ -358,19 +358,19 @@ @foreach($folders as $folder) @if($folder->property->filter_value == 2) @if($folder->usage_name == 'on_tv') - + @endif @if($folder->usage_name == 'on_radio') - + @endif @if($folder->usage_name == 'on_subtitle') - + @endif @if($folder->usage_name == 'on_web') - + @endif @if($folder->usage_name == 'on_belet') - + @endif @endif @endforeach @@ -379,19 +379,19 @@ @foreach($folders as $folder) @if($folder->property->filter_value == 3) @if($folder->usage_name == 'on_tv') - + @endif @if($folder->usage_name == 'on_radio') - + @endif @if($folder->usage_name == 'on_subtitle') - + @endif @if($folder->usage_name == 'on_web') - + @endif @if($folder->usage_name == 'on_belet') - + @endif @endif @endforeach