remove product function

venshop_app/app/controllers/cards_controller.rb

@@ -7,33 +7,53 @@ class CardsController < ApplicationController
   		@card_infos = session[:SHOPPING_CARD_SESSION_NAME]
   		@card_infos = session[:SHOPPING_CARD_SESSION_NAME]
   	end
   	end
   	if params[:product_id] != nil
   	if params[:product_id] != nil
-  		# first time add to card
-  		if @card_infos.empty?
-  			product = Product.find(params[:product_id])
-  			card_items = Array.new
-  			card_items.push({ product_id: params[:product_id], quantity: 1 })
-  			customer_info = Hash.new
-				@card_infos = { card_items: card_items, customer_info: customer_info }
-  			session[:SHOPPING_CARD_SESSION_NAME] = @card_infos
-  			redirect_to cards_path
+  		# if remove a product from card
+  		if params[:card_action] != nil && params[:card_action] == 'remove'
+  			# Nothing to delete
+  			if @card_infos.empty?
+					redirect_to cards_path
+				else
+	  			card_items = @card_infos[:card_items]
+	  			card_items.each do |card_item, key|
+	  				# if a product exist in card
+		  			if card_item[:product_id] == params[:product_id]
+		  				card_items.delete(card_item)
+		  				@card_infos = { card_items: card_items, customer_info: @card_infos[:customer_info] }
+		  				session[:SHOPPING_CARD_SESSION_NAME] = @card_infos
+		  				redirect_to cards_path
+		  			end
+		  		end
+  			end
   		else
   		else
-  			card_items = @card_infos[:card_items]
-  			card_items.each do |card_item, key|
-  				# if a product exist in card
-	  			if card_item[:product_id] == params[:product_id]
-	  				card_item[:quantity] += 1
-	  				card_items[key] = card_item
-	  				@card_infos = { card_items: card_items, customer_info: @card_infos[:customer_info] }
-	  				session[:SHOPPING_CARD_SESSION_NAME] = @card_infos
-	  				redirect_to cards_path
-	  			end
+  			# if add a product to card
+	  		# first time add to card
+	  		if @card_infos.empty?
+	  			product = Product.find(params[:product_id])
+	  			card_items = Array.new
+	  			card_items.push({ product_id: params[:product_id], quantity: 1 })
+	  			customer_info = Hash.new
+					@card_infos = { card_items: card_items, customer_info: customer_info }
+	  			session[:SHOPPING_CARD_SESSION_NAME] = @card_infos
+	  			redirect_to cards_path
+	  		else
+	  			card_items = @card_infos[:card_items]
+	  			card_items.each do |card_item, key|
+	  				# if a product exist in card
+		  			if card_item[:product_id] == params[:product_id]
+		  				card_item[:quantity] += 1
+		  				card_items[key] = card_item
+		  				@card_infos = { card_items: card_items, customer_info: @card_infos[:customer_info] }
+		  				session[:SHOPPING_CARD_SESSION_NAME] = @card_infos
+		  				redirect_to cards_path
+		  			end
+		  		end
+		  		# if a product not exist in card
+		  		card_items.push({ product_id: params[:product_id], quantity: 1 })
+	  			customer_info = @card_infos[:customer_info]
+					@card_infos = { card_items: card_items, customer_info: customer_info }
+	  			session[:SHOPPING_CARD_SESSION_NAME] = @card_infos
+	  			redirect_to cards_path
 	  		end
 	  		end
-	  		# if a product not exist in card
-	  		card_items.push({ product_id: params[:product_id], quantity: 1 })
-  			customer_info = @card_infos[:customer_info]
-				@card_infos = { card_items: card_items, customer_info: customer_info }
-  			session[:SHOPPING_CARD_SESSION_NAME] = @card_infos
-  			redirect_to cards_path
   		end
   		end
   	end
   	end
   end
   end

venshop_app/app/views/cards/index.html.erb

@@ -16,7 +16,7 @@
 		  	</tr>
 		  	</tr>
 		  </thead>
 		  </thead>
 		  <tbody>
 		  <tbody>
-		  	<% if @card_infos.empty? %>
+		  	<% if @card_infos.empty? || @card_infos[:card_items].empty? %>
 		  		<tr><td colspan="6"><a href="<%= products_path %>">Click here to order</a></td></tr>
 		  		<tr><td colspan="6"><a href="<%= products_path %>">Click here to order</a></td></tr>
 		  	<% 
 		  	<% 
 		  	else 
 		  	else 
@@ -34,7 +34,7 @@
 			  		<td><%= number_with_delimiter(product.price) %></td>
 			  		<td><%= number_with_delimiter(product.price) %></td>
 			  		<td><%= number_with_delimiter(product.price * card_item[:quantity]) %></td>
 			  		<td><%= number_with_delimiter(product.price * card_item[:quantity]) %></td>
 			  		<td>
 			  		<td>
-			  			<a href="" class="btn btn-default">Remove</a>
+			  			<a href="<%= cards_path %>?product_id=<%= card_item[:product_id] %>&card_action=remove" class="btn btn-default" dada="{:confirm=>"Do you want to remove this product?"}">Remove</a>
 			  		</td>
 			  		</td>
 			  	</tr>
 			  	</tr>
 		  		<%
 		  		<%