From fe24fbbec96b4bbbbfb926c757a6c5c6fdfc83e9 Mon Sep 17 00:00:00 2001
From: rani-i3 <rani@i3-systems.com>
Date: Tue, 29 Aug 2023 16:18:20 +0900
Subject: [PATCH 1/2] fixed cafe bug

---
 cafe.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cafe.rb b/cafe.rb
index 2069514..315888e 100644
--- a/cafe.rb
+++ b/cafe.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# require 'debug'
 
 DRINKS = [
   { name: 'コーヒー', price: '300' },
@@ -15,11 +16,12 @@
 ].freeze
 
 def take_order(menus)
+  # binding.break
   menus.each.with_index(1) do |menu, i|
     puts "(#{i})#{menu[:name]}: #{menu[:price]}円"
   end
   print '>'
-  order_number = gets.to_i
+  order_number = gets.to_i - 1
   puts "#{menus[order_number][:name]}(#{menus[order_number][:price]}円)ですね。"
   order_number
 end
@@ -30,5 +32,5 @@ def take_order(menus)
 puts 'フードメニューはいかがですか?'
 order2 = take_order(FOODS)
 
-total = FOODS[order1][:price] + DRINKS[order2][:price]
+total = FOODS[order2][:price].to_i + DRINKS[order1][:price].to_i
 puts "お会計は#{total}円になります。ありがとうございました！"

From 8723b977f5e971ea429fead07fb27ecf6a30e4bb Mon Sep 17 00:00:00 2001
From: rani-i3 <rani@i3-systems.com>
Date: Tue, 5 Sep 2023 10:21:22 +0900
Subject: [PATCH 2/2] fixed bug cafe code

---
 cafe.rb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/cafe.rb b/cafe.rb
index 315888e..484256e 100644
--- a/cafe.rb
+++ b/cafe.rb
@@ -1,6 +1,3 @@
-# frozen_string_literal: true
-# require 'debug'
-
 DRINKS = [
   { name: 'コーヒー', price: '300' },
   { name: 'カフェラテ', price: '400' },
@@ -16,7 +13,6 @@
 ].freeze
 
 def take_order(menus)
-  # binding.break
   menus.each.with_index(1) do |menu, i|
     puts "(#{i})#{menu[:name]}: #{menu[:price]}円"
   end
@@ -27,10 +23,10 @@ def take_order(menus)
 end
 
 puts 'bugカフェへようこそ！ご注文は？ 番号でどうぞ'
-order1 = take_order(DRINKS)
+drinkorder = take_order(DRINKS)
 
 puts 'フードメニューはいかがですか?'
-order2 = take_order(FOODS)
+foodorder = take_order(FOODS)
 
-total = FOODS[order2][:price].to_i + DRINKS[order1][:price].to_i
+total = FOODS[foodorder][:price].to_i + DRINKS[drinkorder][:price].to_i
 puts "お会計は#{total}円になります。ありがとうございました！"