pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

add topup credit between brewing

Browse source
This commit is contained in:
miggaze 2024-06-17 16:35:17 +07:00
parent b6b90ff7ca
commit a3fe415ccb
12 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_doing/bn_get_lid.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After

BIN
image/page_doing/bn_get_more_straw.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before After
Before After

BIN
image/page_doing/bp_get_lid.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Before After
Before After

BIN
image/page_doing/bp_get_more_straw.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After

BIN
image/page_payment/bn_topup_credit.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Before After
Before After

BIN
image/page_payment/bp_topup_credit.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Before After
Before After

BIN
image/page_payment_en/page_payment/bn_topup_credit.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Before After
Before After

BIN
image/page_payment_en/page_payment/bp_topup_credit.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Before After
Before After

32
xml/page_brewing3.xml
View file

@ -55,8 +55,8 @@
Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3" 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 bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png"
Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw_en.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 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" 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 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 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 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_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png"
Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png" Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
Var XStraw = 274 Var XStraw = 142
Else Else
Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3" 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_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3.png"
Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1.png" Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1.png"
Var XStraw = 274 Var XStraw = 142
EndIf EndIf
Var waitAckPay = 0 Var waitAckPay = 0
@ -364,15 +366,18 @@
Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible"
Else Else
Var SelectMenuBetweenBrewEnable1 = "Enable" Var SelectMenuBetweenBrewEnable1 = "Enable"
Var EnableTopupCreditBetweenBrew = "Enable"
EndIf EndIf
If GetFreeFromError = 1 Then If GetFreeFromError = 1 Then
Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf EndIf
If DisableFromPowerup = "true" Then If DisableFromPowerup = "true" Then
Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var SelectMenuBetweenBrewEnable1Text = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf EndIf
If SelectMenuBetweenBrewEnable1 = "Enable" Then If SelectMenuBetweenBrewEnable1 = "Enable" Then
@ -404,21 +409,25 @@
If Seeker.CreditCard = 1 Then If Seeker.CreditCard = 1 Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf EndIf
If NeedUpgrade = "true" Then If NeedUpgrade = "true" Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf EndIf
If NeedReboot = "true" Then If NeedReboot = "true" Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf EndIf
If SELLSTATUS = "DEACTIVE" Then If SELLSTATUS = "DEACTIVE" Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf EndIf
DEBUGVAR NeedUpgrade DEBUGVAR NeedUpgrade
@ -1443,6 +1452,7 @@
If MachineState_Result > 0 Then If MachineState_Result > 0 Then
Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var SelectMenuBetweenBrewEnable1Text = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf EndIf
; Close next button. ; Close next button.
@ -1450,12 +1460,14 @@
Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var SelectMenuBetweenBrewEnable1Text = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible"
Var SelectMenuBetweenBrewEnable2 = "Invisible" Var SelectMenuBetweenBrewEnable2 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf EndIf
If DisableFromPowerup = "true" Then If DisableFromPowerup = "true" Then
Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var SelectMenuBetweenBrewEnable1Text = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf EndIf
If SelectMenuBetweenBrewEnable1 = "Enable" Then If SelectMenuBetweenBrewEnable1 = "Enable" Then
@ -1923,8 +1935,8 @@
</Button> </Button>
<Button> <Button>
<X> 792 </X> <X> 262 </X>
<Y> 1687 </Y> <Y> 1787 </Y>
<State>EnableTopupCreditBetweenBrew</State> <State>EnableTopupCreditBetweenBrew</State>
<Filename> topup_credit_bn </Filename> <Filename> topup_credit_bn </Filename>
<FilenamePress> topup_credit_bp </FilenamePress> <FilenamePress> topup_credit_bp </FilenamePress>
@ -2079,7 +2091,7 @@
; Lid button, Get one and report ; Lid button, Get one and report
; ;
<Button> <Button>
<X> 14 </X> <X> 22 </X>
<Y> 1787 </Y> <Y> 1787 </Y>
<State>bg_lidProblem_ST</State> <State>bg_lidProblem_ST</State>
<Filename> bnLidProblemReport </Filename> <Filename> bnLidProblemReport </Filename>
@ -2097,7 +2109,7 @@
</Button> </Button>
<Button> <Button>
<X> 14 </X> <X> 22 </X>
<Y> 1787 </Y> <Y> 1787 </Y>
<State>GetLidButtonState</State> <State>GetLidButtonState</State>
<Mode> "No" </Mode> <Mode> "No" </Mode>

