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

SGP: member page & reward pt check

Browse source
This commit is contained in:
Pakin 2024-07-09 11:31:08 +07:00
parent a1a6e4bc74
commit 86d9c4683f
17 changed files with 671 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/sgp/image/page_member/bn_close.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
inter/sgp/image/page_member/bn_redeem.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
inter/sgp/image/page_member/bp_close.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
inter/sgp/image/page_member/bp_redeem.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
inter/sgp/image/page_member/free1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
inter/sgp/image/page_member/member_point_card.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
inter/sgp/image/page_member/member_profile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
inter/sgp/image/page_member/points_alert.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
inter/sgp/image/page_member/taobinPoint55.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 62 KiB

BIN
inter/sgp/image/page_member/text8_55.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

17
inter/sgp/xml/page_check_member.lxml
View file

@ -9,7 +9,7 @@
<EventOpen>
; On open
DEBUGVAR "Open page_check_member Australia"
DEBUGVAR "Open page_check_member Singapore"
Var Timeout = 0
@ -541,6 +541,11 @@
If Tel2D = "0" Then
Var Tel2DFlag = 1
Else
; inter-accept-no-zero
If CountryName = "Singapore" Then
Var Tel2DFlag = 1
EndIf
EndIf
If Tel2DFlag = 1 Then
@ -591,7 +596,7 @@
<Color> 0x513C2F </Color>
<Refresh> "Enable" </Refresh>
<Value> TelephoneNumber </Value>
<Format> Telnum-mask-1 </Format>
<Format> Telnum-mask-3 </Format>
</Text>
@ -644,6 +649,14 @@
Open CheckNewMemberPage1
</EventUnitTest1>
<EventUnitTest2>
Var DebugStayInPage = 1
DEBUGVAR DebugStayInPage
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.lxml"
</EventUnitTest2>
<EventUnitTest4>
Var CheckMemberPage1 = CountryRootPath + "xml/page_check_member1.lxml"
Open CheckMemberPage1

8
inter/sgp/xml/page_check_member1.lxml
View file

@ -38,6 +38,8 @@
Var StepX = 0
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_4_digits_pin.mp3"
Var UseSGPCollectFlag = 1
</EventOpen>
<Timeout> 1000 </Timeout>
@ -123,6 +125,12 @@
If UseSGPCollectFlag = 1 Then
Var param1 = "SG/" + TelephoneNumber
Var param1 = param1 + "/-"
Var param1 = param1 + "/-"
Var param1 = param1 + "/-"
Var param1 = param1 + "/-"
DEBUGVAR param1
GETACCEXT param1 35
Else

30
inter/sgp/xml/page_check_member2.lxml
View file

@ -111,14 +111,14 @@
Var ExpireStrTmp = ExpireStrTmp + TaobinExpireYear
;If TaobinLevel = "1" Then
; Var TaobinLevelDesc1 = "Shy turtle level"
; Var TaobinLevelDesc2 = ""
; Var TaobinLeveImg = "/taoLevel1.png"
;EndIf
If TaobinLevel = "1" Then
Var TaobinLevelDesc1 = "Shy turtle level"
Var TaobinLevelDesc2 = ""
Var TaobinLeveImg = "/taoLevel1.png"
EndIf
If TaobinLevel = "2" Then
Var TaobinLevelDesc1 = "Walking turtle level"
Var PointDiff = 150 - CoffeePointRank
Var TaobinLevelDesc2 = "Earn " + PointDiff
@ -138,17 +138,17 @@
EndIf
If TaobinLevel = "3" Then
If TaobinLevel = "2" Then
Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp
Var PointDiff = 200 - CoffeePointRank
Var PointDiff = 350 - CoffeePointRank
Var TaobinLevelDesc2 = "Earn " + PointDiff
Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells "
Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level"
Var TaobinLeveImg = "/taoLevel3.png"
If CoffeePointRank > 199 Then
If CoffeePointRank > 349 Then
;Var TaobinLeveImg = "/taoLevel4.png"
;Var TaobinLevelDesc1 = "Master turtle level "
@ -159,7 +159,7 @@
EndIf
If TaobinLevel = "4" Then
If TaobinLevel = "3" Then
Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp
Var TaobinLevelDesc2 = ""
@ -195,6 +195,8 @@
Var CouponIDA = ""
Var CouponIDB = ""
DEBUGVAR CouponInfoA
DEBUGVAR CouponInfoB
Var CouponNum = TaobinCoupons
@ -507,7 +509,7 @@
EndIf
Var text5Img = "/text5-AUS.png"
Var text5Img = "/text5-SGD.png"
INT TaobinCredit
@ -584,7 +586,7 @@
<Button>
<X> 433 </X>
<Y> 411 </Y>
<State> buttonState </State>
<State> "Invisible" </State>
<Filename> Var( DirImage + "/bn_topupCredit.png" )</Filename>
<FilenamePress> Var( DirImage + "/bn_topupCredit.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -660,7 +662,7 @@
<Font> KanitRegularTTF </Font>
<Color> 0xFFFFFF </Color>
<Value> TNumberTaobinMemberXXX </Value>
<Format> Telnum-mask-1 </Format>
<Format> Telnum-mask-3 </Format>
</Text>
<Text>

2
inter/sgp/xml/page_collect_point_2.lxml
View file

@ -236,7 +236,7 @@
;inter-xml-open
If CountryName = "Singapore" Then
DEBUGVAR "Try open collect3.sgp"
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.xml"
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.lxml"
EndIf
Open "ROOT/taobin_project/xml/page_show_consent.xml"

797
inter/sgp/xml/page_collect_point_3.lxml
View file

File diff suppressed because it is too large Load diff

32
xml/page_board.xml
View file

@ -832,12 +832,13 @@
Var TextPriceMenuY = 264
Var TextPriceMenuBlendX = 180
Var TextPriceMenuHotX = 48
Var ShowButtonClick2 = "Invisible"
Var ShowButtonClick2 = "Enable"
Var ButtontoTopupMenu = "Invisible"
Var PriceUnitText = "Price in SGD"
Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page_en/bn_main_page_member.png"
Var show_eng_button_stage = "Invisible"
Var CountDownShowButton = 35
@ -852,7 +853,7 @@
STRCONTAIN "521215" MaterialAvailable SugarZeroCalEnable
Var SettingDisableTaobinCredit = "true"
Var SettingDisableTaobinCode = "false"
;Var SettingDisableTaobinCode = "false"
; Singapore disable point
;Var SettingIgnoreCollectPoint = 1
@ -864,6 +865,8 @@
Var ShowCountDownAsPercent = 1
DEBUGVAR ShowButtonClick2
EndIf
@ -1104,9 +1107,14 @@
Var CurrentMainVideo = CurrentMainVideoTemp
DEBUGVAR SettingDisableTaobinCredit
If SettingDisableTaobinCredit = "true" Then
Var ShowButtonClick2 = "Invisible"
If CountryName = "Singapore" Then
Var ShowButtonClick2 = "Enable"
EndIf
EndIf
DEBUGVAR ShowButtonClick2
DEBUGVAR CLOSE_ORDER_NOW
@ -1377,12 +1385,18 @@
If CountDownShowButton = 31 Then
Var ShowButtonClickFull = "Enable"
Var ShowButtonClick = "Invisible"
If CountryName = "Singapore" Then
Var ShowButtonClick2 = "Invisible"
EndIf
Refresh
EndIf
If CountDownShowButton = 3 Then
Var ShowButtonClick = "Enable"
If CountryName = "Singapore" Then
Var ShowButtonClick2 = "Enable"
EndIf
Var ShowButtonClickFull = "Invisible"
Refresh
EndIf
@ -1677,16 +1691,14 @@
If InternationalEnable = 1 Then
;inter-xml-open
If CountryName = "Australia" Then
DEBUGVAR CountryName
If CountryName = "UnitedArabEmirates Dubai" Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
Else
Var ChackMemberPage = CountryRootPath + "xml/page_check_member.lxml"
OpenInst 2 ChackMemberPage
Else
If CountryName = "Malaysia" Then
Var ChackMemberPage = CountryRootPath + "xml/page_check_member.lxml"
OpenInst 2 ChackMemberPage
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
EndIf
EndIf
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"

4
xml/page_payment_cash-SGP.xml
View file

@ -470,9 +470,7 @@
Var TopRowY = 1276
Var BotRowY = 1499
If SettingDisableTaobinCredit = "true" Then
Var PayState4 = "Invisible"
EndIf
Var PayState4 = "Invisible"
If SettingDisableTaobinCode = "true" Then
Var PayState2 = "Invisible"