diff --git a/image/collectiing/bd_pay_with_codeKBANK.png b/image/collectiing/bd_pay_with_codeKBANK.png new file mode 100644 index 00000000..736a162a Binary files /dev/null and b/image/collectiing/bd_pay_with_codeKBANK.png differ diff --git a/image/collectiing/bn_pay_with_codeKBANK.png b/image/collectiing/bn_pay_with_codeKBANK.png new file mode 100644 index 00000000..0dadcd20 Binary files /dev/null and b/image/collectiing/bn_pay_with_codeKBANK.png differ diff --git a/image/collectiing/bp_pay_with_codeKBANK.png b/image/collectiing/bp_pay_with_codeKBANK.png new file mode 100644 index 00000000..6d1cdc66 Binary files /dev/null and b/image/collectiing/bp_pay_with_codeKBANK.png differ diff --git a/image/collectiing/img_popupKBANK.png b/image/collectiing/img_popupKBANK.png new file mode 100644 index 00000000..4e1e6918 Binary files /dev/null and b/image/collectiing/img_popupKBANK.png differ diff --git a/image/collectiing/text_39.png b/image/collectiing/text_39.png new file mode 100644 index 00000000..e76ad284 Binary files /dev/null and b/image/collectiing/text_39.png differ diff --git a/image/collectiing_en/bd_pay_with_codeKBANK.png b/image/collectiing_en/bd_pay_with_codeKBANK.png new file mode 100644 index 00000000..736a162a Binary files /dev/null and b/image/collectiing_en/bd_pay_with_codeKBANK.png differ diff --git a/image/collectiing_en/bn_pay_with_codeKBANK.png b/image/collectiing_en/bn_pay_with_codeKBANK.png new file mode 100644 index 00000000..0dadcd20 Binary files /dev/null and b/image/collectiing_en/bn_pay_with_codeKBANK.png differ diff --git a/image/collectiing_en/bp_pay_with_codeKBANK.png b/image/collectiing_en/bp_pay_with_codeKBANK.png new file mode 100644 index 00000000..6d1cdc66 Binary files /dev/null and b/image/collectiing_en/bp_pay_with_codeKBANK.png differ diff --git a/image/collectiing_en/img_popupKBANK.png b/image/collectiing_en/img_popupKBANK.png new file mode 100644 index 00000000..4e1e6918 Binary files /dev/null and b/image/collectiing_en/img_popupKBANK.png differ diff --git a/image/collectiing_en/text_39.png b/image/collectiing_en/text_39.png new file mode 100644 index 00000000..5fdc9a71 Binary files /dev/null and b/image/collectiing_en/text_39.png differ diff --git a/sound_eng/Dont_forget_your_changes_below.mp3 b/sound_eng/Dont_forget_your_changes_below.mp3 new file mode 100755 index 00000000..637e849d Binary files /dev/null and b/sound_eng/Dont_forget_your_changes_below.mp3 differ diff --git a/sound_eng/Get_free_drink_faster.mp3 b/sound_eng/Get_free_drink_faster.mp3 new file mode 100755 index 00000000..8aeb6476 Binary files /dev/null and b/sound_eng/Get_free_drink_faster.mp3 differ diff --git a/sound_eng/Please_confirm_your_pin_again.mp3 b/sound_eng/Please_confirm_your_pin_again.mp3 new file mode 100755 index 00000000..15a3ce3a Binary files /dev/null and b/sound_eng/Please_confirm_your_pin_again.mp3 differ diff --git a/sound_eng/Please_create_new_pin.mp3 b/sound_eng/Please_create_new_pin.mp3 new file mode 100755 index 00000000..fd00a7c4 Binary files /dev/null and b/sound_eng/Please_create_new_pin.mp3 differ diff --git a/sound_eng/Please_enter_your_4_digits_pin.mp3 b/sound_eng/Please_enter_your_4_digits_pin.mp3 new file mode 100755 index 00000000..827524a0 Binary files /dev/null and b/sound_eng/Please_enter_your_4_digits_pin.mp3 differ diff --git a/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3 b/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3 new file mode 100755 index 00000000..9ecdbec3 Binary files /dev/null and b/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3 differ diff --git a/sound_eng/Please_enter_your_phone_for_credits.mp3 b/sound_eng/Please_enter_your_phone_for_credits.mp3 new file mode 100755 index 00000000..139106bd Binary files /dev/null and b/sound_eng/Please_enter_your_phone_for_credits.mp3 differ diff --git a/sound_eng/Please_press_accept_consent.mp3 b/sound_eng/Please_press_accept_consent.mp3 new file mode 100755 index 00000000..14ca09fc Binary files /dev/null and b/sound_eng/Please_press_accept_consent.mp3 differ diff --git a/sound_eng/Please_scan_to_pay_via_e-wallet.mp3 b/sound_eng/Please_scan_to_pay_via_e-wallet.mp3 new file mode 100755 index 00000000..bd7b4706 Binary files /dev/null and b/sound_eng/Please_scan_to_pay_via_e-wallet.mp3 differ diff --git a/sound_eng/Please_scan_to_pay_via_mobile.mp3 b/sound_eng/Please_scan_to_pay_via_mobile.mp3 new file mode 100755 index 00000000..00fffb22 Binary files /dev/null and b/sound_eng/Please_scan_to_pay_via_mobile.mp3 differ diff --git a/sound_eng/Press_next_to_receive_code_via_SMS.mp3 b/sound_eng/Press_next_to_receive_code_via_SMS.mp3 new file mode 100755 index 00000000..3559a0cf Binary files /dev/null and b/sound_eng/Press_next_to_receive_code_via_SMS.mp3 differ diff --git a/sound_eng/The_change_has_run_out.mp3 b/sound_eng/The_change_has_run_out.mp3 new file mode 100755 index 00000000..05b0aa08 Binary files /dev/null and b/sound_eng/The_change_has_run_out.mp3 differ diff --git a/sound_eng/You_mode_it.mp3 b/sound_eng/You_mode_it.mp3 new file mode 100755 index 00000000..6deb7e1d Binary files /dev/null and b/sound_eng/You_mode_it.mp3 differ diff --git a/sound_eng/Your_credit_balance_not_enough.mp3 b/sound_eng/Your_credit_balance_not_enough.mp3 new file mode 100755 index 00000000..58f6b961 Binary files /dev/null and b/sound_eng/Your_credit_balance_not_enough.mp3 differ diff --git a/sound_eng/keep_your_change_credits_or_receive.mp3 b/sound_eng/keep_your_change_credits_or_receive.mp3 new file mode 100755 index 00000000..b56722d4 Binary files /dev/null and b/sound_eng/keep_your_change_credits_or_receive.mp3 differ diff --git a/sound_thai/Dont_forget_your_changes_below.mp3 b/sound_thai/Dont_forget_your_changes_below.mp3 new file mode 100755 index 00000000..1bb18dde Binary files /dev/null and b/sound_thai/Dont_forget_your_changes_below.mp3 differ diff --git a/sound_thai/Get_free_drink_faster.mp3 b/sound_thai/Get_free_drink_faster.mp3 new file mode 100755 index 00000000..09c22bb0 Binary files /dev/null and b/sound_thai/Get_free_drink_faster.mp3 differ diff --git a/sound_thai/Please_confirm_your_pin_again.mp3 b/sound_thai/Please_confirm_your_pin_again.mp3 new file mode 100755 index 00000000..3f3f3eed Binary files /dev/null and b/sound_thai/Please_confirm_your_pin_again.mp3 differ diff --git a/sound_thai/Please_create_new_pin.mp3 b/sound_thai/Please_create_new_pin.mp3 new file mode 100755 index 00000000..9941cbce Binary files /dev/null and b/sound_thai/Please_create_new_pin.mp3 differ diff --git a/sound_thai/Please_enter_your_4_digits_pin.mp3 b/sound_thai/Please_enter_your_4_digits_pin.mp3 new file mode 100755 index 00000000..a5c5028e Binary files /dev/null and b/sound_thai/Please_enter_your_4_digits_pin.mp3 differ diff --git a/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3 b/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3 new file mode 100755 index 00000000..ba4262cb Binary files /dev/null and b/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3 differ diff --git a/sound_thai/Please_enter_your_phone_for_credits.mp3 b/sound_thai/Please_enter_your_phone_for_credits.mp3 new file mode 100755 index 00000000..1a6bb601 Binary files /dev/null and b/sound_thai/Please_enter_your_phone_for_credits.mp3 differ diff --git a/sound_thai/Please_press_accept_consent.mp3 b/sound_thai/Please_press_accept_consent.mp3 new file mode 100755 index 00000000..b312e95f Binary files /dev/null and b/sound_thai/Please_press_accept_consent.mp3 differ diff --git a/sound_thai/Please_scan_to_pay_via_e-wallet.mp3 b/sound_thai/Please_scan_to_pay_via_e-wallet.mp3 new file mode 100755 index 00000000..55ebdcfe Binary files /dev/null and b/sound_thai/Please_scan_to_pay_via_e-wallet.mp3 differ diff --git a/sound_thai/Please_scan_to_pay_via_mobile.mp3 b/sound_thai/Please_scan_to_pay_via_mobile.mp3 new file mode 100755 index 00000000..859783c3 Binary files /dev/null and b/sound_thai/Please_scan_to_pay_via_mobile.mp3 differ diff --git a/sound_thai/Press_next_to_receive_code_via_SMS.mp3 b/sound_thai/Press_next_to_receive_code_via_SMS.mp3 new file mode 100755 index 00000000..bd8aa6d8 Binary files /dev/null and b/sound_thai/Press_next_to_receive_code_via_SMS.mp3 differ diff --git a/sound_thai/The_change_has_run_out.mp3 b/sound_thai/The_change_has_run_out.mp3 new file mode 100755 index 00000000..44299df3 Binary files /dev/null and b/sound_thai/The_change_has_run_out.mp3 differ diff --git a/sound_thai/You_mode_it.mp3 b/sound_thai/You_mode_it.mp3 new file mode 100755 index 00000000..11bb63cb Binary files /dev/null and b/sound_thai/You_mode_it.mp3 differ diff --git a/sound_thai/Your_credit_balance_not_enough.mp3 b/sound_thai/Your_credit_balance_not_enough.mp3 new file mode 100755 index 00000000..638ac4a0 Binary files /dev/null and b/sound_thai/Your_credit_balance_not_enough.mp3 differ diff --git a/sound_thai/keep_your_change_credits_or_receive.mp3 b/sound_thai/keep_your_change_credits_or_receive.mp3 new file mode 100755 index 00000000..366510ba Binary files /dev/null and b/sound_thai/keep_your_change_credits_or_receive.mp3 differ diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index f0a0f3ed..dc39eddd 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -550,6 +550,27 @@ Var SuggestID = "" Var SessionID2 = "" + If Seeker.CreditCard = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "CC01" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + SelectDrink + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + BoxID + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "S" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.CreditCardRef + Var SessionID2 = SessionID2 + "/" + + CashlessReq CANCEL + + EndIf + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate @@ -612,6 +633,27 @@ Var SuggestID = "" Var SessionID2 = "" + If Seeker.CreditCard = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "CC01" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + SelectDrink + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + BoxID + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "S" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.CreditCardRef + Var SessionID2 = SessionID2 + "/" + + CashlessReq CANCEL + + EndIf + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate ;If Seeker.CodeChannel = 0 Then @@ -774,6 +816,25 @@ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Else + + If Seeker.CreditCard = 1 Then + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "CC01" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + SelectDrink + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + BoxID + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "S" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.CreditCardRef + Var SessionID2 = SessionID2 + "/" + + CashlessReq SUCCESS + + EndIf Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate EndIf diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index fb61fc67..ee672c66 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -416,6 +416,27 @@ Var SuggestID = "" Var SessionID2 = "" + If Seeker.CreditCard = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "CC01" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + SelectDrink + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + BoxID + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "S" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.CreditCardRef + Var SessionID2 = SessionID2 + "/" + + CashlessReq CANCEL + + EndIf + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate @@ -469,6 +490,27 @@ Var SuggestID = "" Var SessionID2 = "" + If Seeker.CreditCard = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "CC01" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + SelectDrink + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + BoxID + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "S" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.CreditCardRef + Var SessionID2 = SessionID2 + "/" + + CashlessReq CANCEL + + EndIf + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate ;If Seeker.CodeChannel = 0 Then @@ -626,6 +668,25 @@ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Else + + If Seeker.CreditCard = 1 Then + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "CC01" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + SelectDrink + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + BoxID + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "S" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.CreditCardRef + Var SessionID2 = SessionID2 + "/" + + CashlessReq SUCCESS + + EndIf Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate EndIf diff --git a/xml/page_check_member.xml b/xml/page_check_member.xml index 14ce93d7..efdce6c6 100644 --- a/xml/page_check_member.xml +++ b/xml/page_check_member.xml @@ -52,6 +52,12 @@ Var TaobinCredit = 0 + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3" + EndIf + 1000 diff --git a/xml/page_check_member1.xml b/xml/page_check_member1.xml index c26c9eaa..8e6b9b89 100644 --- a/xml/page_check_member1.xml +++ b/xml/page_check_member1.xml @@ -44,6 +44,12 @@ Var GetAccFlag = 0 Var StepX = 0 + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_4_digits_pin.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_4_digits_pin.mp3" + EndIf 1000 diff --git a/xml/page_check_newmember1.xml b/xml/page_check_newmember1.xml index 5ccb61ec..e2e7dce2 100644 --- a/xml/page_check_newmember1.xml +++ b/xml/page_check_newmember1.xml @@ -44,6 +44,12 @@ Var GetAccFlag = 0 Var StepX = 0 + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_create_new_pin.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_create_new_pin.mp3" + EndIf 1000 diff --git a/xml/page_check_newmember2.xml b/xml/page_check_newmember2.xml index 967e3eb3..8a46832b 100644 --- a/xml/page_check_newmember2.xml +++ b/xml/page_check_newmember2.xml @@ -44,6 +44,13 @@ Var GetAccFlag = 0 Var StepX = 0 + + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_confirm_your_pin_again.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_confirm_your_pin_again.mp3" + EndIf 1000 diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index f9c12d74..d6f64fef 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -135,7 +135,9 @@ Var PointTaobin = PointTaobinTmp Var pTaobin = PointTaobin - If TaobinLevel = 1 Then + DEBUGVAR TaobinLevel + + If TaobinLevel = "1" Then Var pTaobin = PayAmount / 20 Else Var pTaobin = PayAmount / 15 diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 9900a38e..60f1120f 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -651,8 +651,6 @@ Var Timeout = Timeout + 1 If Timeout > 5 Then - - ; goto lid straw If CoffeePoint > 29 Then Open "ROOT/taobin_project/xml/page_display_get_free.xml" diff --git a/xml/page_display_get_free.xml b/xml/page_display_get_free.xml index 12d15163..1de8a888 100644 --- a/xml/page_display_get_free.xml +++ b/xml/page_display_get_free.xml @@ -22,22 +22,29 @@ Var MemberState2 = "Invisible" Var MemberState3 = "Invisible" + ;Var TaobinLevel = "3" + + DEBUGVAR TaobinLevel + If TaobinLevel = "1" Then Var MemberState1 = "Invisible" Var MemberState2 = "Enable" Var MemberState3 = "Invisible" - EndIf - If TaobinLevel = "2" Then - Var MemberState1 = "Enable" - Var MemberState2 = "Invisible" - Var MemberState3 = "Invisible" - EndIf + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Get_free_drink_faster.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Get_free_drink_faster.mp3" + EndIf + + Else + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/You_mode_it.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/You_mode_it.mp3" + EndIf - If TaobinLevel = "3" Then - Var MemberState1 = "Enable" - Var MemberState2 = "Invisible" - Var MemberState3 = "Invisible" EndIf If Seeker.FromConsent = 1 Then @@ -46,6 +53,8 @@ Var MemberState3 = "Enable" EndIf + + @@ -63,6 +72,7 @@ If Timeout > 5 Then ; goto lid straw Open "ROOT/taobin_project/xml/page_lid_straw.xml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf TimerReset diff --git a/xml/page_get_yourchange.xml b/xml/page_get_yourchange.xml index a55fa695..a8d3fd36 100644 --- a/xml/page_get_yourchange.xml +++ b/xml/page_get_yourchange.xml @@ -28,7 +28,11 @@ Var DirImage = "ROOT/taobin_project/image/page_thankyou" EndIf - + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Dont_forget_your_changes_below.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Dont_forget_your_changes_below.mp3" + EndIf diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 79f05be2..4a2f0436 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -6,6 +6,8 @@ ; On open + ;Open "ROOT/taobin_project/xml/page_display_get_free.xml" + Var IndoQR = 0 Var GetPayInfoFlag = 0 @@ -95,6 +97,8 @@ Var Seeker.FreeVendingCampaign = 0 Var Seeker.CodeChannel = 0 Var CoinVendingOnFlag = 0 + Var Seeker.CreditCard = 0 + Var Seeker.CreditCardRef = "" Var Seeker.IntVendingCredit = 0 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index a4d41186..a3c9ff94 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -17,7 +17,7 @@ - + Var RemainAmountStrENG = "" Var AdultState = "Invisible" Var AdultState1 = "Invisible" Var AdultState2 = "Invisible" @@ -284,7 +284,13 @@ If Canout = 0 Then Var RemainAmountStr = 0 Else - Var RemainAmountStr = "ทอน " + Canout + + If show_eng = "true" Then + Var RemainAmountStr = "Change " + Canout + Var RemainAmountStr = RemainAmountStr + "###size=90" + Else + Var RemainAmountStr = "ทอน " + Canout + EndIf EndIf @@ -635,6 +641,13 @@ Var QRCODE99 = QRCODE99KBANK Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.mp3" + EndIf + EndIf If VendingQRTypeResult = "IND:2" Then @@ -653,6 +666,13 @@ Var QRCODE99 = QRCODE99KBANK Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + EndIf + EndIf @@ -674,6 +694,13 @@ Var QRCODE99 = QRCODE99Shoppy Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + EndIf + EndIf EndIf @@ -693,6 +720,13 @@ Var QRCODE99 = QRCODE99Shoppy Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + EndIf + EndIf EndIf @@ -712,6 +746,13 @@ Var QRCODE99 = QRCODE99Shoppy Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + EndIf + EndIf EndIf @@ -1227,6 +1268,12 @@ Var alphaState3 = "Enable" + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3" + EndIf + EndIf EndIf @@ -1251,7 +1298,12 @@ If Canout = 0 Then Var RemainAmountStr = 0 Else - Var RemainAmountStr = "ทอน " + Canout + If show_eng = "true" Then + Var RemainAmountStr = "Change " + Canout + Var RemainAmountStr = RemainAmountStr + "###size=90" + Else + Var RemainAmountStr = "ทอน " + Canout + EndIf EndIf diff --git a/xml/page_payment_cashOther.xml b/xml/page_payment_cashOther.xml index 3f9971a0..d9582d6f 100644 --- a/xml/page_payment_cashOther.xml +++ b/xml/page_payment_cashOther.xml @@ -74,11 +74,46 @@ + + If VendingCashless = "OK" Then + DEBUGVAR CashlessCode + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + VendingQR OFF + CoinVending OFF + + + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + EndIf + Var Seeker.CreditCard = 1 + Var Seeker.CreditCardRef = CreditCardRef + + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + + + Var CreditCardRef = "" + GenHashWithTimeStamp CreditCardRef + DEBUGVAR VendingCashless + + If VendingCashless = "READY" Then + CashlessPay PriceDrink CreditCardRef + EndIf + + + @@ -304,7 +339,8 @@ SoundVolume - + Coin CARD + ;for test diff --git a/xml/page_payment_changePinSMS.xml b/xml/page_payment_changePinSMS.xml index b1e7fd57..8babea05 100644 --- a/xml/page_payment_changePinSMS.xml +++ b/xml/page_payment_changePinSMS.xml @@ -20,6 +20,14 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + + If PinSMSFlag = 1 Then + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Press_next_to_receive_code_via_SMS.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Press_next_to_receive_code_via_SMS.mp3" + EndIf + EndIf diff --git a/xml/page_payment_codeKBANK.xml b/xml/page_payment_codeKBANK.xml new file mode 100644 index 00000000..71940f4f --- /dev/null +++ b/xml/page_payment_codeKBANK.xml @@ -0,0 +1,696 @@ + + + "Enable" + 1080 + 1920 + "0xeae6e1" + PlaySoundCodeLang + SoundVolume + "Partial" + + ; On open + Var ECommerce = "" + Var Seeker.FreeVendingCampaign = 0 + + Var Timeout = 0 + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + ;Var VendingQRCode = "ERROR" + ;VendingQR ON + ;Var QRCODE99 = "" + + ;CoinVending OFF + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" + Var ErrorCause = "" + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + EndIf + + + Var Mode# = 0 + Var Str# = "" + Var TelephoneNumber# = "" + + + 1000 + + ;Open "ROOT/xml/page_board.xml" + + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + + Open "ROOT/taobin_project/xml/page_payment_codeOther.xml" + + Refresh + EndIf + + TimerReset + + + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + + + + + + + If Seeker.CodeChannel = 1 Then + + SAVELOG "Seeker.CodeChannel 1 > ActOK." + + SAVELOG ECommerce + + SPLIT ECommerce "/" 5 Seeker.VendingCode + SPLIT ECommerce "/" 7 Seeker.VendingCampaignRI3 + SPLIT ECommerce "/" 8 VendingCampaign1 + + If Seeker.VendingCode = "" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "KBA:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "AIR:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + If Seeker.VendingCode = "TWN:2" Then + Var Seeker.VendingCode = "C00" + EndIf + + SAVELOG Seeker.VendingCode + SAVELOG Seeker.VendingCampaignRI3 + + + If Seeker.VendingCode = "C00" Then + + Else + + Var VendingCreditRemain = "" + Var IntVendingCampaign1 = VendingCampaign1 + INT IntVendingCampaign1 + + If IntVendingCampaign1 > 0 Then + Var VendingCreditRemain = VendingCampaign1 + EndIf + + + + Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3 + INT Seeker.IntVendingCampaign + + Var VendingREFID = SessionID + + If Seeker.IntVendingCampaign > 0 Then + Var QRChannel = 0 + + If Seeker.IntVendingCampaign >= PayAmount Then + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var Seeker.VendingCampaign = PayAmount + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 + EndIf + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + EndIf + + Var Seeker.CodeChannel = 1 + + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf + + + + Else + + Var ShowErrorText = "Enable" + Var text_show_error = DirImage + "/text_show_error.png" + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + + EndIf + EndIf + + Else + + + + + EndIf + + + + + If Seeker.CodeChannel = 1 Then + Var TelephoneNumber = "" + + Var ShowErrorText = "Enable" + + SAVELOG ShowErrorText + + Var text_show_error = DirImage + "/text_show_error2.png" + + If ErrorCause = "failed_fromoper_0002" Then + Var text_show_error = DirImage + "/text_show_error.png" + EndIf + + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + + If ErrorCause = "failed_fromoper_0006" Then + Var text_show_error = DirImage + "/text_show_error4.png" + EndIf + + Var GetPayInfoFlag = 0 + Var Seeker.CodeChannel = 0 + Var Tel_Confirm_State = "Disable" + Refresh + EndIf + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + 158 + 667 + "ROOT/taobin_project/image/collectiing/img_popup1.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 868 + Var( DirImage + "/img3.png" ) + + + + 244 + 882 + ShowTextNumber + "Enable" + Var( DirImage + "/text_12.png" ) + + + + + 0 + 883 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber# + + + + + + + 188 + 760 + Var( DirImage + "/text_39.png" ) + + + + 152 + 1001 + "Enable" + ShowErrorText + text_show_error + + + + 158 + 513 + Var( DirImage + "/img_popupKBANK.png" ) + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/xml/page_payment_codeOther.xml b/xml/page_payment_codeOther.xml index 74ee9efc..8442c706 100644 --- a/xml/page_payment_codeOther.xml +++ b/xml/page_payment_codeOther.xml @@ -211,14 +211,14 @@ 441 1196 "Enable" - "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" - "ROOT/taobin_project/image/collectiing/bp_pay_with_codeXXX.png" - "ROOT/taobin_project/image/collectiing/bd_pay_with_codeXXX.png" + "ROOT/taobin_project/image/collectiing/bn_pay_with_codeKBANK.png" + "ROOT/taobin_project/image/collectiing/bp_pay_with_codeKBANK.png" + "ROOT/taobin_project/image/collectiing/bd_pay_with_codeKBANK.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Open "ROOT/taobin_project/xml/page_payment_codeKBANK.xml" diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index 8c7a9fd8..d7b99036 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -55,11 +55,21 @@ GETACCEXT DataTmp 19 Var GetAccFlag = 1 + Else + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_phone_for_credits.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_phone_for_credits.mp3" + EndIf EndIf + + + 1000 diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 03290804..ea69c493 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -92,6 +92,14 @@ EndIf + Else + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_4_digits_pin.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_4_digits_pin.mp3" + EndIf + EndIf diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index bfdd4f4b..04263fc4 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -50,6 +50,13 @@ EndIf EndIf + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Your_credit_balance_not_enough.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Your_credit_balance_not_enough.mp3" + EndIf + EndIf Var ShowLoadingText = "Invisible" diff --git a/xml/page_payment_storeCredit.xml b/xml/page_payment_storeCredit.xml index 9fb38cea..e4ef1e74 100644 --- a/xml/page_payment_storeCredit.xml +++ b/xml/page_payment_storeCredit.xml @@ -38,6 +38,8 @@ Var GetAccFlag = 0 + + 1000 diff --git a/xml/page_payment_storeCredit0.xml b/xml/page_payment_storeCredit0.xml index 37b00d66..43b10152 100644 --- a/xml/page_payment_storeCredit0.xml +++ b/xml/page_payment_storeCredit0.xml @@ -33,6 +33,14 @@ Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend" EndIf + + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/keep_your_change_credits_or_receive.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/keep_your_change_credits_or_receive.mp3" + EndIf + 1000 @@ -125,6 +133,8 @@ Change StoreCreditAmount Var ChangeFlag2 = 1 + + If Seeker.FreeVendingCampaign = 1 Then diff --git a/xml/page_payment_storeCredit2-2.xml b/xml/page_payment_storeCredit2-2.xml index 91ff3580..868f5ccd 100644 --- a/xml/page_payment_storeCredit2-2.xml +++ b/xml/page_payment_storeCredit2-2.xml @@ -44,6 +44,12 @@ Var FlagOKButton = 0 + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_4_digits_pin.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_4_digits_pin.mp3" + EndIf + 1000 diff --git a/xml/page_payment_storeCredit2.xml b/xml/page_payment_storeCredit2.xml index d4eced83..bfbba7ff 100644 --- a/xml/page_payment_storeCredit2.xml +++ b/xml/page_payment_storeCredit2.xml @@ -35,6 +35,12 @@ Var FlagOKButton = 0 + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_create_new_pin.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_create_new_pin.mp3" + EndIf + 1000 diff --git a/xml/page_show_consent.xml b/xml/page_show_consent.xml index 171d44e5..d9efe3f4 100644 --- a/xml/page_show_consent.xml +++ b/xml/page_show_consent.xml @@ -22,6 +22,13 @@ Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" EndIf + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_press_accept_consent.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_press_accept_consent.mp3" + EndIf + 1000