From 52486cee17db11458605b759c06ad16b0df31d97 Mon Sep 17 00:00:00 2001 From: ilmedova Date: Thu, 21 Jul 2022 11:03:29 +0500 Subject: [PATCH] aydym.com mahabat added to mahabat menu --- .../Admin/FolderCrudController.php | 8 ++-- app/Models/Folder.php | 1 + composer.json | 5 +- ...7_21_131512_add_aydym_to_folders_table.php | 32 +++++++++++++ public/assets/js/mahabat_scripts.js | 48 +++++++++---------- resources/views/web/bukjalar.blade.php | 40 +++++++++++++++- 6 files changed, 104 insertions(+), 30 deletions(-) create mode 100644 database/migrations/2022_07_21_131512_add_aydym_to_folders_table.php diff --git a/app/Http/Controllers/Admin/FolderCrudController.php b/app/Http/Controllers/Admin/FolderCrudController.php index 1cd8adcf..6dc2788e 100644 --- a/app/Http/Controllers/Admin/FolderCrudController.php +++ b/app/Http/Controllers/Admin/FolderCrudController.php @@ -62,9 +62,10 @@ class FolderCrudController extends CrudController 'name'=>'usage_name', 'type'=>'select_from_array', 'options' => [ - 'on_tv' => 'TV', - 'on_radio' => 'Radio', - 'on_belet' => 'Belet', + 'on_tv' => 'TV', + 'on_radio' => 'Radio', + 'on_belet' => 'Belet', + 'on_aydym' => 'Aýdym.com', 'on_subtitle' => 'Subtitle', 'on_web' => 'Website', ] @@ -76,6 +77,7 @@ class FolderCrudController extends CrudController ['label'=>'Subtitle','name'=>'on_subtitle','type'=>'checkbox'], ['label'=>'Web','name'=>'on_web','type'=>'checkbox'], ['label'=>'Belet','name'=>'on_belet','type'=>'checkbox'], + ['label'=>'Aýdym.com','name'=>'on_aydym','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'], diff --git a/app/Models/Folder.php b/app/Models/Folder.php index 0aa7b141..4217b476 100644 --- a/app/Models/Folder.php +++ b/app/Models/Folder.php @@ -31,6 +31,7 @@ class Folder extends Model 'on_subtitle', 'on_web', 'on_belet', + 'on_aydym', 'usage_name', 'beletli' ]; diff --git a/composer.json b/composer.json index f0183bba..53617285 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,10 @@ "config": { "optimize-autoloader": true, "preferred-install": "dist", - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "composer/installers": true + } }, "extra": { "laravel": { diff --git a/database/migrations/2022_07_21_131512_add_aydym_to_folders_table.php b/database/migrations/2022_07_21_131512_add_aydym_to_folders_table.php new file mode 100644 index 00000000..372882d2 --- /dev/null +++ b/database/migrations/2022_07_21_131512_add_aydym_to_folders_table.php @@ -0,0 +1,32 @@ +boolean('on_aydym')->default(0)->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 1de3c488..14d0d6cf 100644 --- a/public/assets/js/mahabat_scripts.js +++ b/public/assets/js/mahabat_scripts.js @@ -187,54 +187,54 @@ document.body.onload = function () { if(beletli != null && beletli != 0 && beletli != "0"){ if(folder_id == 1){ - if(folder_name.includes('Altyn')){ - beletprice = 200; + if(folder_name.includes('Altyn')){ + beletprice = 300; } else{ - beletprice = 100; + beletprice = 200; } } - + if(folder_id == 2){ if(folder_name.includes('Altyn')){ + beletprice = 300; + } + else{ beletprice = 200; } - else{ - beletprice = 100; - } } - + if(folder_id == 3){ - if(folder_name.includes('Gold')){ - beletprice = 253; + if(folder_name.includes('Gold')){ + beletprice = 353; } else{ - beletprice = 127; + beletprice = 227; } } } else{ beletprice = 0; } - + if(folder_id == 1 && f_numb == 1){ var time= $('#select_time1 option:selected').text(); time_price = parseFloat($('#select_time1 option:selected').val()); bukja_price=NaN; - + }else if(folder_id == 2 && f_numb == 1){ var time= $('#select_time2 option:selected').text(); time_price = parseFloat($('#select_time2 option:selected').val()); bukja_price=NaN; - + }else if(folder_id == 3 && f_numb == 1){ var time= $('#select_time3 option:selected').text(); time_price = parseFloat($('#select_time3 option:selected').val()); bukja_price=NaN; - + } else {var time='Bukjada görkezilen hemme wagt aralyklary.' time_price = NaN; bukja_price=parseFloat(str); @@ -295,27 +295,27 @@ document.body.onload = function () { count = parseInt(count); if(fbeletli != null && fbeletli != 0 && fbeletli != "0"){ if(folder_prop_id == 1){ - if(folder_name.includes('Altyn')){ - beletadd_price = 200; + if(folder_name.includes('Altyn')){ + beletadd_price = 300; } else{ - beletadd_price = 100; + beletadd_price = 200; } } if(folder_prop_id == 2){ if(folder_name.includes('Altyn')){ - beletadd_price = 200; + beletadd_price = 300; } else{ - beletadd_price = 100; + beletadd_price = 200; } } if(folder_prop_id == 3){ - if(folder_name.includes('Gold')){ - beletadd_price = 253; + if(folder_name.includes('Gold')){ + beletadd_price = 353; } else{ - beletadd_price = 127; + beletadd_price = 227; } } } @@ -333,7 +333,7 @@ document.body.onload = function () { 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.' time_price = 0; // bukja_price=parseInt(str.replace(/\D+/g,"")); diff --git a/resources/views/web/bukjalar.blade.php b/resources/views/web/bukjalar.blade.php index 1fe2e88a..1d85196f 100644 --- a/resources/views/web/bukjalar.blade.php +++ b/resources/views/web/bukjalar.blade.php @@ -56,6 +56,7 @@ +
@@ -106,13 +107,16 @@ @if($folder->on_belet) Belet @endif + @if($folder->on_aydym) + Aýdym.com + @endif @isset($folder->folder_table) @foreach($folder->folder_table as $table) - + @isset($table['time']) {{$table['time']}} @endisset @if($folder->on_tv) @isset($table['set_tv']) {{$table['set_tv']}} @endisset @@ -129,6 +133,9 @@ @if($folder->on_belet) @isset($table['set_belet']) {{$table['set_belet']}} @endisset @endif + @if($folder->on_aydym) + @isset($table['set_aydym']) {{$table['set_aydym']}} @endisset + @endif @endforeach @endisset @@ -188,6 +195,9 @@ @if($folder->on_belet) Belet @endif + @if($folder->on_aydym) + Aýdym.com + @endif @@ -210,6 +220,9 @@ @if($folder->on_belet) @isset($table['set_belet']) {{$table['set_belet']}} @endisset @endif + @if($folder->on_aydym) + @isset($table['set_aydym']) {{$table['set_aydym']}} @endisset + @endif @endforeach @endisset @@ -269,6 +282,9 @@ @if($folder->on_belet) Belet @endif + @if($folder->on_aydym) + Aýdym.com + @endif @@ -291,6 +307,9 @@ @if($folder->on_belet) @isset($table['set_belet']) {{$table['set_belet']}} @endisset @endif + @if($folder->on_aydym) + @isset($table['set_aydym']) {{$table['set_aydym']}} @endisset + @endif @endforeach @endisset @@ -351,6 +370,9 @@ @if($folder->usage_name == 'on_belet') @endif + @if($folder->usage_name == 'on_aydym') + + @endif @endif @endforeach @@ -372,6 +394,9 @@ @if($folder->usage_name == 'on_belet') @endif + @if($folder->usage_name == 'on_aydym') + + @endif @endif @endforeach @@ -393,6 +418,9 @@ @if($folder->usage_name == 'on_belet') @endif + @if($folder->usage_name == 'on_aydym') + + @endif @endif @endforeach @@ -421,6 +449,9 @@ @if($folder->on_belet != false) @endif + @if($folder->on_aydym != false) + + @endif @endforeach @endif @endif @@ -451,6 +482,9 @@ @if($folder->on_belet != false) @endif + @if($folder->on_aydym != false) + + @endif @endforeach @endif @endif @@ -481,6 +515,9 @@ @if($folder->on_belet != false) @endif + @if($folder->on_aydym != false) + + @endif @endforeach @endif @endif @@ -560,7 +597,6 @@ - {{-- zakazy sdes--}}