Release 8.34
This commit is contained in:
parent
381d2d7d81
commit
4aa8a6dbeb
53 changed files with 30879 additions and 22712 deletions
6980
xml/.page_topping_select_icream.xml
Normal file
6980
xml/.page_topping_select_icream.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -19,6 +19,12 @@
|
|||
else:
|
||||
from_my_mint_promotion = False
|
||||
|
||||
if current_file_name == "page_catalog_group_soft_serve.skt":
|
||||
topping_redirect = True
|
||||
else:
|
||||
topping_redirect = False
|
||||
|
||||
|
||||
#print ("######################################################################################################")
|
||||
idx_of_eng = 2
|
||||
out_xml('<FrameScroll> \r\n')
|
||||
|
|
@ -291,7 +297,13 @@
|
|||
|
||||
out_xml( '\t\t\r\n')
|
||||
out_xml( '\t\t\r\n')
|
||||
if spl[1] != "None":
|
||||
|
||||
|
||||
if topping_redirect:
|
||||
out_xml( '\t\tTabMenuVisibleInst 99\r\n')
|
||||
out_xml( '\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"\r\n')
|
||||
|
||||
elif spl[1] != "None":
|
||||
out_xml( '\t\tTabMenuVisibleInst 99\r\n')
|
||||
out_xml( '\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"\r\n')
|
||||
#out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\r\n')
|
||||
|
|
|
|||
|
|
@ -708,9 +708,11 @@
|
|||
|
||||
</EventUnitTest2>
|
||||
|
||||
<EventUnitTest3>
|
||||
|
||||
<EventUnitTest3>
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_catalog_group_soft_serve.xml"
|
||||
</EventUnitTest3>
|
||||
|
||||
<EventUnitTest4>
|
||||
|
||||
</EventUnitTest4>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -649,7 +649,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -902,7 +902,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -1155,7 +1155,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -1408,7 +1408,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -1661,7 +1661,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -1914,7 +1914,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -2167,7 +2167,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -2420,7 +2420,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -2673,7 +2673,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -2926,7 +2926,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -3179,7 +3179,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -3432,7 +3432,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -3685,7 +3685,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -3938,7 +3938,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -4191,7 +4191,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -4444,7 +4444,7 @@
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -4699,7 +4699,7 @@ Banana" </Value>
|
|||
|
||||
|
||||
TabMenuVisibleInst 99
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
|
|||
|
|
@ -1839,7 +1839,7 @@ HOUSE " </Value>
|
|||
</Text>
|
||||
</Block>
|
||||
; - - -
|
||||
; ==================> Len = 12
|
||||
; ==================> Len = 17
|
||||
; - 12-05-02-0055 -
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
|
|
@ -2092,7 +2092,7 @@ HOUSE " </Value>
|
|||
</Text>
|
||||
</Block>
|
||||
; - - -
|
||||
; ==================> Len = 12
|
||||
; ==================> Len = 17
|
||||
; - 12-05-02-0056 -
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
|
|
|
|||
|
|
@ -698,7 +698,7 @@
|
|||
</EventUnitTest2>
|
||||
|
||||
<EventUnitTest3>
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/event/promotion_pepsi.xml"
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_soft_serve.xml"
|
||||
</EventUnitTest3>
|
||||
<EventUnitTest4>
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_catalog.xml"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1800,7 +1800,7 @@ HOUSE " </Value>
|
|||
</Text>
|
||||
</Block>
|
||||
; - - -
|
||||
; ==================> Len = 12
|
||||
; ==================> Len = 17
|
||||
; - 12-05-02-0055 -
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
|
|
@ -2051,7 +2051,7 @@ HOUSE " </Value>
|
|||
</Text>
|
||||
</Block>
|
||||
; - - -
|
||||
; ==================> Len = 12
|
||||
; ==================> Len = 17
|
||||
; - 12-05-02-0056 -
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
|
|
|
|||
|
|
@ -504,7 +504,7 @@
|
|||
|
||||
|
||||
If MenuReady = "YES" Then
|
||||
|
||||
DEBUGVAR ToppingDetail
|
||||
|
||||
; echo -n true > /mnt/sdcard/coffeevending/menu_blend_free
|
||||
|
||||
|
|
@ -7676,6 +7676,8 @@
|
|||
; Pack
|
||||
Topping "Pack" ExtendDataCurr
|
||||
|
||||
|
||||
|
||||
Else
|
||||
Topping "SetNextOrder" UserSelectProductCode
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue