pro apple
This commit is contained in:
wanlop run
commit
e9e595dd71
294 changed files with 41389 additions and 5912 deletions
|
|
@ -48,6 +48,12 @@
|
|||
|
||||
Var DisableAllNotFreeTopping = 0
|
||||
|
||||
;Discount-promotion-state
|
||||
Var popup_discount_hot_show = "Invisible"
|
||||
Var popup_discount_cold_show = "Invisible"
|
||||
Var popup_discount_blend_show_eng = "Invisible"
|
||||
Var popup_discount_hot_show_thai = "Invisible"
|
||||
|
||||
Var SaveProductCodeSelect = "-"
|
||||
Var UserSelectProductCode = "-"
|
||||
|
||||
|
|
@ -171,6 +177,7 @@
|
|||
Var topping2 = "31"
|
||||
Var topping3 = "31"
|
||||
|
||||
Var DirImageToppingInter = "ROOT/taobin_project/image/topping_inter"
|
||||
|
||||
Var BugFlag = 0
|
||||
|
||||
|
|
@ -333,9 +340,23 @@
|
|||
|
||||
Var high_light_drink_type = "Invisible"
|
||||
|
||||
Var text_hot_color = "0x84776F"
|
||||
Var text_cold_color = "0x84776F"
|
||||
Var text_blender_color = "0x84776F"
|
||||
If PriceDiscount[0] > 0 Then
|
||||
Var text_hot_color = "0xFF0000"
|
||||
Else
|
||||
Var text_hot_color = "0x84776F"
|
||||
EndIf
|
||||
If PriceDiscount[1] > 0 Then
|
||||
Var text_cold_color = "0xFF0000"
|
||||
Else
|
||||
Var text_cold_color = "0x84776F"
|
||||
EndIf
|
||||
If PriceDiscount[2] > 0 Then
|
||||
Var text_blender_color = "0xFF0000"
|
||||
Else
|
||||
Var text_blender_color = "0x84776F"
|
||||
EndIf
|
||||
|
||||
Var text_original_price_color = "0x84776F"
|
||||
|
||||
If new_layout = "true" Then
|
||||
Var PriceDrinkTmpShow = "---"
|
||||
|
|
@ -392,20 +413,51 @@
|
|||
|
||||
If hot_button_state = "Disable2" Then
|
||||
Var text_price_d1 = ""
|
||||
Var text_price_original_d1 = ""
|
||||
Else
|
||||
Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormat, PreScaleConvertShow)
|
||||
Var text_price_original_d1 !assigned StringFmt( PriceMain[0] , DisplayFormat, PreScaleConvertShow)
|
||||
|
||||
If PriceDiscount[0] > 0 Then
|
||||
Var popup_discount_hot_show = "Enable"
|
||||
Else
|
||||
Var popup_discount_hot_show = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If cold_button_state = "Disable2" Then
|
||||
Var text_price_d2 = ""
|
||||
Var text_price_original_d2 = ""
|
||||
Else
|
||||
Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormat, PreScaleConvertShow)
|
||||
Var text_price_original_d2 !assigned StringFmt( PriceMain[1] , DisplayFormat, PreScaleConvertShow)
|
||||
|
||||
If PriceDiscount[1] > 0 Then
|
||||
Var popup_discount_cold_show = "Enable"
|
||||
Else
|
||||
Var popup_discount_cold_show = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If blend_button_state = "Disable2" Then
|
||||
Var text_price_d3 = ""
|
||||
Var text_price_original_d3 = ""
|
||||
Else
|
||||
Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormat, PreScaleConvertShow)
|
||||
Var text_price_original_d3 !assigned StringFmt( PriceMain[2] , DisplayFormat, PreScaleConvertShow)
|
||||
|
||||
If PriceDiscount[2] > 0 Then
|
||||
If text_show_eng = "Enable" Then
|
||||
Var popup_discount_blend_show_eng = "Enable"
|
||||
Var popup_discount_blend_show_thai = "Invisible"
|
||||
Else
|
||||
Var popup_discount_blend_show_thai = "Enable"
|
||||
Var popup_discount_blend_show_eng = "Invisible"
|
||||
EndIf
|
||||
Else
|
||||
Var popup_discount_blend_show_eng = "Invisible"
|
||||
Var popup_discount_blend_show_thai = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR PD_CODE1
|
||||
|
|
@ -2714,6 +2766,7 @@
|
|||
Topping "Load" PD_CODE1
|
||||
|
||||
Var high_light_drink_type = "Invisible"
|
||||
Var IndexDrinktType = 0
|
||||
|
||||
|
||||
|
||||
|
|
@ -2766,6 +2819,8 @@
|
|||
Var topping_price_refresh = 0
|
||||
Topping "Load" PD_CODE2
|
||||
|
||||
Var IndexDrinktType = 1
|
||||
|
||||
|
||||
|
||||
</EventClick>
|
||||
|
|
@ -2816,6 +2871,8 @@
|
|||
Var topping_price_refresh = 0
|
||||
Topping "Load" PD_CODE3
|
||||
|
||||
Var IndexDrinktType = 2
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -2860,6 +2917,94 @@
|
|||
<Value> text_price_d3 </Value>
|
||||
</Text>
|
||||
|
||||
<Image>
|
||||
<X> 552 </X>
|
||||
<Y> 55 </Y>
|
||||
<State> popup_discount_hot_show </State>
|
||||
<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
|
||||
</Image>
|
||||
<Image>
|
||||
<X> 552 </X>
|
||||
<Y> 55 </Y>
|
||||
<State> popup_discount_hot_show </State>
|
||||
<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 562 </X>
|
||||
<Y> 55 </Y>
|
||||
<State> popup_discount_hot_show </State>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Size> 21 </Size>
|
||||
<Color> text_original_price_color </Color>
|
||||
<Value> text_price_original_d1 </Value>
|
||||
</Text>
|
||||
|
||||
<Image>
|
||||
<X> 710 </X>
|
||||
<Y> 55 </Y>
|
||||
<State> popup_discount_cold_show </State>
|
||||
<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
|
||||
</Image>
|
||||
<Image>
|
||||
<X> 710 </X>
|
||||
<Y> 55 </Y>
|
||||
<State> popup_discount_cold_show </State>
|
||||
<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 720 </X>
|
||||
<Y> 55 </Y>
|
||||
<State> popup_discount_cold_show </State>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Size> 21 </Size>
|
||||
<Color> text_original_price_color </Color>
|
||||
<Value> text_price_original_d2 </Value>
|
||||
</Text>
|
||||
|
||||
<Image>
|
||||
<X> 852 </X>
|
||||
<Y> 55 </Y>
|
||||
<State> popup_discount_blend_show_thai </State>
|
||||
<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
|
||||
</Image>
|
||||
<Image>
|
||||
<X> 852 </X>
|
||||
<Y> 55 </Y>
|
||||
<State> popup_discount_blend_show_thai </State>
|
||||
<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 862 </X>
|
||||
<Y> 55 </Y>
|
||||
<State> popup_discount_blend_show_thai </State>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Size> 23 </Size>
|
||||
<Color> text_original_price_color </Color>
|
||||
<Value> text_price_original_d3 </Value>
|
||||
</Text>
|
||||
|
||||
<Image>
|
||||
<X> 892 </X>
|
||||
<Y> 55 </Y>
|
||||
<State> popup_discount_blend_show_eng </State>
|
||||
<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
|
||||
</Image>
|
||||
<Image>
|
||||
<X> 892 </X>
|
||||
<Y> 55 </Y>
|
||||
<State> popup_discount_blend_show_eng </State>
|
||||
<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 902 </X>
|
||||
<Y> 55 </Y>
|
||||
<State> popup_discount_blend_show_eng </State>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Size> 23 </Size>
|
||||
<Color> text_original_price_color </Color>
|
||||
<Value> text_price_original_d3 </Value>
|
||||
</Text>
|
||||
|
||||
</Block>
|
||||
|
||||
|
||||
|
|
@ -6864,6 +7009,19 @@
|
|||
|
||||
|
||||
If SelectDrinkType = 1 Then
|
||||
If hot_button_state = "PressForever" Then
|
||||
Var IndexDrinktType = 0
|
||||
EndIf
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var IndexDrinktType = 1
|
||||
EndIf
|
||||
If blend_button_state = "PressForever" Then
|
||||
Var IndexDrinktType = 2
|
||||
EndIf
|
||||
|
||||
Var Seeker.PriceMain = PriceMain[IndexDrinktType]
|
||||
Var Seeker.PriceDiscount = PriceDiscount[IndexDrinktType]
|
||||
Var Seeker.PriceTag = PriceTag[IndexDrinktType]
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -7133,6 +7291,20 @@
|
|||
Else
|
||||
|
||||
If SelectDrinkType = 1 Then
|
||||
If hot_button_state = "PressForever" Then
|
||||
Var IndexDrinktType = 0
|
||||
EndIf
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var IndexDrinktType = 1
|
||||
EndIf
|
||||
If blend_button_state = "PressForever" Then
|
||||
Var IndexDrinktType = 2
|
||||
EndIf
|
||||
|
||||
Var Seeker.PriceMain = PriceMain[IndexDrinktType]
|
||||
Var Seeker.PriceDiscount = PriceDiscount[IndexDrinktType]
|
||||
Var Seeker.PriceTag = PriceTag[IndexDrinktType]
|
||||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
|
||||
Open "ROOT/taobin_project/xml/page_identity_verification.xml"
|
||||
EndIf
|
||||
|
|
@ -7642,8 +7814,30 @@
|
|||
Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_hot
|
||||
|
||||
Var text_hot_color = "0xFFFFFF"
|
||||
Var text_cold_color = "0x84776F"
|
||||
Var text_blender_color = "0x84776F"
|
||||
If PriceDiscount[0] > 0 Then
|
||||
Var popup_discount_hot_show = "Invisible"
|
||||
EndIf
|
||||
If PriceDiscount[1] > 0 Then
|
||||
Var text_cold_color = "0xFF0000"
|
||||
Var popup_discount_cold_show = "Enable"
|
||||
Else
|
||||
Var text_cold_color = "0x84776F"
|
||||
Var popup_discount_cold_show = "Invisible"
|
||||
EndIf
|
||||
If PriceDiscount[2] > 0 Then
|
||||
Var text_blender_color = "0xFF0000"
|
||||
If text_show_eng = "Enable" Then
|
||||
Var popup_discount_blend_show_eng = "Enable"
|
||||
Var popup_discount_blend_show_thai = "Invisible"
|
||||
Else
|
||||
Var popup_discount_blend_show_eng = "Invisible"
|
||||
Var popup_discount_blend_show_thai = "Enable"
|
||||
EndIf
|
||||
Else
|
||||
Var text_blender_color = "0x84776F"
|
||||
Var popup_discount_blend_show_eng = "Invisible"
|
||||
Var popup_discount_blend_show_thai = "Invisible"
|
||||
EndIf
|
||||
|
||||
Var SelectDrinkType = 1
|
||||
|
||||
|
|
@ -7681,9 +7875,31 @@
|
|||
Var Seeker.NameDrinkTH = menu_name_thai_cold
|
||||
Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_cold
|
||||
|
||||
Var text_hot_color = "0x84776F"
|
||||
If PriceDiscount[0] > 0 Then
|
||||
Var text_hot_color = "0xFF0000"
|
||||
Var popup_discount_hot_show = "Enable"
|
||||
Else
|
||||
Var text_hot_color = "0x84776F"
|
||||
Var popup_discount_hot_show = "Invisible"
|
||||
EndIf
|
||||
Var text_cold_color = "0xFFFFFF"
|
||||
Var text_blender_color = "0x84776F"
|
||||
If PriceDiscount[1] > 0 Then
|
||||
Var popup_discount_cold_show = "Invisible"
|
||||
EndIf
|
||||
If PriceDiscount[2] > 0 Then
|
||||
Var text_blender_color = "0xFF0000"
|
||||
If text_show_eng = "Enable" Then
|
||||
Var popup_discount_blend_show_eng = "Enable"
|
||||
Var popup_discount_blend_show_thai = "Invisible"
|
||||
Else
|
||||
Var popup_discount_blend_show_eng = "Invisible"
|
||||
Var popup_discount_blend_show_thai = "Enable"
|
||||
EndIf
|
||||
Else
|
||||
Var text_blender_color = "0x84776F"
|
||||
Var popup_discount_blend_show_eng = "Invisible"
|
||||
Var popup_discount_blend_show_thai = "Invisible"
|
||||
EndIf
|
||||
|
||||
Var SelectDrinkType = 1
|
||||
|
||||
|
|
@ -7729,9 +7945,25 @@
|
|||
Var Seeker.NameDrinkTH = menu_name_thai_blender
|
||||
Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_blender
|
||||
|
||||
Var text_hot_color = "0x84776F"
|
||||
Var text_cold_color = "0x84776F"
|
||||
If PriceDiscount[0] > 0 Then
|
||||
Var text_hot_color = "0xFF0000"
|
||||
Var popup_discount_hot_show = "Enable"
|
||||
Else
|
||||
Var text_hot_color = "0x84776F"
|
||||
Var popup_discount_hot_show = "Invisible"
|
||||
EndIf
|
||||
If PriceDiscount[1] > 0 Then
|
||||
Var text_cold_color = "0xFF0000"
|
||||
Var popup_discount_cold_show = "Enable"
|
||||
Else
|
||||
Var text_cold_color = "0x84776F"
|
||||
Var popup_discount_cold_show = "Invisible"
|
||||
EndIf
|
||||
Var text_blender_color = "0xFFFFFF"
|
||||
If PriceDiscount[2] > 0 Then
|
||||
Var popup_discount_blend_show_eng = "Invisible"
|
||||
Var popup_discount_blend_show_thai = "Invisible"
|
||||
EndIf
|
||||
|
||||
Var SelectDrinkType = 1
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue