Merge branch 'カート編集' into 'master'

カート編集

See merge request !64

src/main/java/com/example/api/EcsiteRestController.java

@@ -70,7 +70,7 @@ public class EcsiteRestController {
 	
 	//カート追加処理
 	@PostMapping("inputCart")
-	public void inputCart(@RequestBody ItemData data, Model model, Shoes shoes) {
+	public LinkedHashMap<String, Items> inputCart(@RequestBody ItemData data, Model model, Shoes shoes) {
 		//靴の在庫数を購入予定数が超えていないか確認
 		shoes = shoesService.findOne(data.getShoesId());
 		if(shoes.getStock() < data.getQuantity()){
@@ -89,10 +89,11 @@ public class EcsiteRestController {
 			//カートのアイテム数をセッションに追加
 			session.setAttribute("cartValue", data.getQuantity());
 		//セッションがnull出ない場合	
+			return cart;
 		}else{
 			//HashMapを生成
-			ArrayList <String> list = new ArrayList<String> ();
 			LinkedHashMap<String, Items> cart = new LinkedHashMap<String, Items>();
+			ArrayList <String> list = new ArrayList<String> ();
 			String id = data.getShoesId().toString();
 			//生成したHashMapにセッションにもともとある情報を照会させる。
 			cart = (LinkedHashMap<String, Items>) session.getAttribute("cart");
@@ -100,9 +101,10 @@ public class EcsiteRestController {
 			cart.forEach((key, value) ->{
 				if(key.equals(id)){
 					sameId = key;
+					System.out.println(sameId);
 				}
 			});
-			if(sameId.equals(id)){
+			if(id.equals(sameId)){
 				cart.put(id , itemsService.findOne(data.getShoesId(), data.getQuantity() + cart.get(id).getQuantity()));
 			}else{
 				cart.put(id , itemsService.findOne(data.getShoesId(),data.getQuantity()));
@@ -112,18 +114,23 @@ public class EcsiteRestController {
 			int nowQuantity =  (int) session.getAttribute("cartValue");
 			//カートのアイテム数をセッションに追加
 			session.setAttribute("cartValue", nowQuantity + data.getQuantity());
+			return cart;
 		}
 	}
 	
 	@PostMapping("editCart")
-	public void editCart(@RequestBody ItemData data, Shoes shoes) {
-		System.out.println(data.getQuantity());
+	public LinkedHashMap<String, Items>  editCart(@RequestBody ItemData data, Shoes shoes) {
 		LinkedHashMap<String, Items> cart = new LinkedHashMap<String, Items>();
 		String id = data.getShoesId().toString();
 		//生成したHashMapにセッションにもともとある情報を照会させる。
 		cart = (LinkedHashMap<String, Items>) session.getAttribute("cart");
-		cart.put(id , itemsService.findOne(data.getShoesId(),data.getQuantity()));
+		if(data.getQuantity() == 0) {
+			cart.remove(id);
+		}else {
+			cart.put(id , itemsService.findOne(data.getShoesId(),data.getQuantity()));
+		}
 		session.setAttribute("cart", cart);
+		return cart;
 	}
 	
 	@GetMapping("buy")

src/main/resources/static/js/cart.js

+//buyボタン表示・非表示
+if($('#total-price-span').text() === "¥0"){
+	$('.js-modal-open').hide();
+}else{
+	$('.js-modal-open').show();
+}
+
+//cart個数
+let cartValue = 0;
+for(let i = 0; i < $('.itemCount').length; i++){
+	cartValue += Number($('.itemCount').eq(i).val());
+}
+$('.shoping-cart').text(cartValue);
+
+
 //モーダル表示
 $(function(){
     $('.js-modal-open').on('click',function(){
@@ -42,7 +57,10 @@ $('.itemCountChange').on('click', function(event){
           dataType: "json",
           data: JSON.stringify(data)
     })
-    window.location.href = "/limited/cart";
+    .done(function(){
+    	window.location.href = "/limited/cart";
+    });
+    
     
     //[#modal-content]と[#modal-overlay]をフェードアウトした後に…
             $( "#modal-content,#modal-overlay" ).fadeOut( "slow" , function(){

src/main/resources/static/js/list.js

@@ -108,6 +108,7 @@ $('.cartBtn').on('click', function(event){
 	      dataType: "json",
 	      data: JSON.stringify(data)
 	})
+	
 	//[#modal-content]と[#modal-overlay]をフェードアウトした後に…
 			$( "#modal-content,#modal-overlay" ).fadeOut( "slow" , function(){
 			//[#modal-overlay]を削除する

src/main/resources/templates/cart.html

@@ -113,7 +113,7 @@
 	                        	<td class="hidden"><input th:text="${cart.shoesId}"/></td> 
 	                            <td class="tdCart"><img th:src="@{/upload/{photo}(photo=${cart.photo})}" width="300" height="200"/></td>
 	                            <td class="tdCart"><p th:text= "${cart.shoesName}" class="textP">Convers All Star</p></td>
-	                            <td class="tdCart"><input type="number" th:value="${cart.quantity}" class="textP itemCount"></input></td>
+	                            <td class="tdCart"><input type="number" min="0" th:value="${cart.quantity}" class="textP itemCount"></input></td>
 	                            <td class="tdCart"><p th:text= "${cart.price}" class="textP">&yen;10000</p></td>
 	                            <td class="tdCart"><button type="button" class="itemCountChange">数変更確定</button></td>
 	                        </tr>