Commit 12e311e5 authored by keita.onoguchi's avatar keita.onoguchi

カート画面修正途中

parent 3d5eac0e
...@@ -140,6 +140,9 @@ HttpSession session; ...@@ -140,6 +140,9 @@ HttpSession session;
model.addAttribute("user", user); model.addAttribute("user", user);
items = (LinkedHashMap<String, Items>) session.getAttribute("cart"); items = (LinkedHashMap<String, Items>) session.getAttribute("cart");
if(items == null) { if(items == null) {
if(session.getAttribute("cartValue") == null) {
model.addAttribute("cartValue", 0);
}
return "Cart"; return "Cart";
} }
items.forEach((key, value) -> { items.forEach((key, value) -> {
...@@ -151,6 +154,11 @@ HttpSession session; ...@@ -151,6 +154,11 @@ HttpSession session;
}); });
model.addAttribute("totalPrice", totalPrice); model.addAttribute("totalPrice", totalPrice);
totalPrice = 0; totalPrice = 0;
if(session.getAttribute("cartValue") == null) {
model.addAttribute("cartValue", 0);
}else {
model.addAttribute("cartValue",session.getAttribute("cartValue"));
}
return "Cart"; return "Cart";
} }
} }
...@@ -1733,6 +1733,11 @@ label { ...@@ -1733,6 +1733,11 @@ label {
margin-bottom: 50px; margin-bottom: 50px;
} }
#totalPrice {
text-align: right;
padding-right: 115px;
padding-top: 20px;
}
/* カート画面モーダル */ /* カート画面モーダル */
#buy { #buy {
......
...@@ -8,4 +8,14 @@ $(function(){ ...@@ -8,4 +8,14 @@ $(function(){
$('.js-modal').fadeOut(); $('.js-modal').fadeOut();
return false; return false;
}); });
});
//購入処理
$('#ok-btn').on('click',function(){
$.ajax({
type:'GET',
url:'/limited/buy'
})
.done()
return false;
}); });
\ No newline at end of file
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</ul> </ul>
<ul class="nav navbar-nav navbar-right cart-menu"> <ul class="nav navbar-nav navbar-right cart-menu">
<li><a class="search-btn"><i class="fa fa-search" aria-hidden="true"></i></a></li> <li><a class="search-btn"><i class="fa fa-search" aria-hidden="true"></i></a></li>
<li class="active"><a th:href="@{/limited/cart}"><span> Cart</span> <span class="shoping-cart">0</span></a></li> <li class="active"><a th:href="@{/limited/cart}"><span> Cart</span> <span class="shoping-cart" th:text="${cartValue}">0</span></a></li>
</ul> </ul>
</div><!-- /.navbar-collapse --> </div><!-- /.navbar-collapse -->
</div><!-- /.container --> </div><!-- /.container -->
...@@ -117,6 +117,10 @@ ...@@ -117,6 +117,10 @@
</div> </div>
</tbody> </tbody>
</table> </table>
<div id="totalPrice" th:switch="${totalPrice}">
<p th:case="null" id="total-price">Total Price<span id="total-price-span">&yen;0</span></p>
<p th:case="*" id="total-price">Total Price<span id="total-price-span" th:text="'&yen;' + ${totalPrice}">10000</span></p>
</div>
<div id="buy"> <div id="buy">
<button class="js-modal-open" id="buy-btn">Buy</button> <button class="js-modal-open" id="buy-btn">Buy</button>
</div> </div>
...@@ -141,7 +145,6 @@ ...@@ -141,7 +145,6 @@
<div class="modal__bg js-modal-close"></div> <div class="modal__bg js-modal-close"></div>
<div class="modal__content"> <div class="modal__content">
<p id="sign-up-text">Do you really buy?</p> <p id="sign-up-text">Do you really buy?</p>
<p id="total-price">Total Price<span id="total-price-span">&yen;10000</span></p>
<div> <div>
<button class="js-modal-sign-up" id="ok-btn">Buy</button> <button class="js-modal-sign-up" id="ok-btn">Buy</button>
<button class="js-modal-close" id="close-btn">Close</button> <button class="js-modal-close" id="close-btn">Close</button>
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<!-- 履歴ページへ遷移 --> <!-- 履歴ページへ遷移 -->
<li><a th:href="@{/limited/log/{id}(id=${user.id})}">My Purchase Log</a></li> <li><a th:href="@{/limited/log/{id}(id=${user.id})}">My Purchase Log</a></li>
<!-- カートページへ遷移 --> <!-- カートページへ遷移 -->
<li><a th:href="@{cart}">Cart</a></li> <li><a th:href="@{/limited/cart}">Cart</a></li>
<!-- ログアウト --> <!-- ログアウト -->
<li><form th:action="@{/logout}" method="post"><input type="submit" value="logout" style="border:none;background-color:transparent;text-decoration:none;" class="logoutBtn"/></form></li> <li><form th:action="@{/logout}" method="post"><input type="submit" value="logout" style="border:none;background-color:transparent;text-decoration:none;" class="logoutBtn"/></form></li>
</ul> </ul>
......
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