Merge branch 'uae_dubai_blue' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into uae_dubai_blue
This commit is contained in:
commit
5d9d7f3166
2 changed files with 7 additions and 1 deletions
|
|
@ -536,6 +536,7 @@
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<EventMachine>
|
<EventMachine>
|
||||||
|
|
||||||
DEBUGVAR MAT_ID_STRAW_OFFER
|
DEBUGVAR MAT_ID_STRAW_OFFER
|
||||||
DEBUGVAR MAT_ID_LID_OFFER
|
DEBUGVAR MAT_ID_LID_OFFER
|
||||||
DEBUGVAR MAT_ID_511215
|
DEBUGVAR MAT_ID_511215
|
||||||
|
|
@ -1423,6 +1424,10 @@
|
||||||
If RoadShow = "true" Then
|
If RoadShow = "true" Then
|
||||||
Var PriceShowValue = "Free"
|
Var PriceShowValue = "Free"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
If ExtraToppingState = "Invisible" Then
|
||||||
|
Var ExtraTopping = "Invisible"
|
||||||
|
EndIf
|
||||||
|
|
||||||
DEBUGVAR showShotEnable
|
DEBUGVAR showShotEnable
|
||||||
DEBUGVAR showOreoAddEnable
|
DEBUGVAR showOreoAddEnable
|
||||||
|
|
|
||||||
|
|
@ -1004,7 +1004,7 @@
|
||||||
|
|
||||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/uae_dubai/video/script_video.ev"
|
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/uae_dubai/video/script_video.ev"
|
||||||
|
|
||||||
|
|
||||||
Var WebAppShow = "Invisible"
|
Var WebAppShow = "Invisible"
|
||||||
EnableLanguage "ENG"
|
EnableLanguage "ENG"
|
||||||
EnableLanguage "UAE_DUBAI"
|
EnableLanguage "UAE_DUBAI"
|
||||||
|
|
@ -1026,6 +1026,7 @@
|
||||||
Var TextPriceMenuHotX = 48
|
Var TextPriceMenuHotX = 48
|
||||||
Var ShowButtonClick2 = "Enable"
|
Var ShowButtonClick2 = "Enable"
|
||||||
Var ButtontoTopupMenu = "Invisible"
|
Var ButtontoTopupMenu = "Invisible"
|
||||||
|
Var ExtraToppingState = "Invisible"
|
||||||
|
|
||||||
Var PriceUnitText = "Price in DH"
|
Var PriceUnitText = "Price in DH"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue