diff --git a/inter/gbr/image/payment_cash/bd_pay_with_Staff_Pass.png b/inter/gbr/image/payment_cash/bd_pay_with_Staff_Pass.png new file mode 100644 index 00000000..00c4daac Binary files /dev/null and b/inter/gbr/image/payment_cash/bd_pay_with_Staff_Pass.png differ diff --git a/inter/gbr/image/payment_cash/bd_staff_pass_number.png b/inter/gbr/image/payment_cash/bd_staff_pass_number.png new file mode 100644 index 00000000..72d24be3 Binary files /dev/null and b/inter/gbr/image/payment_cash/bd_staff_pass_number.png differ diff --git a/inter/gbr/image/payment_cash/bn_pay_with_Staff_Pass.png b/inter/gbr/image/payment_cash/bn_pay_with_Staff_Pass.png new file mode 100644 index 00000000..05a1956c Binary files /dev/null and b/inter/gbr/image/payment_cash/bn_pay_with_Staff_Pass.png differ diff --git a/inter/gbr/image/payment_cash/bn_staff_pass_number.png b/inter/gbr/image/payment_cash/bn_staff_pass_number.png new file mode 100644 index 00000000..8f38b495 Binary files /dev/null and b/inter/gbr/image/payment_cash/bn_staff_pass_number.png differ diff --git a/inter/gbr/image/payment_cash/bp_pay_with_Staff_Pass.png b/inter/gbr/image/payment_cash/bp_pay_with_Staff_Pass.png new file mode 100644 index 00000000..1e345289 Binary files /dev/null and b/inter/gbr/image/payment_cash/bp_pay_with_Staff_Pass.png differ diff --git a/inter/gbr/image/payment_cash/bp_staff_pass_number.png b/inter/gbr/image/payment_cash/bp_staff_pass_number.png new file mode 100644 index 00000000..025902c4 Binary files /dev/null and b/inter/gbr/image/payment_cash/bp_staff_pass_number.png differ diff --git a/inter/gbr/image/payment_cash/enter_ema_number_text.png b/inter/gbr/image/payment_cash/enter_ema_number_text.png index 511d4ecf..b4f5a87f 100644 Binary files a/inter/gbr/image/payment_cash/enter_ema_number_text.png and b/inter/gbr/image/payment_cash/enter_ema_number_text.png differ diff --git a/inter/gbr/xml/page_catalog_group_coffee.lxml b/inter/gbr/xml/page_catalog_group_coffee.lxml index de2c2efc..41c4dc18 100644 --- a/inter/gbr/xml/page_catalog_group_coffee.lxml +++ b/inter/gbr/xml/page_catalog_group_coffee.lxml @@ -39,6 +39,1102 @@ Var block_index_move = 0 ;dummy_layout.inc + ; ==================> Len = 3 + ; 55-01-01-0001 - - + + 33 + 22 + 225 + 296 + Flag( 55-01-01-0001.Button,$Sum5501010001) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + ESPRESSO + เอสเพรสโซ่ + ESPRESSO + เอสเพรสโซ่ + + เอสเพรสโซ่ + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Espresso (30 ml) + กาแฟ (30 ml) + Espresso (30 ml) + กาแฟ (30 ml) + + กาแฟ (30 ml) + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $55-01-01-0001.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $55-01-01-0001.Button + StringFmt( $55-01-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum5501010001 = "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 + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5501010001 = "Disable" Then + STRCONTAIN "ERR" $55-01-01-0001.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.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 + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5501010001 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; 55-21-01-0001 - - + + 33 + 22 + 225 + 296 + Flag( 55-21-01-0001.Button,$Sum5521010001) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + ESPRESSO + เอสเพรสโซ่ + ESPRESSO + เอสเพรสโซ่ + + เอสเพรสโซ่ + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Espresso (30 ml) + กาแฟ (30 ml) + Espresso (30 ml) + กาแฟ (30 ml) + + กาแฟ (30 ml) + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $55-21-01-0001.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $55-21-01-0001.Button + StringFmt( $55-21-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum5521010001 = "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 + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5521010001 = "Disable" Then + STRCONTAIN "ERR" $55-21-01-0001.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.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 + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5521010001 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; 55-11-01-0001 - - + + 33 + 22 + 225 + 296 + Flag( 55-11-01-0001.Button,$Sum5511010001) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + DOUBLE \nESPRESSO + ดับเบิลเอสเพรสโซ่ + DOUBLE \nESPRESSO + ดับเบิลเอสเพรสโซ่ + + ดับเบิลเอสเพรสโซ่ + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Espresso (60 ml) + กาแฟ (60 ml) + Espresso (60 ml) + กาแฟ (60 ml) + + กาแฟ (60 ml) + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $55-11-01-0001.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $55-11-01-0001.Button + StringFmt( $55-11-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum5511010001 = "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 + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5511010001 = "Disable" Then + STRCONTAIN "ERR" $55-11-01-0001.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.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 + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5511010001 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; 55-31-01-0001 - - + + 33 + 22 + 225 + 296 + Flag( 55-31-01-0001.Button,$Sum5531010001) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + DOUBLE \nESPRESSO + ดับเบิลเอสเพรสโซ่ + DOUBLE \nESPRESSO + ดับเบิลเอสเพรสโซ่ + + ดับเบิลเอสเพรสโซ่ + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Espresso (60 ml) + กาแฟ (60 ml) + Espresso (60 ml) + กาแฟ (60 ml) + + กาแฟ (60 ml) + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $55-31-01-0001.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $55-31-01-0001.Button + StringFmt( $55-31-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum5531010001 = "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 + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5531010001 = "Disable" Then + STRCONTAIN "ERR" $55-31-01-0001.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.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 + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5531010001 + + 000013 + + center-vertical-horizontal + + ; ==================> Len = 3 ; 55-01-01-0003 55-01-02-0001 - diff --git a/inter/gbr/xml/page_payment_with_ema.lxml b/inter/gbr/xml/page_payment_with_ukb.lxml similarity index 80% rename from inter/gbr/xml/page_payment_with_ema.lxml rename to inter/gbr/xml/page_payment_with_ukb.lxml index c379188f..f9f5d3c2 100644 --- a/inter/gbr/xml/page_payment_with_ema.lxml +++ b/inter/gbr/xml/page_payment_with_ukb.lxml @@ -9,7 +9,7 @@ Var Timeout = 0 - Var EMAMemberID = "" + Var UKBMemberID = "" Var Tel_Confirm_State = "Invisible" @@ -20,7 +20,7 @@ Var Timeout = Timeout + 1 If Timeout > 30 Then SAVELOG "page_payment_with_ema > timeout" - Var EMAMemberID = "" + Var UKBMemberID = "" Open "ROOT/taobin_project/xml/page_payment_cash-GBR.xml" EndIf @@ -39,7 +39,7 @@ - 302 + 286 710 "ROOT/taobin_project/inter/gbr/image/payment_cash/enter_ema_number_text.png" @@ -66,7 +66,7 @@ 48 0x000000 center-vertical-horizontal - EMAMemberID + UKBMemberID @@ -79,14 +79,14 @@ SoundVolume Var Timeout = 0 - Var EMAMemberID = EMAMemberID + "1" - Trim EMAMemberID MAX_EMA_CODE + Var UKBMemberID = UKBMemberID + "1" + Trim UKBMemberID MAX_UKB_CODE TimerReset Refresh - StrLen EMAMemberID IDNumLen - If IDNumLen >= MAX_EMA_CODE Then + StrLen UKBMemberID IDNumLen + If IDNumLen >= MAX_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -101,14 +101,14 @@ SoundVolume Var Timeout = 0 - Var EMAMemberID = EMAMemberID + "2" - Trim EMAMemberID MAX_EMA_CODE + Var UKBMemberID = UKBMemberID + "2" + Trim UKBMemberID MAX_UKB_CODE TimerReset Refresh - StrLen EMAMemberID IDNumLen - If IDNumLen >= MAX_EMA_CODE Then + StrLen UKBMemberID IDNumLen + If IDNumLen >= MAX_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -123,14 +123,14 @@ SoundVolume Var Timeout = 0 - Var EMAMemberID = EMAMemberID + "3" - Trim EMAMemberID MAX_EMA_CODE + Var UKBMemberID = UKBMemberID + "3" + Trim UKBMemberID MAX_UKB_CODE TimerReset Refresh - StrLen EMAMemberID IDNumLen - If IDNumLen >= MAX_EMA_CODE Then + StrLen UKBMemberID IDNumLen + If IDNumLen >= MAX_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -145,14 +145,14 @@ SoundVolume Var Timeout = 0 - Var EMAMemberID = EMAMemberID + "4" - Trim EMAMemberID MAX_EMA_CODE + Var UKBMemberID = UKBMemberID + "4" + Trim UKBMemberID MAX_UKB_CODE TimerReset Refresh - StrLen EMAMemberID IDNumLen - If IDNumLen >= MAX_EMA_CODE Then + StrLen UKBMemberID IDNumLen + If IDNumLen >= MAX_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -167,14 +167,14 @@ SoundVolume Var Timeout = 0 - Var EMAMemberID = EMAMemberID + "5" - Trim EMAMemberID MAX_EMA_CODE + Var UKBMemberID = UKBMemberID + "5" + Trim UKBMemberID MAX_UKB_CODE TimerReset Refresh - StrLen EMAMemberID IDNumLen - If IDNumLen >= MAX_EMA_CODE Then + StrLen UKBMemberID IDNumLen + If IDNumLen >= MAX_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -189,14 +189,14 @@ SoundVolume Var Timeout = 0 - Var EMAMemberID = EMAMemberID + "6" - Trim EMAMemberID MAX_EMA_CODE + Var UKBMemberID = UKBMemberID + "6" + Trim UKBMemberID MAX_UKB_CODE TimerReset Refresh - StrLen EMAMemberID IDNumLen - If IDNumLen >= MAX_EMA_CODE Then + StrLen UKBMemberID IDNumLen + If IDNumLen >= MAX_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -211,14 +211,14 @@ SoundVolume Var Timeout = 0 - Var EMAMemberID = EMAMemberID + "7" - Trim EMAMemberID MAX_EMA_CODE + Var UKBMemberID = UKBMemberID + "7" + Trim UKBMemberID MAX_UKB_CODE TimerReset Refresh - StrLen EMAMemberID IDNumLen - If IDNumLen >= MAX_EMA_CODE Then + StrLen UKBMemberID IDNumLen + If IDNumLen >= MAX_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -233,14 +233,14 @@ SoundVolume Var Timeout = 0 - Var EMAMemberID = EMAMemberID + "8" - Trim EMAMemberID MAX_EMA_CODE + Var UKBMemberID = UKBMemberID + "8" + Trim UKBMemberID MAX_UKB_CODE TimerReset Refresh - StrLen EMAMemberID IDNumLen - If IDNumLen >= MAX_EMA_CODE Then + StrLen UKBMemberID IDNumLen + If IDNumLen >= MAX_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -255,14 +255,14 @@ SoundVolume Var Timeout = 0 - Var EMAMemberID = EMAMemberID + "9" - Trim EMAMemberID MAX_EMA_CODE + Var UKBMemberID = UKBMemberID + "9" + Trim UKBMemberID MAX_UKB_CODE TimerReset Refresh - StrLen EMAMemberID IDNumLen - If IDNumLen >= MAX_EMA_CODE Then + StrLen UKBMemberID IDNumLen + If IDNumLen >= MAX_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -277,14 +277,14 @@ SoundVolume Var Timeout = 0 - Var EMAMemberID = EMAMemberID + "0" - Trim EMAMemberID MAX_EMA_CODE + Var UKBMemberID = UKBMemberID + "0" + Trim UKBMemberID MAX_UKB_CODE TimerReset Refresh - StrLen EMAMemberID IDNumLen - If IDNumLen >= MAX_EMA_CODE Then + StrLen UKBMemberID IDNumLen + If IDNumLen >= MAX_UKB_CODE Then Var Tel_Confirm_State = "Enable" EndIf @@ -300,7 +300,7 @@ Var Timeout = 0 - Trim EMAMemberID -1 + Trim UKBMemberID -1 Var Tel_Confirm_State = "Invisible" TimerReset @@ -315,7 +315,7 @@ "ROOT/taobin_project/image/collectiing_en/bn_back.png" "ROOT/taobin_project/image/collectiing_en/bn_back.png" - Var EMAMemberID = "" + Var UKBMemberID = "" Open "ROOT/taobin_project/xml/page_payment_cash.xml" diff --git a/xml/page_payment_cash-GBR.xml b/xml/page_payment_cash-GBR.xml index e2561749..8403dea2 100644 --- a/xml/page_payment_cash-GBR.xml +++ b/xml/page_payment_cash-GBR.xml @@ -16,7 +16,7 @@ ;EndIf Var ErrorCause = "" - Var MAX_EMA_CODE = 5 + Var MAX_UKB_CODE = 5 Var PreScaleCanculate = 100 @@ -409,7 +409,7 @@ EndIf - If EMAMemberID = "" Then + If UKBMemberID = "" Then Else Var CameraState = "Invisible" @@ -445,7 +445,7 @@ Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "UKB:2:" - Var ECommerceQR = ECommerceQR + EMAMemberID + Var ECommerceQR = ECommerceQR + UKBMemberID Var ECommerceQR = ECommerceQR + "/" If Seeker.IntVendingCampaign > 0 Then @@ -1455,7 +1455,7 @@ If textLen = MAX_EMA_CODE Then - Var EMAMemberID = scanmsg + Var UKBMemberID = scanmsg If Timeout < 120 Then If CoinInFlag = 0 Then @@ -1486,7 +1486,7 @@ Var ECommerceQR = ECommerceQR + SelectDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "UKB:2:" - Var ECommerceQR = ECommerceQR + EMAMemberID + Var ECommerceQR = ECommerceQR + UKBMemberID Var ECommerceQR = ECommerceQR + "/" If Seeker.IntVendingCampaign > 0 Then @@ -1829,9 +1829,9 @@ EndIf 328 1399 PayWithUKBState - "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_pay_with_ema.png" - "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_pay_with_ema.png" - "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_pay_with_ema.png" + "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_pay_with_Staff_Pass.png" + "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_pay_with_Staff_Pass.png" + "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_pay_with_Staff_Pass.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1851,7 +1851,7 @@ EndIf Var scanresult = "" Var scanmsg = "" - Var EMAMemberID = "" + Var UKBMemberID = "" If IsCardlessEnable = 1 Then CashlessReq OFF "" @@ -1989,11 +1989,11 @@ EndIf 398 1275 EMAEnterNumberButtonState - "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_ema_enter_code.png" - "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_ema_enter_code.png" - "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_ema_enter_code.png" + "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_staff_pass_number.png" + "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_staff_pass_number.png" + "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_staff_pass_number.png" - Open "ROOT/taobin_project/inter/gbr/xml/page_payment_with_ema.lxml" + Open "ROOT/taobin_project/inter/gbr/xml/page_payment_with_ukb.lxml" @@ -2055,7 +2055,7 @@ EndIf Var scanresult = "" Var scanmsg = "" - Var EMAMemberID = "" + Var UKBMemberID = "" INITSCANQR Var CameraState = "Enable" @@ -2091,7 +2091,7 @@ EndIf Var EMAEnterNumberButtonState = "Invisible" Var EMAPopupErrorState = "Invisible" Var QRCODE99 = "" - Var EMAMemberID = "" + Var UKBMemberID = "" Var popup_cancel_button_y = 1345