修改小票格式

bin/Win32/Debug/lewaimai_pos_windows/skin/setting.xml

@@ -77,7 +77,7 @@
 						<Label text="小票格式设置" width="260" />
 					</HorizontalLayout>
 					<Control height="1" bkcolor="#FF708090" />
-					<HorizontalLayout height="44">
+					<HorizontalLayout height="44" visible="false">
 						<Label text="取货方式大号字体" width="260" />
 						<CheckBox name="setting_printer_quhuo_big" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
 					</HorizontalLayout>
@@ -89,7 +89,7 @@
 						<Label text="下单时间大号字体" width="260" />
 						<CheckBox name="setting_printer_xiadanshijian_big" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
 					</HorizontalLayout>
-					<HorizontalLayout height="44">
+					<HorizontalLayout height="44" visible="false">
 						<Label text="配送（自取）时间大号字体" width="260" />
 						<CheckBox name="setting_printer_peisongshijian_big" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
 					</HorizontalLayout>

lewaimai_pos_windows/order/CWaimaiOrder.cpp

@@ -108,6 +108,10 @@ bool CWaimaiOrder::InitData(std::string order_id, std::string order_no)
 
 			m_customer_order_total = data["customer_order_total"].GetString();
 
+			m_printer_tip_name = data["printer_tip_name"].GetString();
+
+			m_is_book = data["is_book"].GetString();
+
 			//开始保存订单详情
 			rapidjson::Value& v_rows = data["order_item"];
 

lewaimai_pos_windows/order/CWaimaiOrder.h

@@ -97,6 +97,10 @@ public:
 
 	std::string m_customer_order_total;
 
+	std::string m_printer_tip_name;
+
+	std::string m_is_book;
+
 	std::vector<CWaimaiOrderItem> m_order_items;
 	std::vector<CWaimaiOrderField> m_order_field;
 	std::vector<CWaimaiOrderField> m_addservie;

lewaimai_pos_windows/tool/CPosPrinter.cpp

@@ -488,11 +488,67 @@ void CPosPrinter::PrintWaimaiOrderShouyin(CWaimaiOrder& order)
     {
         POS_Reset();
 
+		//打印店铺名字
         string shop_name = "#" + order.m_restaurant_number + "  " + CLewaimaiString::UTF8ToANSI(order.m_shop_name);
         POS_TextOut(shop_name, true, true, 1);
 
         POS_FeedLine();
         POS_FeedLine();
+
+		//打印小票自定义名称
+		string printer_tip_name = CLewaimaiString::UTF8ToANSI(order.m_printer_tip_name);
+		if (printer_tip_name.length() > 0)
+		{
+			POS_TextOut(printer_tip_name, false, true, 1);
+
+			POS_FeedLine();
+			POS_FeedLine();
+		}
+
+		//打印预约、即时配送的提醒
+
+		/*
+		bool setting_printer_peisongshijian_big = false;
+
+		if (CSetting::GetParam("setting_printer_peisongshijian_big") == "1")
+		{
+			setting_printer_peisongshijian_big = true;
+		}
+		}*/
+
+		if (order.m_is_selftake == "1")
+		{
+			string date = "【自取单】" + CLewaimaiString::UTF8ToANSI(order.m_delivery_date);
+			POS_TextOut(date, false, true);
+			POS_TextOut("取货", false, false);
+
+			POS_FeedLine();
+		}
+		else
+		{
+			if (order.m_is_book == "1")
+			{
+				//预约单
+				string date = "【预约单】" + CLewaimaiString::UTF8ToANSI(order.m_delivery_date);
+				POS_TextOut(date, false, true);
+				POS_TextOut("送达", false, false);
+
+				POS_FeedLine();
+			}
+			else
+			{
+				//非预约单
+				string date = "【即时单】立即送达";
+				POS_TextOut(date, false, true, 1);
+
+				POS_FeedLine();
+			}
+		}
+
+		POS_FeedLine();
+
+		//打印取货方式
+		/*
         bool setting_printer_quhuo_big = false;
 
         if(CSetting::GetParam("setting_printer_quhuo_big") == "1")
@@ -513,6 +569,7 @@ void CPosPrinter::PrintWaimaiOrderShouyin(CWaimaiOrder& order)
         }
 
         POS_FeedLine();
+		*/
 
         //订单来源
         string from_type = "订单来源：" + CLewaimaiString::UTF8ToANSI(order.m_from_type);
@@ -543,27 +600,6 @@ void CPosPrinter::PrintWaimaiOrderShouyin(CWaimaiOrder& order)
         POS_TextOut(order_date, false, setting_printer_xiadanshijian_big);
         POS_FeedLine();
 
-        //配送时间
-        bool setting_printer_peisongshijian_big = false;
-
-        if(CSetting::GetParam("setting_printer_peisongshijian_big") == "1")
-        {
-            setting_printer_peisongshijian_big = true;
-        }
-
-        if(order.m_is_selftake == "1")
-        {
-            string date = "自取时间：" + CLewaimaiString::UTF8ToANSI(order.m_delivery_date);
-            POS_TextOut(date, false, setting_printer_peisongshijian_big);
-            POS_FeedLine();
-        }
-        else
-        {
-            string date = "配送时间：" + CLewaimaiString::UTF8ToANSI(order.m_delivery_date);
-            POS_TextOut(date, false, setting_printer_peisongshijian_big);
-            POS_FeedLine();
-        }
-
         //姓名
         bool setting_printer_name_big = false;