Skip to content

fix chuc nagn dang phat trien #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slowv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix chuc nagn dang phat trien #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion HanaStore/app/Http/Controllers/UserController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ public function productBuy($id)
$itemCart = Cart::add(array(
'id' => $id,
'name' => $product->name,
'qty' => 1, 'price' => $product->price - $product->price * $product->sale / 100,
'qty' => 1,
'price' => $product->price - $product->price * $product->sale / 100,
'options' => array(
'img' => $product->images
)
Expand Down
58 changes: 58 additions & 0 deletions HanaStore/public/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3088,7 +3088,65 @@ input.num-product::-webkit-inner-spin-button {
visibility: visible;
}

#Popup {
visibility: hidden;
text-align: center;
position: fixed;
z-index: 10;
left: 45%;
bottom: 30px;
font-size: 15px;
}

#Popup.show-mess {
visibility: visible;
-webkit-animation: fadein 0.5s, fadeout 0.5s 1.5s;
animation: fadein 0.5s, fadeout 0.5s 1.5s;
}

@-webkit-keyframes fadein {
from {
bottom: 0;
opacity: 0;
}
to {
bottom: 30px;
opacity: 1;
}
}

@keyframes fadein {
from {
bottom: 0;
opacity: 0;
}
to {
bottom: 30px;
opacity: 1;
}
}

@-webkit-keyframes fadeout {
from {
bottom: 30px;
opacity: 1;
}
to {
bottom: 0;
opacity: 0;
}
}

@keyframes fadeout {
from {
bottom: 30px;
opacity: 1;
}
to {
bottom: 0;
opacity: 0;
}
}



Expand Down
13 changes: 11 additions & 2 deletions HanaStore/public/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
error:function () {

}
})
});
setTimeout(function () {
window.location.reload();
},500)
Expand All @@ -227,11 +227,20 @@
var src = $('.avatarUser').attr('src').replace('?type=normal','');
$('#modalInfoUser').modal();
$('.avatarUser').attr('src',src);
})
});

$('#edit-user').click(function () {
$('.box-edit-user').addClass('active-box');
$('.box-user').removeClass('active-box');
});

$('.showPopup').click(function () {
// Mess delete product success.
$('#Popup').addClass('show-mess');
setTimeout(function () {
$('#Popup').removeClass('show-mess');
}, 2000);
});


})(jQuery);
51 changes: 21 additions & 30 deletions HanaStore/resources/views/user/flower/footer.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,14 @@

<ul>
<li class="p-b-9">
<a href="#" class="s-text7">
Search
<a href="javascript:void(0)" class="s-text7 showPopup">
Tìm kiếm
</a>
</li>

<li class="p-b-9">
<a href="#" class="s-text7">
About Us
</a>
</li>

<li class="p-b-9">
<a href="#" class="s-text7">
Contact Us
</a>
</li>

<li class="p-b-9">
<a href="#" class="s-text7">
Returns
<a href="{{route('contactClient')}}" class="s-text7">
Liên hệ
</a>
</li>
</ul>
Expand All @@ -77,25 +65,25 @@

<ul>
<li class="p-b-9">
<a href="#" class="s-text7">
<a href="javascript:void(0)" class="s-text7 showPopup" >
Kiểm tra đơn hàng
</a>
</li>

<li class="p-b-9">
<a href="#" class="s-text7">
<a href="javascript:void(0)" class="s-text7 showPopup">
Thắc mắc
</a>
</li>

<li class="p-b-9">
<a href="#" class="s-text7">
Bug
<a href="javascript:void(0)" class="s-text7 showPopup">
Báo lỗi
</a>
</li>

<li class="p-b-9">
<a href="#" class="s-text7">
<a href="javascript:void(0)" class="s-text7 showPopup" >
FAQs
</a>
</li>
Expand All @@ -104,19 +92,19 @@

<div class="w-size8 p-t-30 p-l-15 p-r-15 respon3">
<h4 class="s-text12 p-b-30">
Newsletter
Nhận tin mới
</h4>

<form>
<form action="#">
<div class="effect1 w-size9">
<input class="s-text7 bg6 w-full p-b-5" type="text" name="email" placeholder="email@example.com">
<span class="effect1-line"></span>
</div>

<div class="w-size2 p-t-20">
<!-- Button -->
<button class="flex-c-m size2 bg4 bo-rad-23 hov1 m-text3 trans-0-4">
Subscribe
<button class="flex-c-m size2 bg4 bo-rad-23 hov1 m-text3 trans-0-4 showPopup" type="button">
Gửi luôn
</button>
</div>

Expand All @@ -125,23 +113,23 @@
</div>

<div class="t-center p-l-15 p-r-15">
<a href="#">
<a href="javascript:void(0)" class="showPopup">
<img class="h-size2" src="{{asset('images/icons/paypal.png')}}" alt="IMG-PAYPAL">
</a>

<a href="#">
<a href="javascript:void(0)" class="showPopup">
<img class="h-size2" src="{{asset('images/icons/visa.png')}}" alt="IMG-VISA">
</a>

<a href="#">
<a href="javascript:void(0)" class="showPopup">
<img class="h-size2" src="{{asset('images/icons/mastercard.png')}}" alt="IMG-MASTERCARD">
</a>

<a href="#">
<a href="javascript:void(0)" class="showPopup">
<img class="h-size2" src="{{asset('images/icons/express.png')}}" alt="IMG-EXPRESS">
</a>

<a href="#">
<a href="javascript:void(0)" class="showPopup">
<img class="h-size2" src="{{asset('images/icons/discover.png')}}" alt="IMG-DISCOVER">
</a>

Expand All @@ -150,4 +138,7 @@
aria-hidden="true"></i> by <a
href="https://colorlib.com" target="_blank">Colorlib</a>
</div>
</div>
<div class="alert alert-success " role="alert" id="Popup" style="border-radius: 5px">
Chức năng đang phát triển. (~.~)
</div>
2 changes: 1 addition & 1 deletion HanaStore/resources/views/user/flower/header.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class="topbar-social-item fa fa-pinterest-p"></a>
<div class="topbar-language rs1-select2">
<select class="selection-1" name="time">
<option value="1">VN</option>
<option value="2">EN</option>
{{--<option value="2">EN</option>--}}
</select>
</div>
</div>
Expand Down
15 changes: 1 addition & 14 deletions HanaStore/resources/views/user/flower/productDetail.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
{{$product->name}}
</h4>

<span class="m-text17">
<span class="m-text17 price-product-detail">
{{number_format($product->price,0,',','.')}} vnđ
</span>

Expand All @@ -118,19 +118,6 @@
<div class="p-t-33 p-b-60">
<div class="flex-r-m flex-w p-t-10">
<div class="w-size16 flex-m flex-w">
<div class="flex-w bo5 of-hidden m-r-22 m-t-10 m-b-10">
<button class="btn-num-product-down color1 flex-c-m size7 bg8 eff2">
<i class="fs-12 fa fa-minus" aria-hidden="true"></i>
</button>

<input class="size8 m-text18 t-center num-product" type="number" name="num-product"
value="1">

<button class="btn-num-product-up color1 flex-c-m size7 bg8 eff2">
<i class="fs-12 fa fa-plus" aria-hidden="true"></i>
</button>
</div>

<div class="btn-addcart-product-detail size9 trans-0-4 m-t-10 m-b-10 add-to-cart"
id="add-cart-detail-{{$product->id}}">
<!-- Button -->
Expand Down