|
@@ -449,7 +449,7 @@ void CMessagePush::HandlePrinter()
|
|
|
CWaimaiOrder order;
|
|
CWaimaiOrder order;
|
|
|
if (print_type == 1)
|
|
if (print_type == 1)
|
|
|
{
|
|
{
|
|
|
- if (CSetting::GetParam("setting_is_new_waimai_printer") == "1" || CSetting::GetParam("setting_is_new_waimai_chufang_printer") == "1")
|
|
|
|
|
|
|
+ if (CSetting::GetParam("setting_is_new_waimai_printer") == "1" || CSetting::GetParam("setting_is_new_waimai_biaoqian_printer") == "1" || CSetting::GetParam("setting_is_new_waimai_chufang_printer") == "1")
|
|
|
{
|
|
{
|
|
|
bool ret = order.InitData(order_id, order_no);
|
|
bool ret = order.InitData(order_id, order_no);
|
|
|
|
|
|
|
@@ -488,11 +488,20 @@ void CMessagePush::HandlePrinter()
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ //手动打印的模式下,收银小票一定打印,标签和厨房如果没开就不打印
|
|
|
AddShouyinPrinter(order);
|
|
AddShouyinPrinter(order);
|
|
|
|
|
|
|
|
- AddBiaoqianPrinter(order);
|
|
|
|
|
|
|
+ //判断是否自动打印标签小票
|
|
|
|
|
+ if (CSetting::GetParam("setting_is_new_waimai_biaoqian_printer") == "1")
|
|
|
|
|
+ {
|
|
|
|
|
+ AddBiaoqianPrinter(order);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- AddChufangPrinter(order);
|
|
|
|
|
|
|
+ //判断是否进行自动的厨房打印
|
|
|
|
|
+ if (CSetting::GetParam("setting_is_new_waimai_chufang_printer") == "1")
|
|
|
|
|
+ {
|
|
|
|
|
+ AddChufangPrinter(order);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|