guga push
This commit is contained in:
parent
6eee9395eb
commit
9184dbfb8f
|
|
@ -108,12 +108,25 @@
|
|||
<path value="$PROJECT_DIR$/vendor/backpack/permissionmanager" />
|
||||
<path value="$PROJECT_DIR$/vendor/cocur/slugify" />
|
||||
<path value="$PROJECT_DIR$/vendor/backpack/pagemanager" />
|
||||
<path value="$PROJECT_DIR$/vendor/facade/ignition-contracts" />
|
||||
<path value="$PROJECT_DIR$/vendor/laravel/helpers" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/mime" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/error-handler" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php70" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php73" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpseclib/bcmath_compat" />
|
||||
<path value="$PROJECT_DIR$/vendor/phpseclib/phpseclib" />
|
||||
</include_path>
|
||||
</component>
|
||||
<component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
|
||||
<component name="PhpUnit">
|
||||
<phpunit_settings>
|
||||
<PhpUnitSettings load_method="CUSTOM_LOADER" configuration_file_path="$PROJECT_DIR$/phpunit.xml" custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" use_configuration_file="true" />
|
||||
<PhpUnitSettings configuration_file_path="$PROJECT_DIR$/phpunit.xml" custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" use_configuration_file="true" />
|
||||
</phpunit_settings>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -28,6 +28,7 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/vendor/dragonmantank/cron-expression" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/egulias/email-validator" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/erusev/parsedown" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/facade/ignition-contracts" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/fideloper/proxy" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/filp/whoops" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/fzaninotto/faker" />
|
||||
|
|
@ -40,6 +41,7 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/vendor/jakub-onderka/php-console-highlighter" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/laracasts/generators" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/laravel/framework" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/laravel/helpers" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/laravel/tinker" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/league/flysystem" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/league/flysystem-cached-adapter" />
|
||||
|
|
@ -58,6 +60,8 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-docblock" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/type-resolver" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpoption/phpoption" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpseclib/bcmath_compat" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpseclib/phpseclib" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpspec/prophecy" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-code-coverage" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-file-iterator" />
|
||||
|
|
@ -92,18 +96,27 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/contracts" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/css-selector" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/debug" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/error-handler" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/event-dispatcher" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/event-dispatcher-contracts" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/finder" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-foundation" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-kernel" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/mime" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-iconv" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-idn" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-normalizer" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php70" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php72" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php73" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php80" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/process" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/routing" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/service-contracts" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/translation" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/translation-contracts" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/var-dumper" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/theseer/tokenizer" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
|
||||
|
|
|
|||
|
|
@ -21,7 +21,11 @@ class User extends Authenticatable
|
|||
* @var array
|
||||
*/
|
||||
protected $fillable = [
|
||||
'name', 'email', 'password', 'phone','username'
|
||||
'name',
|
||||
'email',
|
||||
'password',
|
||||
'phone',
|
||||
'username'
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -27,6 +27,14 @@
|
|||
<li><a href="{{backpack_url('topheaderadv') }}"><i class="fa fa-bullhorn"></i> <span>Yokardaky reklama</span></a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="treeview">
|
||||
<a href="#"><i class="fa fa-sitemap"></i> <span>Mahabat Nyrhanama</span> <i class="fa fa-angle-left pull-right"></i></a>
|
||||
<ul class="treeview-menu">
|
||||
<li><a href="{{backpack_url('properties') }}"><i class="fa fa-handshake-o"></i> <span>Eýeçiligiň görnüşleri</span></a></li>
|
||||
<li><a href="{{backpack_url('folders') }}"><i class="fa fa-folder-open-o"></i> <span>Bukjalar</span></a></li>
|
||||
<li><a href="{{backpack_url('showbukjaorders') }}"><i class="fa fa-archive"></i> <span>Bukja Zakazlar</span></a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
|
||||
<li><a href='{{ backpack_url('subscription') }}'><i class='fa fa-tag'></i> <span>Subscription</span></a></li>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
<script src="{{ asset('assets/js/jquery-2.1.4.min.js')}}"></script>
|
||||
<script src="{{ asset('assets/js/bootstrap.min.js')}}"></script>
|
||||
<!-- Global site tag (gtag.js) - Google Analytics -->
|
||||
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-145040878-1"></script>
|
||||
<script>
|
||||
////// scroll button
|
||||
window.onscroll = function() {scrollFunction()};
|
||||
|
|
@ -108,7 +107,267 @@ toggle between hiding and showing the dropdown content */
|
|||
$('#searchContentId').toggleClass('visible');
|
||||
});
|
||||
});
|
||||
|
||||
//Bukjalar uchin scriptler
|
||||
document.body.onload = function () {
|
||||
//Bukja button +
|
||||
var choices = [];
|
||||
|
||||
// $('.add_new_calc').click(function () {
|
||||
// let $form_add = `added`;
|
||||
// $('.for-add-button').append($form_add);
|
||||
// $('.add_add_box').fadeIn(1000, function () {
|
||||
// $('.add_add_box').css('display','block');
|
||||
// });
|
||||
// });
|
||||
|
||||
//select folder script
|
||||
setInterval(function () {
|
||||
if (($('#orders_table > tr').length <=0) || ($('#orders_table > tr').length == '')){
|
||||
$('#order_it_box').css('display','none');
|
||||
}else {
|
||||
$('#order_it_box').css('display','flex')
|
||||
}
|
||||
|
||||
let title = $('#folder_select option:selected').text();
|
||||
let val = $('#folder_select option:selected').val();
|
||||
$('#selected_folder_id').html(val);
|
||||
$('#selected_folder_text').html(title);
|
||||
let id=$('#selected_folder_id').text();
|
||||
let name=$('#selected_folder_text').text();
|
||||
var time=0;
|
||||
if(id==1 && name=='Bukja 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;
|
||||
}
|
||||
if(id==2 && name=='Bukja 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;
|
||||
}
|
||||
if(id==3 && name=='Bukja 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;
|
||||
}
|
||||
if(time !== 1){
|
||||
$('#bukja_1_1_wagt').css('display','none');
|
||||
$('#bukja_1_2_wagt').css('display','none');
|
||||
$('#bukja_1_3_wagt').css('display','none');
|
||||
}
|
||||
}, 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_name=$('#selected_folder_text').text();
|
||||
var day = $('#folder_day').val();
|
||||
var str = $('#folder_select option:selected').attr('price');
|
||||
var count = $('#choices_count').html();
|
||||
if(count == ''){count=0}
|
||||
if(folder_id == 1){
|
||||
var time= $('#select_time1 option:selected').text();
|
||||
time_price = parseInt($('#select_time1 option:selected').val());
|
||||
bukja_price=NaN;
|
||||
}else
|
||||
if(folder_id == 2){
|
||||
var time= $('#select_time2 option:selected').text();
|
||||
time_price = parseInt($('#select_time2 option:selected').val());
|
||||
bukja_price=NaN;
|
||||
}else
|
||||
if(folder_id == 3){
|
||||
var time= $('#select_time3 option:selected').text();
|
||||
time_price = parseInt($('#select_time3 option:selected').val());
|
||||
bukja_price=NaN;
|
||||
} else {var time='Bukjada görkezilen hemme wagt aralyklary.'
|
||||
time_price = NaN;
|
||||
// bukja_price=parseInt(str.replace(/\D+/g,""));
|
||||
bukja_price=parseInt(str);
|
||||
}
|
||||
sec = parseInt(sec);
|
||||
day = parseInt(day);
|
||||
// count = parseInt(count);
|
||||
var total = 0;
|
||||
if (sec>0 && day>0 && time_price>=1 && !bukja_price>=0){
|
||||
total = sec*day*time_price;
|
||||
}else if(sec>0 && day>0 && bukja_price>=0 && !time_price>=0){
|
||||
total = sec*day*bukja_price;
|
||||
}else{
|
||||
alert('Hasaplamak üçin ähli öýjükler saýlanan bolmaly!');
|
||||
}
|
||||
$('#all_price').html(total);
|
||||
console.log(total);
|
||||
})
|
||||
|
||||
$('#add_new_calc').click(function () {
|
||||
console.log('dsada');
|
||||
if ($('#all_price').html()<=0){
|
||||
alert('Ilki bahany hasaplaň.');
|
||||
return false;
|
||||
}
|
||||
var time_price;
|
||||
var bukja_price;
|
||||
var sec = $('#calc_second').val();
|
||||
var folder_id=$('#selected_folder_id').text();
|
||||
var folder_name=$('#selected_folder_text').text();
|
||||
var day = $('#folder_day').val();
|
||||
var str = $('#folder_select option:selected').html();
|
||||
var count = $('#choices_count').html();
|
||||
if(count == ''){count=0}
|
||||
count = parseInt(count);
|
||||
if(folder_id == 1){
|
||||
var time= $('#select_time1 option:selected').text();
|
||||
time_price = parseInt($('#select_time1 option:selected').val());
|
||||
}else
|
||||
if(folder_id == 2){
|
||||
var time= $('#select_time2 option:selected').text();
|
||||
time_price = parseInt($('#select_time2 option:selected').val());
|
||||
}else
|
||||
if(folder_id == 3){
|
||||
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,""));
|
||||
}
|
||||
if(sec>0 && day>0 && time_price >=1){
|
||||
var total = sec*day*time_price;
|
||||
}
|
||||
if(sec>0 && day>0 && bukja_price >=1){
|
||||
total = sec*day*bukja_price;
|
||||
}
|
||||
if(total>0){
|
||||
count=count+1;
|
||||
$('#choices_count').html(count);
|
||||
var folder_obj ={
|
||||
'id':count,
|
||||
'second':sec,
|
||||
'folder_id':folder_id,
|
||||
'folder_name':folder_name,
|
||||
'day':day,
|
||||
'time':time,
|
||||
'total':total
|
||||
}
|
||||
choices.push(folder_obj);
|
||||
|
||||
var order = `<tr class="added_order">
|
||||
<th scope="row" id="choices_count">`+folder_obj.id+`</th>
|
||||
<td>`+folder_obj.folder_name+`</td>
|
||||
<td>`+folder_obj.second+`</td>
|
||||
<td>`+folder_obj.time+`</td>
|
||||
<td>`+folder_obj.day+`</td>
|
||||
<td>`+folder_obj.total+` tmt</td>
|
||||
</tr>`;
|
||||
var new_calc_order = `<div style="border-bottom: 1px solid #DEDEDE;margin-bottom: 5px;padding-bottom: 5px;">
|
||||
<span class="text-center" style="font-size: 12px;"> Sargyt #`+folder_obj.id+`</span>
|
||||
<h5 style="font-weight: bold;" class="text-center">`+folder_obj.folder_name+`</h5>
|
||||
<span>Sekund: </span><span style="font-weight: bolder;">`+folder_obj.second+` sek.</span><br>
|
||||
<span>Gün: </span><span style="font-weight: bolder;">`+folder_obj.day+` gün</span><br>
|
||||
<span>Bahasy: </span><span style="font-weight: bolder;">`+folder_obj.total+` tmt</span>
|
||||
</div>`;
|
||||
$('#customer_cases').append(new_calc_order);
|
||||
$('#orders_table').append(order);
|
||||
$('#folder_form input').val('');
|
||||
$('select option').removeAttr('selected');
|
||||
$('#all_price').html(0);
|
||||
$('#orders-table-box').css('display','block');
|
||||
$('#no-table-message').css('display','none');
|
||||
}
|
||||
console.log(typeof choices);
|
||||
});
|
||||
$('#clear_table').click(function () {
|
||||
$("tbody#orders_table tr").remove();
|
||||
$('#customer_cases').html('');
|
||||
choices=[];
|
||||
$('#orders-table-box').css('display','none');
|
||||
$('#no-table-message').css('display','inline-block');
|
||||
console.log(choices);
|
||||
})
|
||||
|
||||
|
||||
//send order to backend
|
||||
$('#order_it_btn').click(function () {
|
||||
if (($('#orders_table > tr').length) <=0){
|
||||
$('#order_it_btn').attr('data-target','');
|
||||
alert('Bukja saýlaň.');
|
||||
location.reload();
|
||||
}
|
||||
})
|
||||
$('#customer_send_btn').click(function (e) {
|
||||
e.preventDefault();
|
||||
var name=$('#customer_name').val();
|
||||
var email=$('#customer_email').val();
|
||||
var phone=$('#customer_phone').val();
|
||||
var notes=$('#customer_notes').val();
|
||||
var customer = {
|
||||
'customer':{
|
||||
'name':name,
|
||||
'email':email,
|
||||
'phone':phone,
|
||||
'notes':notes,
|
||||
}
|
||||
}
|
||||
if(name != '' && phone != ''){
|
||||
// disable button
|
||||
$(this).prop("disabled", true);
|
||||
// add spinner to button
|
||||
$(this).html(
|
||||
`<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span> Garaşyň...`
|
||||
);
|
||||
choices.push(customer);
|
||||
var token=$('input[name="_token"]').val();
|
||||
choices=JSON.stringify(choices);
|
||||
$.ajax({
|
||||
type: 'POST',
|
||||
url: '{{route('bukjalar.store')}}',
|
||||
data:{
|
||||
'_token':token,
|
||||
'choices':choices
|
||||
},
|
||||
cache: false,
|
||||
success:function(data){
|
||||
//window.location="{{route('bukjalar.index')}}";
|
||||
console.log(data);
|
||||
$('#alert_success').css('display','inline-block');
|
||||
$('#customer_send_btn').prop("disabled", false);
|
||||
$('#customer_send_btn').html('Ugrat');
|
||||
$('#alert_success').css('display','inline-block');
|
||||
setTimeout(function () {
|
||||
location.reload();
|
||||
},2500)
|
||||
|
||||
},
|
||||
error:function (data) {
|
||||
$('#alert_danger').css('display','inline-block');
|
||||
$('#customer_send_btn').prop("disabled", false);
|
||||
$('#customer_send_btn').html('Ugrat');
|
||||
setTimeout(function () {
|
||||
location.reload();
|
||||
},5000)
|
||||
}
|
||||
});
|
||||
console.log(choices);
|
||||
}else{
|
||||
alert('Ady we Telefon hokman girizmeli!')
|
||||
}
|
||||
})
|
||||
//send order to backend end
|
||||
})
|
||||
//calculator script end
|
||||
}
|
||||
//Bukjalar uchin skriptler end
|
||||
$(function () {
|
||||
$('[data-toggle="tooltip"]').tooltip()
|
||||
})
|
||||
</script>
|
||||
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-145040878-1"></script>
|
||||
@yield('after_scripts')
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
@foreach($topMenus as $topMenu)
|
||||
<li><a class = "aq" style = "font-size: 15.5px;" href="{{route('menuLinkWeb', $topMenu->id)}}">{{ $topMenu->name }}</a></li>
|
||||
@endforeach
|
||||
<li><a class = "aq" style = "font-size: 15.5px;" href="{{route('bukjalar.index')}}">Mahabat Bukjalary</a></li>
|
||||
|
||||
</div> </ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -50,10 +50,11 @@
|
|||
<div class="row" style="padding-top: 0; padding-bottom: 0">
|
||||
<div class="tpl-block-list tpl-component-advertise" id="nc-block-f7e58e42e06d14ccafa603b30ee0ffdd">
|
||||
<div id="main"></div>
|
||||
|
||||
@if($advertTop !== null)
|
||||
<div class="advertising-board">
|
||||
<a href="{{$advertTop->url}}"><img src="{{$advertTop->img_url}}" alt="{{ $advertTop->alt }}"></a>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
<div class="tpl-block-list tpl-component-live" id="nc-block-07836a817200a2080a66928e50ea776e"><div id="main-1"></div><div class="container live">
|
||||
<div class="row">
|
||||
|
|
|
|||
|
|
@ -33,4 +33,8 @@ Route::group([
|
|||
CRUD::resource('group', 'GroupCrudController');
|
||||
CRUD::resource('subscription', 'SubscriptionCrudController');
|
||||
CRUD::resource('user_sub', 'User_subCrudController');
|
||||
CRUD::resource('properties', 'PropertyTypeCrudController');
|
||||
CRUD::resource('gurnawlar', 'GurnawCrudController');
|
||||
CRUD::resource('folders', 'FolderCrudController');
|
||||
CRUD::resource('showbukjaorders', 'ShowBukjaOrdersCrudController');
|
||||
}); // this should be the absolute last line of this file
|
||||
|
|
@ -33,6 +33,7 @@ Route::get('/film/{id}', 'MenuLinkController@getFilm')->name('getFilm');
|
|||
|
||||
Route::get('/habarlashyk', 'ContactController@habarlashyk')->name('cont');
|
||||
Route::post('/contact/send', 'ContactController@send')->name('send');
|
||||
Route::resource('/bukjalar','BukjaController')->name('*','bukjalar');
|
||||
|
||||
Route::get('/sendMail/{id}', 'ContactController@sendMail');
|
||||
Route::post('/postMail/', 'ContactController@postMail');
|
||||
|
|
|
|||
Loading…
Reference in New Issue