TPS
/
turkmentv
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

guga-push-last-version-with-filters

This commit is contained in:
Guvanch Hojamov 2020-08-15 15:30:51 +05:00
parent 06da5ac329
commit 76f7fe1fa3
5 changed files with 748 additions and 360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Admin/FolderCrudController.php
View File

@ -57,6 +57,10 @@ class FolderCrudController extends CrudController
],
//Total Price
['label'=>'Umumy bahsy (Total price)','name'=>'total_price','type'=>'text'],
['label'=>'TV','name'=>'on_tv','type'=>'checkbox'],
['label'=>'Radio','name'=>'on_radio','type'=>'checkbox'],
['label'=>'Subtitle','name'=>'on_subtitle','type'=>'checkbox'],
['label'=>'Web','name'=>'on_web','type'=>'checkbox'],
//checkBox
['label'=>'Ulanyjy wagt aralygyny saýlamaly.', 'name'=>'choice_time','type'=>'checkbox'],
//Table

2
app/Models/Folder.php
View File

@ -19,7 +19,7 @@ class Folder extends Model
// protected $primaryKey = 'id';
public $timestamps = false;
// protected $guarded = ['id'];
protected $fillable = ['title','description','property_id','folder_table','total_price','choice_time'];
protected $fillable = ['title','description','property_id','folder_table','total_price','choice_time','on_tv','on_radio','on_subtitle','on_web'];
// protected $hidden = [];
// protected $dates = [];
//json to array;

36
database/migrations/2020_08_13_195658_changefolders_table.php Normal file
View File

@ -0,0 +1,36 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class ChangefoldersTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('folders', function (Blueprint $table) {
//
$table->boolean('on_tv')->nullable();
$table->boolean('on_radio')->nullable();
$table->boolean('on_subtitle')->nullable();
$table->boolean('on_web')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('folders', function (Blueprint $table) {
//
});
}
}

916
resources/views/web/bukjalar.blade.php
View File

File diff suppressed because it is too large Load Diff

150
resources/views/web/layouts/app.blade.php
View File

