From ed036bf893f340821043922dc1b385ad81a57ffb Mon Sep 17 00:00:00 2001
From: SlowV <31509114+SlowV@users.noreply.github.com>
Date: Sat, 15 Sep 2018 12:17:03 +0700
Subject: [PATCH] fix chuc nagn dang phat trien

---
 .../app/Http/Controllers/UserController.php   |  3 +-
 HanaStore/public/css/main.css                 | 58 +++++++++++++++++++
 HanaStore/public/js/main.js                   | 13 ++++-
 .../views/user/flower/footer.blade.php        | 51 +++++++---------
 .../views/user/flower/header.blade.php        |  2 +-
 .../views/user/flower/productDetail.blade.php | 15 +----
 6 files changed, 94 insertions(+), 48 deletions(-)

diff --git a/HanaStore/app/Http/Controllers/UserController.php b/HanaStore/app/Http/Controllers/UserController.php
index 412febc..8e5e58c 100644
--- a/HanaStore/app/Http/Controllers/UserController.php
+++ b/HanaStore/app/Http/Controllers/UserController.php
@@ -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
                     )
diff --git a/HanaStore/public/css/main.css b/HanaStore/public/css/main.css
index efc773a..36c6838 100644
--- a/HanaStore/public/css/main.css
+++ b/HanaStore/public/css/main.css
@@ -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;
+    }
+}
 
 
 
diff --git a/HanaStore/public/js/main.js b/HanaStore/public/js/main.js
index 09617cc..bc2623b 100644
--- a/HanaStore/public/js/main.js
+++ b/HanaStore/public/js/main.js
@@ -217,7 +217,7 @@
             error:function () {
 
             }
-        })
+        });
         setTimeout(function () {
             window.location.reload();
         },500)
@@ -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);
\ No newline at end of file
diff --git a/HanaStore/resources/views/user/flower/footer.blade.php b/HanaStore/resources/views/user/flower/footer.blade.php
index 566a21c..8e74732 100644
--- a/HanaStore/resources/views/user/flower/footer.blade.php
+++ b/HanaStore/resources/views/user/flower/footer.blade.php
@@ -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>
@@ -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>
@@ -104,10 +92,10 @@
 
     <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>
@@ -115,8 +103,8 @@
 
             <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>
 
@@ -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>
 
@@ -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>
\ No newline at end of file
diff --git a/HanaStore/resources/views/user/flower/header.blade.php b/HanaStore/resources/views/user/flower/header.blade.php
index 8391810..ef5d8df 100644
--- a/HanaStore/resources/views/user/flower/header.blade.php
+++ b/HanaStore/resources/views/user/flower/header.blade.php
@@ -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>
diff --git a/HanaStore/resources/views/user/flower/productDetail.blade.php b/HanaStore/resources/views/user/flower/productDetail.blade.php
index 5082a1c..00c485c 100644
--- a/HanaStore/resources/views/user/flower/productDetail.blade.php
+++ b/HanaStore/resources/views/user/flower/productDetail.blade.php
@@ -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>
 
@@ -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 -->