Add files via upload

Author: JingShing

script/order_manager.py

@@ -41,8 +41,9 @@ def order_manage():
             while(1):
                 order_menu_line = listener()
                 if '和' in order_menu_line or '個' in order_menu_line:
-                    total_order+=order_menu_line
-                elif '點完餐' in order_menu_line:
+                    total_order+=order_menu_line+'和'
+                elif '餐' in order_menu_line:
+                    # 點完餐
                     break
             line_speaker(process_price_with_order(menu_dict, total_order))
 

script/process_order.py

@@ -1,5 +1,10 @@
 import pandas as pd
 import re
+from setting import chinese_to_arabic
+chinese_char_dict = {
+    '〇' : 0, '一' : 1, '二' : 2, '三' : 3, '四' : 4, '五' : 5, '六' : 6, '七' : 7, '八' : 8, '九' : 9, '零' : 0,
+    '壹' : 1, '贰' : 2, '叁' : 3, '肆' : 4, '伍' : 5, '陆' : 6, '柒' : 7, '捌' : 8, '玖' : 9, '貮' : 2, '兩' : 2,
+}
 def load_xlsx(file_name = 'menu.xlsx'):
     xls = pd.ExcelFile(file_name)
     df = xls.parse(xls.sheet_names[0])
@@ -37,13 +42,21 @@ def process_price_with_order(menu_dict, order):
             if top == None:
                 top = item
             else:
+                if item in chinese_char_dict:
+                    item = chinese_to_arabic(item)
                 price_dict[top] = {'amount':item, 'price':None}
                 top = None
         else:
             if top == None:
                 top = item
             else:
-                price_dict[item] = {'amount':int(top), 'price':None}
+                if top in chinese_char_dict:
+                    top = chinese_to_arabic(top)
+                try:
+                    top = int(top)
+                except:
+                    top = 0
+                price_dict[item] = {'amount':top, 'price':None}
                 top = None
 
     total = 0
@@ -70,6 +83,7 @@ def sum_up_total_line(total, none_list):
     return line
 
 # write_xlsx()
-data_dict = load_xlsx()
-menu_dict = process_data_to_menu(data_dict)
-# print(process_price_with_order(menu_dict, '100個火腿和7000個蛋糕'))
+# data_dict = load_xlsx()
+# menu_dict = process_data_to_menu(data_dict)
+# print(process_price_with_order(menu_dict, '100個火腿和7000個蛋糕和兩個大雞雞'))
+# print(process_price_with_order(menu_dict, '一個火腿和7000個蛋糕和兩個大雞雞'))

script/setting.py

@@ -1,7 +1,7 @@
 def chinese_to_arabic(chinese_num):
     chinese_char_dict = {
         '〇' : 0, '一' : 1, '二' : 2, '三' : 3, '四' : 4, '五' : 5, '六' : 6, '七' : 7, '八' : 8, '九' : 9, '零' : 0,
-        '壹' : 1, '贰' : 2, '叁' : 3, '肆' : 4, '伍' : 5, '陆' : 6, '柒' : 7, '捌' : 8, '玖' : 9, '貮' : 2, '两' : 2,
+        '壹' : 1, '贰' : 2, '叁' : 3, '肆' : 4, '伍' : 5, '陆' : 6, '柒' : 7, '捌' : 8, '玖' : 9, '貮' : 2, '兩' : 2,
     }
     chinese_char_unit = {
         '十' : 10,
@@ -46,4 +46,5 @@ def chinese_to_arabic(chinese_num):
     val += tmp
     return val
 
-# print(chinese_to_arabic("九億七千八百萬八千八百八十八"))
+# print(chinese_to_arabic("九億七千八百萬八千八百八十八"))
+# print(chinese_to_arabic("一"))