@ -1,4 +1,4 @@
<!doctype html>
<!Doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
@ -56,8 +56,10 @@ toggle between hiding and showing the dropdown content */
window.onclick = function(e) {
if (!e.target.matches('.dropbtn')) {
var myDropdown = document.getElementById("myDropdown");
if (myDropdown.classList.contains('show')) {
myDropdown.classList.remove('show');
if(myDropdown != null){
if (myDropdown.classList.contains('show')) {
myDropdown.classList.remove('show');
}
}
}
}
@ -106,10 +108,54 @@ toggle between hiding and showing the dropdown content */
$('#searchId').click(function () {
$('#searchContentId').toggleClass('visible');
});
});
//Bukjalar uchin scriptler
document.body.onload = function () {
//filter-script-start
$('.tv-filter-btn').click(function () {
$('.tv-filter-btn').addClass('active-filter-btn');
$('.radio-filter-btn').removeClass('active-filter-btn');
$('.sub-filter-btn').removeClass('active-filter-btn');
$('.web-filter-btn').removeClass('active-filter-btn');
$('.bukja-table').css('display','none');
$('.on_tv').css('display','block');
})
$('.radio-filter-btn').click(function () {
$('.radio-filter-btn').addClass('active-filter-btn');
$('.tv-filter-btn').removeClass('active-filter-btn');
$('.sub-filter-btn').removeClass('active-filter-btn');
$('.web-filter-btn').removeClass('active-filter-btn');
$('.bukja-table').css('display','none');
$('.on_radio').css('display','block');
})
$('.sub-filter-btn').click(function () {
$('.sub-filter-btn').addClass('active-filter-btn');
$('.radio-filter-btn').removeClass('active-filter-btn');
$('.tv-filter-btn').removeClass('active-filter-btn');
$('.web-filter-btn').removeClass('active-filter-btn');
$('.bukja-table').css('display','none');
$('.on_subtitle').css('display','block');
})
$('.web-filter-btn').click(function () {
$('.web-filter-btn').addClass('active-filter-btn');
$('.radio-filter-btn').removeClass('active-filter-btn');
$('.sub-filter-btn').removeClass('active-filter-btn');
$('.tv-filter-btn').removeClass('active-filter-btn');
$('.bukja-table').css('display','none');
$('.on_web').css('display','block');
})
//filter-script-end
$('#opt_prop_1').attr('label',$('#prop-1').html());
$('#opt_prop_2').attr('label',$('#prop-2').html());
$('#opt_prop_3').attr('label',$('#prop-3').html());
//Bukja button +
var choices = [];
@ -123,6 +169,7 @@ toggle between hiding and showing the dropdown content */
//select folder script
setInterval(function () {
var prop_id =$('.prop_ul > li.active').attr('prop-id');
if (($('#orders_table > tr').length <=0) || ($('#orders_table > tr').length == '')){
$('#order_it_box').css('display','none');
}else {
@ -130,59 +177,85 @@ toggle between hiding and showing the dropdown content */
}
let title = $('#folder_select option:selected').text();
let val = $('#folder_select option:selected').val();
$('#selected_folder_id').html(val);
// let val = $('#folder_select option:selected').val();
let f_val = $('#folder_select option:selected').attr('folderId');
$('#selected_folder_id').html(f_val);
$('#selected_folder_text').html(title);
let id=$('#selected_folder_id').text();
// let id=$('#selected_folder_id').text();
let name=$('#selected_folder_text').text();
let f_numb=parseInt(name.replace(/\D+/g,""))
var time=0;
if(id==1 && name=='Bukja 1'){
if(f_val==1 && f_numb==1){
$('#bukja_1_1_wagt').css('display','inline-table');
$('#bukja_1_2_wagt').css('display','none');
$('#bukja_1_3_wagt').css('display','none');
var time= 1;
var time= true;
}
if(id==2 && name=='Bukja 1'){
if(f_val==2 && f_numb==1){
$('#bukja_1_1_wagt').css('display','none');
$('#bukja_1_2_wagt').css('display','inline-table');
$('#bukja_1_3_wagt').css('display','none');
var time= 1;
var time= true;
}
if(id==3 && name=='Bukja 1'){
if(f_val==3 && f_numb==1){
$('#bukja_1_1_wagt').css('display','none');
$('#bukja_1_2_wagt').css('display','none');
$('#bukja_1_3_wagt').css('display','inline-table');
var time= 1;
var time= true;
}
if(time !== 1){
if(time !== true){
$('#bukja_1_1_wagt').css('display','none');
$('#bukja_1_2_wagt').css('display','none');
$('#bukja_1_3_wagt').css('display','none');
}
if(prop_id == 1){
$('#opt_prop_1').css('display','inline-block');
$('#opt_prop_2').css('display','none');
$('#opt_prop_3').css('display','none');
}
if(prop_id == 2){
$('#opt_prop_1').css('display','none');
$('#opt_prop_2').css('display','inline-block');
$('#opt_prop_3').css('display','none');
}
if(prop_id == 3){
$('#opt_prop_1').css('display','none');
$('#opt_prop_2').css('display','none');
$('#opt_prop_3').css('display','inline-block');
}
if(($('#customer_cases').html().length > 100) ){
$('#calculator-fix').css('height','100vh');
$('#calculator-fix').removeClass('sticky');
}
}, 250);
//calculator script
$(document).ready(function () {
$('#hasapla-btn').click(function () {
var time_price=0;
var bukja_price=0;
var sec = $('#calc_second').val();
var folder_id=$('#selected_folder_id').text();
// var folder_id=$('#selected_folder_id').text();
var folder_id=$('#folder_select option:selected').attr('folderId');
var folder_name=$('#selected_folder_text').text();
var day = $('#folder_day').val();
var str = $('#folder_select option:selected').attr('price');
var f_numb=parseInt(folder_name.replace(/\D+/g,""))
var count = $('#choices_count').html();
if(count == ''){count=0}
if(folder_id == 1){
if(folder_id == 1 && f_numb == 1){
var time= $('#select_time1 option:selected').text();
time_price = parseInt($('#select_time1 option:selected').val());
bukja_price=NaN;
}else
if(folder_id == 2){
if(folder_id == 2 && f_numb == 1){
var time= $('#select_time2 option:selected').text();
time_price = parseInt($('#select_time2 option:selected').val());
bukja_price=NaN;
}else
if(folder_id == 3){
if(folder_id == 3 && f_numb == 1){
var time= $('#select_time3 option:selected').text();
time_price = parseInt($('#select_time3 option:selected').val());
bukja_price=NaN;
@ -203,7 +276,7 @@ toggle between hiding and showing the dropdown content */
alert('Hasaplamak üçin ähli öýjükler saýlanan bolmaly!');
}
$('#all_price').html(total);
console.log(total);
// console.log(total);
})
$('#add_new_calc').click(function () {
@ -215,27 +288,30 @@ toggle between hiding and showing the dropdown content */
var time_price;
var bukja_price;
var sec = $('#calc_second').val();
var folder_id=$('#selected_folder_id').text();
// var folder_id=$('#selected_folder_id').text();
var folder_id=$('#folder_select option:selected').attr('folderId');
var folder_name=$('#selected_folder_text').text();
var day = $('#folder_day').val();
var str = $('#folder_select option:selected').html();
var str = $('#folder_select option:selected').attr('price');
var f_numb=parseInt(folder_name.replace(/\D+/g,""))
var count = $('#choices_count').html();
if(count == ''){count=0}
count = parseInt(count);
if(folder_id == 1){
if(folder_id == 1 && f_numb==1){
var time= $('#select_time1 option:selected').text();
time_price = parseInt($('#select_time1 option:selected').val());
}else
if(folder_id == 2){
if(folder_id == 2 && f_numb==1){
var time= $('#select_time2 option:selected').text();
time_price = parseInt($('#select_time2 option:selected').val());
}else
if(folder_id == 3){
if(folder_id == 3 && f_numb==1){
var time= $('#select_time3 option:selected').text();
time_price = parseInt($('#select_time3 option:selected').val());
} else {var time='Bukjada görkezilen hemme wagt aralyklary.'
time_price = 0;
bukja_price=parseInt(str.replace(/\D+/g,""));
// bukja_price=parseInt(str.replace(/\D+/g,""));
bukja_price=parseInt(str);
}
if(sec>0 && day>0 && time_price >=1){
var total = sec*day*time_price;
@ -341,7 +417,7 @@ toggle between hiding and showing the dropdown content */
$('#alert_success').css('display','inline-block');
setTimeout(function () {
location.reload();
},2500)
},4000)
},
error:function (data) {
@ -353,9 +429,9 @@ toggle between hiding and showing the dropdown content */
},5000)
}
});
console.log(choices);
//console.log(choices);
}else{
alert('Ady we Telefon hokman girizmeli!')
alert('Ady we Telefon hökman girizmeli!')
}
})
//send order to backend end
@ -366,6 +442,26 @@ toggle between hiding and showing the dropdown content */
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
window.onscroll = function() {leftBarFix()};
var leftBar = document.getElementById("left-prop-links-for-fix");
var calculator = document.getElementById('calculator-fix');
var sticky = leftBar.offsetTop;
var bottom = $(window).height()-sticky;
console.log(bottom);
function leftBarFix() {
if (window.pageYOffset > sticky+200) {
leftBar.classList.add("sticky");
calculator.classList.add('sticky');
} else{
leftBar.classList.remove("sticky");
calculator.classList.remove("sticky");
}
if (window.pageYOffset > bottom-200 ){
leftBar.classList.remove("sticky");
calculator.classList.remove("sticky");
}
}
</script>
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-145040878-1"></script>
@yield('after_scripts')