update json profile, extend blocks vending task pre main, MYS: handle
case free coupon 30 shells for e-invoice & disable some wordings
This commit is contained in:
parent
7c37df7702
commit
450e10f92f
6 changed files with 391 additions and 22 deletions
|
|
@ -41,6 +41,8 @@ DEBUGVAR bn_no
|
|||
DEBUGVAR bp_yes
|
||||
DEBUGVAR bp_no
|
||||
|
||||
DEBUGVAR Seeker.TriggerGetFree
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
@ -54,9 +56,14 @@ If Timeout > 15 Then
|
|||
Var TestReceiptPage = 0
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
Else
|
||||
If Seeker.TriggerGetFree = 1 Then
|
||||
Var Seeker.TriggerGetFree = 0
|
||||
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -117,7 +124,13 @@ TimerReset
|
|||
<EventClick>
|
||||
|
||||
Var Seeker.e_receipt = "false"
|
||||
If Seeker.TriggerGetFree = 1 Then
|
||||
Var Seeker.TriggerGetFree = 0
|
||||
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@
|
|||
EndIf
|
||||
|
||||
If TaobinLevel = "3" Then
|
||||
Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp
|
||||
Var TaobinLevelDesc1 = "Flying turtle level"
|
||||
|
||||
Var PointDiff = 200 - CoffeePointRank
|
||||
Var TaobinLevelDesc2 = "Earn " + PointDiff
|
||||
|
|
@ -290,7 +290,7 @@
|
|||
EndIf
|
||||
|
||||
If TaobinLevel = "4" Then
|
||||
Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp
|
||||
Var TaobinLevelDesc1 = "Master turtle level"
|
||||
|
||||
Var TaobinLevelDesc2 = ""
|
||||
|
||||
|
|
@ -684,10 +684,30 @@
|
|||
If Timeout > 5 Then
|
||||
|
||||
; goto lid straw
|
||||
Var Seeker.TriggerGetFree = 0
|
||||
If CoffeePoint > 29 Then
|
||||
Var Seeker.TriggerGetFree = 1
|
||||
If eReceiptFlag = 1 Then
|
||||
If CountryName = "Malaysia" Then
|
||||
Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
|
||||
DEBUGVAR RecieptPromptPage
|
||||
Open RecieptPromptPage
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
|
||||
Else
|
||||
If Seeker.FromConsent = 1 Then
|
||||
Var Seeker.TriggerGetFree = 1
|
||||
If eReceiptFlag = 1 Then
|
||||
If CountryName = "Malaysia" Then
|
||||
Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
|
||||
DEBUGVAR RecieptPromptPage
|
||||
Open RecieptPromptPage
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
|
||||
Else
|
||||
|
||||
|
|
@ -821,11 +841,11 @@
|
|||
</Image>
|
||||
|
||||
|
||||
<Image>
|
||||
<X> 243 </X>
|
||||
<Y> 860 </Y>
|
||||
<Filename> Var( DirImage + "/text4.png" )</Filename>
|
||||
</Image>
|
||||
;<Image>
|
||||
;<X> 243 </X>
|
||||
;<Y> 860 </Y>
|
||||
;<Filename> Var( DirImage + "/text4.png" )</Filename>
|
||||
;</Image>
|
||||
|
||||
|
||||
|
||||
|
|
@ -1171,15 +1191,15 @@
|
|||
<Format> Telnum-mask-1 </Format>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 250 </X>
|
||||
<Y> 890 </Y>
|
||||
<Size> 50 </Size>
|
||||
<Width> 120 </Width>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Color> 0xDE794E </Color>
|
||||
<Value> CoffeePointRank </Value>
|
||||
</Text>
|
||||
;<Text>
|
||||
;<X> 250 </X>
|
||||
;<Y> 890 </Y>
|
||||
;<Size> 50 </Size>
|
||||
;<Width> 120 </Width>
|
||||
;<Font> KanitRegularTTF </Font>
|
||||
;<Color> 0xDE794E </Color>
|
||||
;<Value> CoffeePointRank </Value>
|
||||
;</Text>
|
||||
|
||||
<Button>
|
||||
<X> 230 </X>
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@
|
|||
|
||||
<FrameScroll>
|
||||
|
||||
<Max> 6 </Max>
|
||||
<Max> 10 </Max>
|
||||
<X> 280 </X>
|
||||
<Y> 200 </Y>
|
||||
<Width> 600 </Width>
|
||||
|
|
|
|||
|
|
@ -5444,6 +5444,118 @@
|
|||
{
|
||||
"productCode": "T0068-15000",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0068",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0093",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0097",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0096",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0098",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0094",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0095",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0093",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0096",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0094",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-05-02-0160",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0095",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0096",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0098",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0095",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-05-03-0160",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0098",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0093",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0093",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0097",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0097",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0068",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0098",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0094",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0096",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0095",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0094",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0097",
|
||||
"enable": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -5259,7 +5259,7 @@
|
|||
},
|
||||
{
|
||||
"productCode": "T0062-80000",
|
||||
"enable": true
|
||||
"enable": false
|
||||
},
|
||||
{
|
||||
"productCode": "12-02-02-0117",
|
||||
|
|
@ -5411,7 +5411,7 @@
|
|||
},
|
||||
{
|
||||
"productCode": "12-05-02-0134",
|
||||
"enable": true
|
||||
"enable": false
|
||||
},
|
||||
{
|
||||
"productCode": "12-02-01-0118",
|
||||
|
|
@ -5435,7 +5435,7 @@
|
|||
},
|
||||
{
|
||||
"productCode": "12-05-03-0134",
|
||||
"enable": true
|
||||
"enable": false
|
||||
},
|
||||
{
|
||||
"productCode": "12-02-02-0111",
|
||||
|
|
@ -5496,6 +5496,118 @@
|
|||
{
|
||||
"productCode": "T0068-15000",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0068",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0093",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0097",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0096",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0098",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0094",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0095",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0093",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0096",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0094",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-05-02-0160",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0095",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0096",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0098",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0095",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-05-03-0160",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0098",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0093",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0093",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0097",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0097",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0068",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0098",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0094",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0096",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0095",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0094",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0097",
|
||||
"enable": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -5444,6 +5444,118 @@
|
|||
{
|
||||
"productCode": "T0068-15000",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0068",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0093",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0097",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0096",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0098",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0094",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0095",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0093",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0096",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0094",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-05-02-0160",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0095",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0096",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0098",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0095",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-05-03-0160",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0098",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0093",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0093",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0097",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0097",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0068",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0098",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-01-0094",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0096",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-01-02-0095",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-02-0094",
|
||||
"enable": true
|
||||
},
|
||||
{
|
||||
"productCode": "12-21-01-0097",
|
||||
"enable": true
|
||||
}
|
||||
]
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue