Skip to content

F
fazo
Commit 3372b651 authored by Shahzod's avatar Shahzod
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	.idea/workspace.xml
#	resources/views/main.blade.php

conculator 2
parent b686777e
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 17 deletions
.idea/fazoshop.iml
View file @ 3372b651
......@@ -27,6 +27,7 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/jakub-onderka/php-console-color" />
<excludeFolder url="file://$MODULE_DIR$/vendor/jakub-onderka/php-console-highlighter" />
<excludeFolder url="file://$MODULE_DIR$/vendor/jeremy-dunn/php-fedex-api-wrapper" />
<excludeFolder url="file://$MODULE_DIR$/vendor/kylekatarnls/update-helper" />
<excludeFolder url="file://$MODULE_DIR$/vendor/laravel/framework" />
<excludeFolder url="file://$MODULE_DIR$/vendor/laravel/socialite" />
<excludeFolder url="file://$MODULE_DIR$/vendor/laravel/tinker" />
......
.idea/php.xml
View file @ 3372b651
......@@ -100,6 +100,7 @@
<path value="$PROJECT_DIR$/vendor/filp/whoops" />
<path value="$PROJECT_DIR$/vendor/intervention/image" />
<path value="$PROJECT_DIR$/vendor/mews/captcha" />
<path value="$PROJECT_DIR$/vendor/kylekatarnls/update-helper" />
</include_path>
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
......
resources/views/main.blade.php
View file @ 3372b651
......@@ -187,7 +187,7 @@
<h4 style="color: #ffffff">ЗА 5-7 РАБОЧИХ ДНЕЙ</h4>
<p>Сомневаетесь? – Ознакомьтесь
с оценками наших клиентов</p>
<a href="{{route('tariffs')}}" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<a href="#reviews" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="margin-top: -60px;">
<img src="{{ asset('assets') }}/slider/images/plane.png" width="420" alt="image02">
</div>
......@@ -200,7 +200,7 @@
<h4 style="color: #ffffff">ВСЕГО $8,5 ЗА КАЖДЫЕ
1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p>
<a href="{{route('tariffs')}}" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<a href="#reviews" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="margin-top: -60px;">
<img src="{{ asset('assets') }}/slider/images/usa_map.png" width="320" alt="image03">
</div>
......@@ -212,7 +212,7 @@
<h4 style="color: #ffffff">ВСЕГО $8,5 ЗА КАЖДЫЕ
1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p>
<a href="{{route('tariffs')}}" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<a href="#reviews" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="padding-right: 60px; margin-top: -60px;">
<img src="{{ asset('assets') }}/slider/images/00003.jpg" width="350" alt="image03" height="250">
</div>
......@@ -223,7 +223,7 @@
<h4 style="color: #ffffff">ВСЕГО $8,5 ЗА КАЖДЫЕ
1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p>
<a href="{{route('tariffs')}}" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<a href="#reviews" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="padding-right: 60px; margin-top: -60px;">
<img src="{{ asset('assets') }}/slider/images/thumb.png" width="320" alt="image03">
</div>
......@@ -234,7 +234,7 @@
<h4 style="color: #ffffff">ВСЕГО $8,5 ЗА КАЖДЫЕ
1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p>
<a href="{{route('tariffs')}}" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<a href="#reviews" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="padding-right: 60px; margin-top: -60px;">
<img src="{{ asset('assets') }}/slider/images/0001.jpg" width="350" height="250" alt="image03">
</div>
......@@ -245,7 +245,7 @@
<h4 style="color: #ffffff">ВСЕГО $8,5 ЗА КАЖДЫЕ
1 КГ!</h4>
<p>Самые точные расценки и быстрая доставка!</p>
<a href="{{route('tariffs')}}" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<a href="#reviews" class="da-link button" style="border: 1px solid #ffffff; color: #ffffff ; padding: 10px;">УЗНАТЬ ПОДРОБНЕЕ</a>
<div class="da-img" style="padding-right: 60px; margin-top: -60px;">
<img src="{{ asset('assets') }}/slider/images/0004.jpg" width="350" height="250" alt="image03">
</div>
......@@ -260,11 +260,8 @@
</div>
</div>
</div>
</main>
<!-- Page Content-->
<main class="">
<section class="section bg-light" style="">
......@@ -334,10 +331,11 @@
<div class="form-group weight" data-price="2" id="wewr">
<label class="h6" for="weight">Вес (кг)</label>
<input class="numbers-only" onkeyup="oncha()" type="text" id="weight">
<input class="numbers-only" maxlength="30" onkeyup="oncha()" type="number" id="weight">
</div>
<div class="form-group border-top inset-4 h4">
<p>ИТОГО:<span id="total"></span></p>
<p id="none1" style="display: none; color: red;"></p>
<p id="none2">ИТОГО:<span id="total"></span></p>
</div>
</div>
</div>
......@@ -352,11 +350,21 @@
}
function oncha() {
var dataArray = [];
$("#wewr").find('input').each(function() {
dataArray.push(this.value);
document.getElementById("total").innerHTML = dataArray.reduce(getSum, 0);
});
if (document.getElementById("weight").value > 30){
document.getElementById("none2").style.display = "none";
document.getElementById("none1").style.display = "inline";
document.getElementById("none1").innerHTML = "Максимум вес на одну отправку - 30кг";
}else{
document.getElementById("none1").style.display = "none";
document.getElementById("none2").style.display = "inline";
var dataArray = [];
$("#wewr").find('input').each(function() {
dataArray.push(this.value);
document.getElementById("total").innerHTML = dataArray.reduce(getSum, 0);
});
}
}
</script>
......@@ -493,7 +501,7 @@
</div>
</section>
<section class="section section-inset-1 bg-light">
<section class="section section-inset-1 bg-light" id="reviews">
<div class="container">
<h2 style="color: #0B3C5D">Отзывы</h2>
<hr>
......
resources/views/pages/terms.blade.php
View file @ 3372b651
......@@ -44,6 +44,7 @@
</p>
<h4 class="my-4" style="color: #004085;">How We Use the Information We Collect</h4>
<p><span class="text-danger">*</span> We use Personal and non-Personal information:
</p>
<ol>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment