Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
wanlop run 2025-02-24 11:28:01 +07:00
commit 8dc8938d68
8 changed files with 1384 additions and 8 deletions

View file

@ -48,7 +48,7 @@
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-01-03-0090.Button,$Sum1201030090) </State>
<State> Flag( 12-01-03-0090.Button,DateTimeStart="2025/03/01T00:00:00",$Sum1201030090) </State>
<Button>
<State> $Sum1201030090 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Coffee_Smoothie.png" </Filename>
@ -301,7 +301,7 @@ Sugar And Ice" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-21-03-0090.Button,$Sum1221030090) </State>
<State> Flag( 12-21-03-0090.Button,DateTimeStart="2025/03/01T00:00:00",$Sum1221030090) </State>
<Button>
<State> $Sum1221030090 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Coffee_Smoothie.png" </Filename>

View file

@ -46,7 +46,7 @@
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-03-03-0103.Button,$Sum1203030103) </State>
<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/03/01T00:00:00",$Sum1203030103) </State>
<Button>
<State> $Sum1203030103 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </Filename>
@ -301,7 +301,7 @@ And Ice" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-03-03-0104.Button,$Sum1203030104) </State>
<State> Flag( 12-03-03-0104.Button,DateTimeStart="2025/03/01T00:00:00",$Sum1203030104) </State>
<Button>
<State> $Sum1203030104 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Strawberry_Smoothie.png" </Filename>
@ -556,7 +556,7 @@ Sugar And Ice" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-03-03-0105.Button,$Sum1203030105) </State>
<State> Flag( 12-03-03-0105.Button,DateTimeStart="2025/03/01T00:00:00",$Sum1203030105) </State>
<Button>
<State> $Sum1203030105 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Cocoa_Smoothie.png" </Filename>
@ -811,7 +811,7 @@ Sugar And Ice" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-03-03-0106.Button,$Sum1203030106) </State>
<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/03/01T00:00:00",$Sum1203030106) </State>
<Button>
<State> $Sum1203030106 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </Filename>
@ -1066,7 +1066,7 @@ Sugar And Ice" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-01-03-0090.Button,$Sum1201030090) </State>
<State> Flag( 12-01-03-0090.Button,DateTimeStart="2025/03/01T00:00:00",$Sum1201030090) </State>
<Button>
<State> $Sum1201030090 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Coffee_Smoothie.png" </Filename>
@ -1319,7 +1319,7 @@ Sugar And Ice" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-21-03-0090.Button,$Sum1221030090) </State>
<State> Flag( 12-21-03-0090.Button,DateTimeStart="2025/03/01T00:00:00",$Sum1221030090) </State>
<Button>
<State> $Sum1221030090 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Coffee_Smoothie.png" </Filename>

View file

@ -49,6 +49,10 @@
Var TopupWithCashState = "Disable"
EndIf
If Seeker.CodeChannel = 1 Then
Var TopupWithCodeState = "Disable"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
@ -165,8 +169,10 @@
<Button>
<X> 664 </X>
<Y> 1225 </Y>
<State> TopupWithCodeState </State>
<Filename> Var( DirImage + "/bn_topup_with_code.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_topup_with_code.png" )</FilenamePress>
<FilenameDisable> Var( DirImage + "/bp_topup_with_code.png" )</FilenameDisable>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>

View file

@ -65,6 +65,7 @@
Var SumCreditAndCouponAmount = IntAmoutCoupon + SumCreditAmount
If SumCreditAndCouponAmount < PayAmountSubDiscount Then
Var SumCreditAmount = SumCreditAndCouponAmount
Var Seeker.CodeChannel = 0
Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml"
Else
GenHashWithTimeStamp PointCrm