15
xml/page_brewing3Conti.xml
View file

@ -33,7 +33,7 @@
Var topup_credit_bn = DirImage + "/bn_topup_credit.png" Var topup_credit_bn = DirImage + "/bn_topup_credit.png"
Var topup_credit_bp = DirImage + "/bp_topup_credit.png" Var topup_credit_bp = DirImage + "/bp_topup_credit.png"
Var EnableTopupCreditBetweenBrew = "Invisible" Var EnableTopupCreditBetweenBrew = "Enable"
If NextOrder = "true" Then If NextOrder = "true" Then
Var EnableSelectMenuBetweenBrew = "Invisible" Var EnableSelectMenuBetweenBrew = "Invisible"
@ -180,6 +180,11 @@
If Seeker.CreditCard = 1 Then If Seeker.CreditCard = 1 Then
Var EnableSelectMenuBetweenBrew = "Invisible" Var EnableSelectMenuBetweenBrew = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
If MachineState_Result > 0 Then
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf EndIf
Var CreditCardVoid = 0 Var CreditCardVoid = 0
@ -1094,8 +1099,8 @@
</Button> </Button>
<Button> <Button>
<X> 792 </X> <X> 262 </X>
<Y> 1687 </Y> <Y> 1787 </Y>
<State>EnableTopupCreditBetweenBrew</State> <State>EnableTopupCreditBetweenBrew</State>
<Filename> topup_credit_bn </Filename> <Filename> topup_credit_bn </Filename>
<FilenamePress> topup_credit_bp </FilenamePress> <FilenamePress> topup_credit_bp </FilenamePress>
@ -1112,11 +1117,13 @@
Var SeekerTmp = "curr" Var SeekerTmp = "curr"
Var TelephoneNumber = SeekerTmp.TNumberTaobinCredit Var TelephoneNumber = SeekerTmp.TNumberTaobinCredit
CoinPause
EndIf EndIf
SAVELOG "User click topup-credit button" SAVELOG "User click topup-credit button"
Var Seeker = "topupCredit" Var Seeker = "topupCredit"
CoinPause
Var PayCredit = 0 Var PayCredit = 0
If TelephoneNumber = "" Then If TelephoneNumber = "" Then

5
xml/page_topup_credit3-1.xml
View file

@ -38,6 +38,11 @@
Var timeout_Adddata22 = 0 Var timeout_Adddata22 = 0
GenHashWithTimeStamp PointCrm GenHashWithTimeStamp PointCrm
If SELLSTATUS = "SELLNOCASH" Then
Var topupCreditWithCash = "Disable"
EndIf
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>

2
xml/page_topup_credit3-TopupCash.xml
View file

@ -205,6 +205,7 @@
Var SessionID2 = "00-00-00-0000" Var SessionID2 = "00-00-00-0000"
Var ServiceCredit = "coffee" Var ServiceCredit = "coffee"
Var PayDetail = "" Var PayDetail = ""
Var CreditReference = ""
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Var PayCredit = 1 Var PayCredit = 1
@ -233,6 +234,7 @@
Var SessionID2 = "00-00-00-0000" Var SessionID2 = "00-00-00-0000"
Var ServiceCredit = "coffee" Var ServiceCredit = "coffee"
Var PayDetail = "" Var PayDetail = ""
Var CreditReference = ""
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Var PayCredit = 1 Var PayCredit = 1