This commit is contained in:
wanlop run 2025-02-24 11:27:49 +07:00
commit 04d8dbc024
189 changed files with 20821 additions and 4335 deletions

View file

@ -1 +1 @@
/event/promotion_strawberry_series.xml
/event/promotion_coconut_milk.xml

File diff suppressed because it is too large Load diff

View file

@ -1 +1 @@
Open "ROOT/taobin_project/xml/page_catalog_group_pro_strawberry_series.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_pro_coconut_milk.xml"

View file

@ -4,33 +4,9 @@
<Y> 518 </Y>
<State> BigButtonEnable </State>
<Filename>
eval(
If show_eng = "true" Then
Var return = ###normal_eng
Else
Var return = ###normal_thai
EndIf
)
</Filename>
<FilenamePress>
eval(
If show_eng = "true" Then
Var return = ###normal_eng
Else
Var return = ###normal_thai
EndIf
)
</FilenamePress>
<FilenameDisable>
eval(
If show_eng = "true" Then
Var return = ###normal_eng
Else
Var return = ###normal_thai
EndIf
)
</FilenameDisable>
<Filename> ###normal_thai </Filename>
<FilenamePress> ###press_thai </FilenamePress>
<FilenameDisable> ###disable_thai </FilenameDisable>
<EventOnClick>
###EventOnClick
@ -43,36 +19,8 @@
<Width> 484 </Width>
<Height> 616 </Height>
<Loop> "true" </Loop>
<State>
eval(
If show_eng = "true" Then
Var return = "Invisible"
Else
Var return = "Enable"
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image/event/strawberry_series/strawberry_series.mp4" </Filename>
<Filename> "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.mp4" </Filename>
</Video>
<Video>
<X> 42 </X>
<Y> 518 </Y>
<Width> 484 </Width>
<Height> 616 </Height>
<State>
eval(
If show_eng = "true" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
)
</State>
<Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/image/event/strawberry_series/strawberry_series.mp4" </Filename>
</Video>
</Button>
<EventUnitTest1>

View file

@ -7,6 +7,7 @@ DEBUGVAR OpenFromPageBoard
DEBUGVAR StrawberrySeriesPro
DEBUGVAR OvaltineSchoolPro
DEBUGVAR RedStringOfFatePro
DEBUGVAR CoconutMilkPro
Var PromotionState1 = "Invisible"
Var PromotionState2 = "Invisible"
@ -27,15 +28,6 @@ Else
Var FileRecommendToOpen = "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
; zone promote
If StrawberrySeriesPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_strawberry_series.xml"
Else
If ThickTeaByBrewerBanner = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_thick_tea_by_brewer.xml"
EndIf
EndIf
If OvaltineSchoolPro = 1 Then
If RedStringOfFatePro = 1 Then
Var PromotionState1 = "Enable"
@ -50,9 +42,13 @@ Else
EndIf
EndIf
If CoconutMilkPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_coconut_milk.xml"
EndIf
If OpenFromPageBoard = 1 Then
DEBUGVAR FreeEnergyDrink
DEBUGVAR BigButtonEnable
OpenInst 2 FileRecommendToOpen

View file

@ -8,6 +8,8 @@
Var ChildrenFree = 0
Var KBankCashlessMachine = 0
Var OreoDueEnable = 0
Var OreoForFreeEnable = 0
Var SoundBackToSchoolEnable = 0
@ -63,6 +65,9 @@ Var RedStringOfFatePro = 0
; Swensen, 21 Feb - 20 Mar
Var SwensenPro = 0
; Coconut Milk, 1 Mar - 31 Mar
Var CoconutMilkPro = 0
Var NewCollectPoint = 1
Var PaymentCodeShouldCollectPromotionPoint = 0
@ -115,12 +120,11 @@ If SystemDateMonthInt = 3 Then
If SystemDateDayInt >= 3 Then
Var SwensenPro = 1
EndIf
Var CoconutMilkPro = 1
EndIf
; zone block logic follow ingredent
Var JemilaToppingFlag = 1
If SystemDateDayOfWeek = "Wednesday" Then
Var JemilaToppingFreeFlag = 1
@ -209,109 +213,20 @@ EndIf
STRCONTAIN "taobin_nopro" XMLProfile taobin_nopro
If taobin_nopro = "true" Then
Var MilkChoiceVeganEnable = 0
Var GameEnableFromTrickerEv = 0
Var TamatianEnable = 0
Var MayDayRunEnable = 0
Var MomDayEnable = 0
Var PepsiProEnable = 0
Var PepsiPromoteVideo = 0
Var PepsiProCodeEnable = 0
Var MysteryProEnable = 0
Var PepweenEnable = 0
Var RerunProEnable = 0
Var ProPeachEnable = 0
Var ProBadValentineEnable = 0
Var FreeEnergyDrink = 0
Var MondayBananaPro = 0
Var FreeFirePro = 0
Var TeaTimePro = 0
Var EnergyDrink1BathPro = 0
Var CoffeeDrink1BathPro = 0
Var PepsiSecondCup30Enable = 0
Var PepsiSecondCup30DiscountEnable = 0
Var FromPepsiSecondCup30 = 0
Var LipitPro = 0
Var WednesdayMelonPro = 0
Var NamHomCoconutPro = 0
Var Cocoa77Pro = 0
Var 7UpLuckyDrawX2Pro = 0
Var PassionMintPro = 0
Var MomCocoaPro = 0
Var RobinsonBeautyPro = 0
Var JemilaPro = 0
Var HalloweenPro = 0
Var WeekdayDiscountPro = 0
Var OreoDiscount11Pro = 0
Var HappyTriosPro = 0
Var 12Day12MenuPro = 0
Var HappyTriosPro = 0
Var OvaltineSchoolPro = 0
Var RedStringOfFatePro = 0
Var CoconutMilkPro = 0
Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
EndIf
; check material
; zone block logic follow ingredent
If CoconutSyrupEnable = "true" Then
Else
If BananaSyrupEnable = "true" Then
Else
Var NamHomCoconutPro = 0
EndIf
EndIf
If MelonSyrupEnable = "true" Then
Else
Var WednesdayMelonPro = 0
EndIf
If CocoaPowderEnable = "true" Then
Else
Var Cocoa77Pro = 0
Var MomCocoaPro = 0
EndIf
If 7UpSyrupEnable = "true" Then
Else
If PepsiHighYSyrupEnable = "true" Then
Else
Var HalloweenPro = 0
EndIf
EndIf
If MintSyrupEnable = "true" Then
Else
Var PassionMintPro = 0
EndIf
If CollagenPowderEnable = "true" Then
Else
Var JemilaPro = 0
EndIf
If OreoEnable = "true" Then
Else
Var OreoDiscount11Pro = 0
Var HappyTriosPro = 0
Var CoconutMilkPro = 0
EndIf
DEBUGVAR HaveIngredientOvaltine
@ -353,4 +268,11 @@ If BoxID = 176757 Then
Var SaveOrderNameAndPictureEnable = 1
EndIf
DEBUGVAR SystemDateDayOfWeek
DEBUGVAR SystemDateDayOfWeek
READ_FILE "/mnt/sdcard/coffeevending/kbank_cashless_machine" KBankCashlessMachineContent
DEBUGVAR KBankCashlessMachineContent
If KBankCashlessMachineContent = 1 Then
Var KBankCashlessMachine = 1
EndIf
DEBUGVAR KBankCashlessMachine

View file

@ -42,6 +42,7 @@
DEBUGVAR Seeker
DEBUGVAR Seeker.selected_a_drink
DEBUGVAR Seeker.ServiceAmount2
DEBUGVAR Seeker.CashlessVendingTrackNumber
DEBUGVAR Seeker.CodeNumber
@ -948,7 +949,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
CashlessReq SUCCESS Seeker.CashlessVendingTrackNumber
EndIf
Else
@ -978,7 +979,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq FAIL
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

View file

@ -85,6 +85,7 @@
DEBUGVAR Seeker
DEBUGVAR Seeker.selected_a_drink
DEBUGVAR Seeker.ServiceAmount2
DEBUGVAR Seeker.CashlessVendingTrackNumber
DEBUGVAR Seeker.CodeNumber
@ -457,7 +458,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
CashlessReq SUCCESS Seeker.CashlessVendingTrackNumber
EndIf
Else
@ -487,7 +488,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq FAIL
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

View file

@ -55,6 +55,7 @@
DEBUGVAR Seeker.TNumberTaobinCredit
DEBUGVAR TelephoneNumber
DEBUGVAR Seeker.StoreCreditFlag
DEBUGVAR Seeker.CashlessVendingTrackNumber
DEBUGVAR Seeker
@ -519,7 +520,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq FAIL
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

View file

@ -1261,8 +1261,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
@ -1271,8 +1271,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
@ -1340,7 +1340,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq FAIL
CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

View file

@ -709,8 +709,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
@ -721,8 +721,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
@ -793,7 +793,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq FAIL
CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

View file

@ -635,7 +635,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq FAIL
CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,36 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
Var Timeout = 0
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
</EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

File diff suppressed because it is too large Load diff

View file

@ -3357,261 +3357,6 @@ Caramel Oreo" </Value>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; - - -
; ==================> Len = 15
; 12-02-01-0001 12-02-02-0001 12-02-03-0001
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-02-01-0001.Button,12-02-02-0001.Button,12-02-03-0001.Button,$Sum120201000112020200011202030001) </State>
<Button>
<State> $Sum120201000112020200011202030001 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_chrysanthemum_tea.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_chrysanthemum_tea.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_chrysanthemum_tea.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-01-0001, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Chrysanths Tea"
Var NameDrinkTH = "เก็กฮวย "
Var DrinkDescriptionTH = "น้ำเก๊กฮวย น้ำตาล"
Var DrinkDescription = "Chrysanthemum & Water "
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_chrysanthemum_tea.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-02-01-0001.Price
Var PriceD2 = $12-02-02-0001.Price
Var PriceD3 = $12-02-03-0001.Price
Var PD_CODE1 = "12-02-01-0001"
Var PD_CODE2 = "12-02-02-0001"
Var PD_CODE3 = "12-02-03-0001"
Var PD_STAGE_1 = $12-02-01-0001.Button
Var PD_STAGE_2 = $12-02-02-0001.Button
Var PD_STAGE_3 = $12-02-03-0001.Button
Var OverlayMenuFilter !assigned xmlpro( 12-02-01-0001, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
If PD_STAGE_1 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 1
EndIf
If PD_STAGE_2 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 2
EndIf
If PD_STAGE_3 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 3
EndIf
If PD_STAGE_2 = "Enable" Then
Topping "Load" "12-02-02-0001"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "12-02-01-0001"
Else
Topping "Load" "12-02-03-0001"
EndIf
EndIf
Var menu_name_eng_hot = $12-02-01-0001.NameE
Var menu_desc_eng_hot = $12-02-01-0001.descriptionE
Var menu_name_thai_hot = $12-02-01-0001.Name
Var menu_desc_thai_hot = $12-02-01-0001.description
Var menu_name_eng_cold = $12-02-02-0001.NameE
Var menu_desc_eng_cold = $12-02-02-0001.descriptionE
Var menu_name_thai_cold = $12-02-02-0001.Name
Var menu_desc_thai_cold = $12-02-02-0001.description
Var menu_name_eng_blender = $12-02-03-0001.NameE
Var menu_desc_eng_blender = $12-02-03-0001.descriptionE
Var menu_name_thai_blender = $12-02-03-0001.Name
Var menu_desc_thai_blender = $12-02-03-0001.description
DEBUGVAR PD_STAGE_1
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
</EventOnClick>
</Button>
<Text>
<X> 16 </X>
<Y> 164 </Y>
<Size> 24 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "เก็กฮวย " </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 220 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำเก๊กฮวย น้ำตาล" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 164 </Y>
<Size> 22 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Chrysanths Tea" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 220 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Chrysanthemum & Water " </Value>
</Text>
<Image>
<X> 16 </X>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
</Image>
<Image>
<X> 16 </X>
<Y> 264 </Y>
<State> $12-02-01-0001.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
</Image>
<Text>
<X> 50 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-02-01-0001.Button </State>
<Value> StringFmt( $12-02-01-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<State> $12-02-02-0001.Button </State>
</Image>
<Text>
<X> 115 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-02-02-0001.Button </State>
<Value> StringFmt( $12-02-02-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 146 </X>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<State> $12-02-03-0001.Button </State>
</Image>
<Text>
<X> 180 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitRegularTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-02-03-0001.Button </State>
<Value> StringFmt( $12-02-03-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
<Y> 264 </Y>
<State>
eval(
If ICE_PROCESS_STATUS = 2 Then
If $Sum120201000112020200011202030001 = "Disable" Then
Var ice_tab_process_show = "Disable"
Else
Var ice_tab_process_show = "Enable"
EndIf
Else
Var ice_tab_process_show = "Invisible"
EndIf
Var return = ice_tab_process_show
)
</State>
<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
</Image>
<Image>
<X> 49 </X>
<Y> 117 </Y>
<State>
eval(
If $Sum120201000112020200011202030001 = "Disable" Then
STRCONTAIN "ERR" $12-02-01-0001.TAG tag1_is_disable
STRCONTAIN "ERR" $12-02-02-0001.TAG tag2_is_disable
STRCONTAIN "ERR" $12-02-03-0001.TAG tag3_is_disable
Var return = "Invisible"
If tag1_is_disable = "true" Then
Var return = "Enable"
EndIf
If tag2_is_disable = "true" Then
Var return = "Enable"
EndIf
If tag3_is_disable = "true" Then
Var return = "Enable"
EndIf
Else
Var return = "Invisible"
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
</Image>
<Text>
<X> 84 </X>
<Y> 266 </Y>
<Size> 10 </Size>
<Font> OpunMediumTTF </Font>
<Color> 0xDE794E </Color>
<State> ice_tab_process_show </State>
<Value> ice_show_open </Value>
</Text>
<Text>
<X> 48 </X>
<Y> 116 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> $Sum120201000112020200011202030001 </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; - - -
; ==================> Len = 20

View file

@ -744,7 +744,7 @@
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
CashlessReq SUCCESS
CashlessReq SUCCESS ""
Open "ROOT/taobin_project/xml/page_thankyou.xml"
@ -1033,7 +1033,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CancelCounter = 0
@ -1573,7 +1573,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -1610,12 +1610,11 @@
<Button>
<X> 216 </X>
;<Y> 1176 </Y>
<Y> 1250 </Y>
<Y> 1176 </Y>
<State> PayWithCreditCardState </State>
<Filename> Var( DirImage + "/bn_pay_with_ccard_AUS.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_ccard_AUS.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_pay_with_ccard.png") </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_credit_card.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_credit_card.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_credit_card.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -1639,8 +1638,7 @@ EndIf
<Button>
<X> 439 </X>
;<Y> 1176 </Y>
<Y> 1250 </Y>
<Y> 1176 </Y>
<State> PayWithTaoCreditState </State>
<Filename> Var( DirImage + "/bn_pay_with_credit_AUS.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_credit_AUS.png") </FilenamePress>
@ -1656,7 +1654,7 @@ EndIf
If CancelFlag = 0 Then
If IsCardlessEnable = 1 Then
CashlessReq OFF
CashlessReq OFF ""
Var IsCardlessEnable = 0
EndIf
Var TelephoneNumber = ""
@ -1673,8 +1671,7 @@ EndIf
<Button>
<X> 664 </X>
;<Y> 1176 </Y>
<Y> 1250 </Y>
<Y> 1176 </Y>
<State> PayWithCouponState </State>
<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
@ -1690,7 +1687,7 @@ EndIf
If IsCardlessEnable = 1 Then
CashlessReq OFF
CashlessReq OFF ""
Var IsCardlessEnable = 0
EndIf
@ -1705,13 +1702,13 @@ EndIf
</Button>
<Button>
<X> 552 </X>
<X> 328 </X>
;<X> 552 </X>
<Y> 1399 </Y>
;<State> PayWithFatzebraState </State>
<State> "Invisible" </State>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_qrcode.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_qrcode.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_pay_qrcode.png" </FilenameDisable>
<State> PayWithFatzebraState </State>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_qr_code.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_qr_code.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_qr_code.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -1731,7 +1728,7 @@ EndIf
Var PopupCancelButtonState = "Enable"
If IsCardlessEnable = 1 Then
CashlessReq OFF
CashlessReq OFF ""
Var IsCardlessEnable = 0
EndIf
VendingQR ON
@ -1801,7 +1798,7 @@ EndIf
<Button>
<X> 552 </X>
<Y> 1399 </Y>
<State> "Invisible" </State>
<State> "Enable" </State>
<Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename>
<FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenameDisable>
@ -1812,56 +1809,56 @@ EndIf
</EventClick>
</Button>
<Button>
<X> 328 </X>
<Y> 1399 </Y>
;<Button>
;<X> 328 </X>
;<Y> 1399 </Y>
;<State> PayWithAUBState </State>
<State> "Invisible" </State>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_with_ema.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_with_ema.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_pay_with_ema.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If Timeout < 120 Then
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
If alphaState = "Invisible" Then
Var QR_POPUP = "/img_popup_ema.png"
Var QRCODE99 = ""
Var FlagQROpened = 1
Var alphaState = "Enable"
Var PopupCancelButtonState = "Enable"
Var EMAPopupErrorState = "Invisible"
Var scanresult = ""
Var scanmsg = ""
Var EMAMemberID = ""
If IsCardlessEnable = 1 Then
CashlessReq OFF
Var IsCardlessEnable = 0
EndIf
INITSCANQR
Var CameraState = "Enable"
Var EMAEnterNumberButtonState = "Enable"
Var popup_cancel_button_y = 1390
Refresh
EndIf
EndIf
EndIf
EndIf
</EventClick>
</Button>
;<State> "Invisible" </State>
;<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_with_ema.png" </Filename>
;<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_with_ema.png" </FilenamePress>
;<FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_pay_with_ema.png" </FilenameDisable>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
;
; If Timeout < 120 Then
; If CoinInFlag = 0 Then
; If CancelFlag = 0 Then
; If alphaState = "Invisible" Then
;
; Var QR_POPUP = "/img_popup_ema.png"
; Var QRCODE99 = ""
;
; Var FlagQROpened = 1
; Var alphaState = "Enable"
; Var PopupCancelButtonState = "Enable"
; Var EMAPopupErrorState = "Invisible"
;
; Var scanresult = ""
; Var scanmsg = ""
; Var EMAMemberID = ""
;
; If IsCardlessEnable = 1 Then
; CashlessReq OFF ""
; Var IsCardlessEnable = 0
; EndIf
;
; INITSCANQR
;
; Var CameraState = "Enable"
; Var EMAEnterNumberButtonState = "Enable"
;
; Var popup_cancel_button_y = 1390
;
; Refresh
; EndIf
; EndIf
; EndIf
; EndIf
;
;
;</EventClick>
;</Button>
<Button>
<X> 360 </X>
@ -1894,7 +1891,7 @@ EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -2089,7 +2086,7 @@ EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf

View file

@ -78,6 +78,8 @@
Var PayAmount = PriceDrink
Var LOADING_STATE = "Invisible"
Var AlphaLoadingState = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
; Below original
; On open
@ -221,27 +223,6 @@
Var Seeker.PayWithQR = 0
Var NoGotoMenupage = "false"
If show_eng = "true" Then
Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
Else
Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
EndIf
Var X_CASH = 216
If RoadShow = "true" Then
Var X_CASH = 287
If show_eng = "true" Then
Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
Else
Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
EndIf
EndIf
If GetFreeFromError = 1 Then
Var Seeker.FreeVendingCampaign = 1
CoinVending OFF
@ -373,6 +354,7 @@
Var CreditCardButtonState = "Disable"
Var QRCodeButtonState = "Disable"
Var LOADING_STATE = "Enable"
Var AlphaLoadingState = "Enable"
Var EnablingCreditCard = 1
Var EnablingCountDown = 5
Var RequestCreditCardCountDown = 1
@ -588,6 +570,7 @@
Var QRCODE99 = QRCODE99KBANK
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3"
@ -613,6 +596,7 @@
Var QRCODE99 = QRCODE99KBANK
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
@ -641,6 +625,7 @@
Var QRCODE99 = QRCODE99Shoppy
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
@ -667,6 +652,7 @@
Var QRCODE99 = QRCODE99Shoppy
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
@ -693,6 +679,7 @@
Var QRCODE99 = QRCODE99Shoppy
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
@ -719,6 +706,7 @@
Var QRCODE99 = QRCODE99Shoppy
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
@ -740,6 +728,7 @@
Var QRErrorState = "Invisible"
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
If ViewBill > 0 Then
CoinVending BILLREJECT
@ -773,6 +762,7 @@
If alphaState = "Enable" Then
Var QRErrorState = "Enable"
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
EndIf
EndIf
If ReqPayInfoFlag = 2 Then
@ -780,6 +770,7 @@
If alphaState = "Enable" Then
Var QRErrorState = "Enable"
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
EndIf
EndIf
If ReqPayInfoFlag = 3 Then
@ -787,6 +778,7 @@
If alphaState = "Enable" Then
Var QRErrorState = "Enable"
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
EndIf
EndIf
If ReqPayInfoFlag = 4 Then
@ -794,6 +786,7 @@
If alphaState = "Enable" Then
Var QRErrorState = "Enable"
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
EndIf
EndIf
Else
@ -808,6 +801,7 @@
If alphaState = "Enable" Then
Var QRErrorState = "Enable"
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
EndIf
EndIf
@ -886,6 +880,7 @@
EndIf
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
Var QRErrorState = "Invisible"
EndIf
@ -1151,6 +1146,7 @@
Var CreditCardButtonState = "Enable"
Var QRCodeButtonState = "Enable"
Var LOADING_STATE = "Invisible"
Var AlphaLoadingState = "Invisible"
Var FirstTimeDelayEnableButton = 0
Else
Var FirstTimeDelayEnableButtonCountDown = FirstTimeDelayEnableButtonCountDown - 1
@ -1185,6 +1181,7 @@
Var VendingCashless = "-"
If FirstTimeDelayEnableButton = 0 Then
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
EndIf
Var EnablingCountDown = 0
Var EnablingCreditCard = 0
@ -1217,9 +1214,10 @@
Var Timeout = 0
Var UserChoosePayment = "QRCode"
Var QRErrorState = "Invisible"
Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
Var QR_POPUP = CountryRootPath + "/image/page_payment/img_use_qr_code.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
Var EnablingQRCode = 0
Var EnablingCountDown = 0
Else
@ -1256,6 +1254,7 @@
If CashlessClosingPopupCountDown = 0 Then
Var alphaState = "Invisible"
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
Var CashlessClosingPopup = 0
Else
Var CashlessClosingPopupCountDown = CashlessClosingPopupCountDown - 1
@ -1673,12 +1672,12 @@
;</Button>
<Button>
<X> X_CASH </X>
<X> 327 </X>
<Y> TopRowY </Y>
<State> CreditCardButtonState </State>
<Filename> Var( CountryRootPath + "/image/page_payment/bn_pay_with_ccard.png") </Filename>
<FilenamePress> Var( CountryRootPath + "/image/page_payment/bd_pay_with_ccard.png") </FilenamePress>
<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bd_pay_with_ccard.png") </FilenameDisable>
<Filename> Var( CountryRootPath + "/image/page_payment/bn_credit_card.png") </Filename>
<FilenamePress> Var( CountryRootPath + "/image/page_payment/bp_credit_card.png") </FilenamePress>
<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bd_credit_card.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -1700,17 +1699,20 @@ If alphaState = "Invisible" Then
Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
If EnablingCreditCard = 1 Then
Var LOADING_STATE = "Enable"
Var AlphaPopupLoadingState = "Enable"
EndIf
Else
If UserChoosePayment = "QRCode" Then
CashlessReq VENDINGCANCEL ""
Var LOADING_STATE = "Enable"
Var AlphaPopupLoadingState = "Enable"
Var SwitchingQRCodeToCreditCard = 1
Var SwitchingContDown = 1
Else
Coin CARD
Var UserChoosePayment = "CreditCard"
Var LOADING_STATE = "Enable"
Var AlphaPopupLoadingState = "Enable"
Var EnablingCreditCard = 1
Var EnablingCountDown = 5
Var RequestCreditCardCountDown = 1
@ -1724,12 +1726,12 @@ EndIf
</Button>
<Button>
<X> 439 </X>
<X> 551 </X>
<Y> TopRowY </Y>
<State> QRCodeButtonState </State>
<Filename> Var( CountryRootPath + "/image/page_payment/bn_pay_with_qr_code.png") </Filename>
<FilenamePress> Var( CountryRootPath + "/image/page_payment/bp_pay_with_qr_code.png") </FilenamePress>
<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bd_pay_with_qr_code.png") </FilenameDisable>
<Filename> Var( CountryRootPath + "/image/page_payment/bn_qr_code.png") </Filename>
<FilenamePress> Var( CountryRootPath + "/image/page_payment/bp_qr_code.png") </FilenamePress>
<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bd_qr_code.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -1744,6 +1746,7 @@ If alphaState = "Invisible" Then
Var QRErrorState = "Invisible"
Var QR_POPUP = CountryRootPath + "/image/page_payment/img_use_qr_code.png"
Var LOADING_STATE = "Enable"
Var AlphaPopupLoadingState = "Enable"
Var alphaState = "Enable"
If UserChoosePayment = "CreditCard" Then
@ -1753,6 +1756,7 @@ If alphaState = "Invisible" Then
Else
Coin CARD
Var LOADING_STATE = "Enable"
Var AlphaPopupLoadingState = "Enable"
Var EnablingQRCode = 1
Var EnablingCountDown = 5
Var RequestQRCodeCountDown = 1
@ -1901,20 +1905,10 @@ eval(
<Image>
<X> 267 </X>
<Y> 1065 </Y>
<State> LOADING_STATE </State>
<Filename> Var( DirImage + "/loadingText.png" )</Filename>
</Image>
<Button>
<X> 438 </X>
<Y> 1345 </Y>
<X> 766 </X>
<Y> 777 </Y>
<State>
eval(
If alphaState = "Enable" Then
@ -1928,9 +1922,8 @@ eval(
EndIf
)
</State>
<Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
<FilenameDisable> Var( DirImage + "/bp_cancel.png" )</FilenameDisable>
<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
<Filename> "ROOT/taobin_project/image/page_payment/Exit.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_payment/Exit.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -1940,6 +1933,7 @@ eval(
If CashlessPayFlag = 1 Then
CashlessReq VENDINGCANCEL ""
Var LOADING_STATE = "Enable"
Var AlphaPopupLoadingState = "Enable"
Var CashlessClosingPopup = 1
Var CashlessClosingPopupCountDown = 1
Var UserChoosePayment = ""
@ -1948,6 +1942,7 @@ eval(
Else
Var QRCODE99 = ""
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
EndIf
@ -2464,23 +2459,41 @@ eval(
<Filename> Var( DirImage + "/CancelOrder.png" ) </Filename>
</Image>
;<GIF>
;<X> 493 </X>
;<Y> 960 </Y>
;<Width> 94 </Width>
;<Height> 94 </Height>
;<State> cancelState </State>
;<Filename> Var( DirImage + "/loading.gif" )</Filename>
;</GIF>
;<GIF>
;<X> 493 </X>
;<Y> 1195 </Y>
;<Width> 94 </Width>
;<Height> 94 </Height>
;<State> AdultState2 </State>
;<Filename> Var( DirImage + "/loading.gif" )</Filename>
;</GIF>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<State> AlphaLoadingState </State>
<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
</Image>
<Image>
<X> 249 </X>
<Y> 748 </Y>
<State> AlphaPopupLoadingState </State>
<Filename> "ROOT/taobin_project/image/page_payment/alpha_popup.png" </Filename>
</Image>
<Text>
<X> 267 </X>
<Y> 1065 </Y>
<Width> 516 </Width>
<Height> 75 </Height>
<Size> 48 </Size>
<Font> RobotoBold </Font>
<Color> eval(
If AlphaLoadingState = "Enable" Then
Var return = 0xFFFFFF
Else
Var return = 0x5A5A5A
EndIf
)
</Color>
<Align> Center </Align>
<State> LOADING_STATE </State>
<Value> "Just Moment, Please" </Value>
;<Filename> Var( DirImage + "/loadingText.png" )</Filename>
</Text>
<GIF>
<X> 493 </X>

View file

@ -843,7 +843,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CancelCounter = 0
@ -1310,7 +1310,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -1621,7 +1621,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -1712,11 +1712,11 @@
;CoinVending ON
;VendingQR OFF
CashlessReq OFF
CashlessReq OFF ""
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf

View file

@ -709,12 +709,12 @@
Var LOADING_STATE = "Invisible"
EndIf
CashlessReq OFF
CashlessReq OFF ""
Coin CARDOFF
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -929,7 +929,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CancelCounter = 0
@ -1371,7 +1371,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Coin CARDOFF
@ -1804,12 +1804,12 @@ EndIf
Var CancelNumber = 12
EndIf
CashlessReq OFF
CashlessReq OFF ""
Coin CARDOFF
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
EndIf
@ -1909,12 +1909,12 @@ EndIf
Var alphaStateQR = "Invisible"
Var QRCODE99 = ""
CashlessReq OFF
CashlessReq OFF ""
Coin CARDOFF
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf

View file

@ -30,7 +30,7 @@
Var PreScaleCanculate = 100
DEBUGVAR VendingCashless
CashlessReq FAIL
CashlessReq FAIL ""
Var CashlessPayFlag = 0
@ -738,7 +738,7 @@
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
CashlessReq SUCCESS
CashlessReq SUCCESS ""
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
@ -859,7 +859,7 @@
If CancelFlag = 1 Then
DEBUGVAR CancelFlag
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -1065,19 +1065,19 @@
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CancelCounter = 0
@ -1542,18 +1542,18 @@
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
@ -1771,18 +1771,18 @@ EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -1873,24 +1873,24 @@ EndIf
;CoinVending ON
;VendingQR OFF
CashlessReq OFF
CashlessReq OFF ""
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
@ -1984,18 +1984,18 @@ EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -2053,18 +2053,18 @@ EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -2107,18 +2107,18 @@ EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
@ -2233,19 +2233,19 @@ EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
DEBUGVAR UserChoosePayment
@ -2320,18 +2320,18 @@ EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
DEBUGVAR UserChoosePayment

View file

@ -746,7 +746,7 @@
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
CashlessReq SUCCESS
CashlessReq SUCCESS ""
Open "ROOT/taobin_project/xml/page_thankyou.xml"
@ -754,8 +754,8 @@
If VendingCashless = "END" Then
If ReqPayInfoFromCashOther = 2 Then
DEBUGVAR "CashlessReq OFF"
CashlessReq OFF
DEBUGVAR "CashlessReq OFF """
CashlessReq OFF ""
EndIf
EndIf
@ -996,7 +996,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CancelCounter = 0
@ -1446,7 +1446,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CancelContinue = 0
@ -1670,7 +1670,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -1770,7 +1770,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CancelContinue = 1

View file

@ -560,6 +560,10 @@
Var EWalletButtonState = "Disable"
Var ThirdPartyCodeButtonState = "Disable"
Var X_CASH1 = 216 - 113
Var X_CASH2 = 439 - 113
Var X_CASH3 = 664 - 113
Var PayOfflineMode = 1
Var ShowNetworkProblem = "Enable"
@ -1870,8 +1874,19 @@
EndIf
DEBUGVAR VendingCashless
If VendingCashless = "OK" Then
DEBUGVAR CashlessCode
If KBankCashlessMachine = 1 Then
Var Seeker.CashlessVendingTrackNumber = VendingTrackNumber
DEBUGVAR VendingTrackNumber
DEBUGVAR Var Seeker.CashlessVendingTrackNumber
EndIf
Var Timeout = 0
Var QRErrorState = "Invisible"
@ -1924,7 +1939,12 @@
If CoinInOK = 1 Then
Else
Var Timeout = 0
If KBankCashlessMachine = 1 Then
; popup will close after 30 second
Var Timeout = 90
Else
Var Timeout = 0
EndIf
EndIf
;Var QRErrorFlag = 1
@ -1948,23 +1968,43 @@
GenHashWithTimeStamp CreditCardRef
DEBUGVAR VendingCashless
If VendingCashless = "READY" Then
Var QRCODE99 = ""
If CoinInOK = 1 Then
If KBankCashlessMachine = 1 Then
If VendingCashless = "READY" Then
Var QRCODE99 = ""
If CoinInOK = 1 Then
Else
Var Timeout = 0
Else
Var Timeout = 0
EndIf
Var QRErrorState = "Invisible"
Var VendingCashless = "-"
Var ServiceCharge = 3
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
Var RemainAmountX = RemainAmountX + ServiceCharge
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
EndIf
Else
If VendingCashless = "READY" Then
Var QRCODE99 = ""
If CoinInOK = 1 Then
Var QRErrorState = "Invisible"
Var QR_POPUP = "/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
Else
Var Timeout = 0
EndIf
Var QRErrorState = "Invisible"
Var QR_POPUP = "/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
EndIf
EndIf
Refresh
</EventCashlessCard>
@ -2144,7 +2184,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
EndIf
Var CancelCounter = 0
@ -2295,13 +2335,13 @@
EndIf
If ReqPayInfoFromCashOther = 2 Then
DEBUGVAR "CashlessReq OFF by user"
CashlessReq OFF
DEBUGVAR "CashlessReq OFF "" by user"
CashlessReq OFF Seeker.CashlessVendingTrackNumber
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
EndIf
EndIf
EndIf
@ -2687,7 +2727,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
EndIf
EndIf
@ -2949,9 +2989,14 @@
If alphaState = "Invisible" Then
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
Var QR_POPUP = "/img_popup8.png"
If KBankCashlessMachine = 1 Then
Var QR_POPUP = "/img_popup8_with_service_charge.png"
Var cancelButtonQRPopupState = "Invisible"
Else
Var QR_POPUP = "/img_popup8.png"
Var cancelButtonQRPopupState = "Enable"
EndIf
Var alphaState = "Enable"
Var cancelButtonQRPopupState = "Enable"
Coin CARD
Var ReqPayInfoFromCashOther = 2
EndIf
@ -3047,7 +3092,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL Seeker.CashlessVendingTrackNumber
EndIf
EndIf

View file

@ -24,7 +24,8 @@
STRCONTAIN "y20IDCard-Liveness" XMLProfileFromJson Y20IDCARDLIVE_ENABLE
STRCONTAIN "y20IDCard" XMLProfileFromJson Y20IDCARD_ENABLE
STRCONTAIN "SugarBreak" XMLProfileFromJson SugarBreakEnable
STRCONTAIN "SugarBreak" XMLProfileFromJson SugarBreakJsonEnable
STRCONTAIN "SugarBreak" XMLProfile SugarBreakEnable
STRCONTAIN "MyanmarLang" XMLProfile MyanmarLangEnable
@ -78,11 +79,14 @@
If SugarBreakEnable = "true" Then
Var NoSugarStepRight2 = "true"
Else
Var NoSugarStepRight2 = "false"
If SugarBreakJsonEnable = "true" Then
Var NoSugarStepRight2 = "true"
Else
Var NoSugarStepRight2 = "false"
EndIf
EndIf
; flag for apply all menu.
Var price_apply = 0