diff --git a/image/page_doing/bn_get_lid.png b/image/page_doing/bn_get_lid.png index 2670b5a3..d982b37c 100644 Binary files a/image/page_doing/bn_get_lid.png and b/image/page_doing/bn_get_lid.png differ diff --git a/image/page_doing/bn_get_more_straw.png b/image/page_doing/bn_get_more_straw.png index 1795984c..ae0f200d 100644 Binary files a/image/page_doing/bn_get_more_straw.png and b/image/page_doing/bn_get_more_straw.png differ diff --git a/image/page_doing/bp_get_lid.png b/image/page_doing/bp_get_lid.png index 501c5224..98ed36ea 100644 Binary files a/image/page_doing/bp_get_lid.png and b/image/page_doing/bp_get_lid.png differ diff --git a/image/page_doing/bp_get_more_straw.png b/image/page_doing/bp_get_more_straw.png index ad4ccf83..01ea7291 100644 Binary files a/image/page_doing/bp_get_more_straw.png and b/image/page_doing/bp_get_more_straw.png differ diff --git a/image/page_payment/bn_topup_credit.png b/image/page_payment/bn_topup_credit.png index d65dc018..cd4f691b 100644 Binary files a/image/page_payment/bn_topup_credit.png and b/image/page_payment/bn_topup_credit.png differ diff --git a/image/page_payment/bp_topup_credit.png b/image/page_payment/bp_topup_credit.png index 43f07a84..6a4760b2 100644 Binary files a/image/page_payment/bp_topup_credit.png and b/image/page_payment/bp_topup_credit.png differ diff --git a/image/page_payment_en/page_payment/bn_topup_credit.png b/image/page_payment_en/page_payment/bn_topup_credit.png index db94981b..916e6d91 100644 Binary files a/image/page_payment_en/page_payment/bn_topup_credit.png and b/image/page_payment_en/page_payment/bn_topup_credit.png differ diff --git a/image/page_payment_en/page_payment/bp_topup_credit.png b/image/page_payment_en/page_payment/bp_topup_credit.png index 7f35e388..61dcf749 100644 Binary files a/image/page_payment_en/page_payment/bp_topup_credit.png and b/image/page_payment_en/page_payment/bp_topup_credit.png differ diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 3d2af218..922319ce 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -55,8 +55,8 @@ Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3" - Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw_en.png" - Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw_en.png" + Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png" + Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png" Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png" Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png" @@ -65,13 +65,15 @@ Var bpLidProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_lid_en.png" - Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png" - Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png" + ;Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png" + ;Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png" + Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid.png" + Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid.png" Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png" Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png" - Var XStraw = 274 + Var XStraw = 142 Else Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3" @@ -108,7 +110,7 @@ Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3.png" Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1.png" - Var XStraw = 274 + Var XStraw = 142 EndIf Var waitAckPay = 0 @@ -364,15 +366,18 @@ Var SelectMenuBetweenBrewEnable1 = "Invisible" Else Var SelectMenuBetweenBrewEnable1 = "Enable" + Var EnableTopupCreditBetweenBrew = "Enable" EndIf If GetFreeFromError = 1 Then Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If DisableFromPowerup = "true" Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If SelectMenuBetweenBrewEnable1 = "Enable" Then @@ -404,21 +409,25 @@ If Seeker.CreditCard = 1 Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If NeedUpgrade = "true" Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If NeedReboot = "true" Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If SELLSTATUS = "DEACTIVE" Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf DEBUGVAR NeedUpgrade @@ -1443,6 +1452,7 @@ If MachineState_Result > 0 Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf ; Close next button. @@ -1450,12 +1460,14 @@ Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" Var SelectMenuBetweenBrewEnable2 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If DisableFromPowerup = "true" Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If SelectMenuBetweenBrewEnable1 = "Enable" Then @@ -1923,8 +1935,8 @@