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

update new taobin credit 28 taobin

Browse source
This commit is contained in:
Kenta420 2024-01-03 14:35:52 +07:00
parent 961eb8bba6
commit 0e93a831d5
15 changed files with 91 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/display_get_discount/bn_get15discount.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
image/display_get_discount/bn_keep.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
image/display_get_discount/bp_get15discount.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
image/display_get_discount/bp_keep.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
image/display_get_discount/disable2_get15discount.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
image/display_get_discount_en/bn_get15discount.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
image/display_get_discount_en/bn_keep.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
image/display_get_discount_en/bp_get15discount.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
image/display_get_discount_en/bp_keep.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
image/display_get_discount_en/disable2_get15discount.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.9 KiB

8
ui/lang.tsv
View file

@ -710,12 +710,12 @@
800634 OK รับทราบ
800635 Main Disc Not Close!!! ฐานจานหมุนไม่ได้ล็อค!!!
800636 Main Disc lock may loose, Please lock Main Disc before Full Test. ฐานจานหมุนอาจหลวม หรือลืมล็อค
800637 Powder Position ชุดผง (ตำแหน่ง)
800637 Powder Disc ตำแหน่งผง
800638 ICE น้ำแข็ง
800639 Door Cup ประตูรับแก้ว
800640 Powder Channel (falling powder!) ชุดผง (ช่องจ่าย) (ผงหล่น!)
800641 Arm แขน
800642 Door Lid ประตูรับหลอดรับฝา
800641 Arm Disc ตำแหน่งแขน
800642 Door Lid/Straw ประตูรับหลอดรับฝา
800643 Whipper หัวชง
800644 Start เริ่ม
800645 Cancel ยกเลิก
@ -725,6 +725,8 @@
800649 Fail ล้มเหลว
800650 Testing List : รายการทดสอบ :
800651 Connection การสื่อสาร
800652 Tray ถาดกาแฟ
800653 ESP Module ตำแหนงเครื่องอัดกาแฟ
Test (New UI)
800700 Active ทำงาน

Can't render this file because it has a wrong number of fields in line 21.

20
xml/page_brewing3.xml
View file

@ -1113,6 +1113,17 @@
If AddData = 1 Then
Var Cid = 26
DEBUGVAR "Brewing3"
DEBUGVAR Seeker
DEBUGVAR Seeker.UseGet15Discount
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
EndIf
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf
@ -1217,6 +1228,15 @@
If AddData = 1 Then
Var Cid = 26
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
EndIf
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf

20
xml/page_brewing3Conti.xml
View file

@ -594,6 +594,17 @@
If AddData = 1 Then
Var Cid = 26
DEBUGVAR "Brewing3Conti"
DEBUGVAR Seeker
DEBUGVAR Seeker.UseGet15Discount
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
EndIf
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf
@ -704,6 +715,15 @@
If AddData = 1 Then
Var Cid = 26
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
EndIf
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf

57
xml/page_collect_point_3_28.xml
View file

@ -602,27 +602,47 @@
Var Get15DiscountState = "Disable"
EndIf
Var PreviosCreditPhoneNumber = ""
If Seeker = "curr" Then
Var PreviosCreditPhoneNumber = Seeker.TNumberTaobinCredit
Else
If Seeker.TNumberTaobinCredit = PreviosCreditPhoneNumber Then
If Seeker.UseGet15Discount = 1 Then
Var Get15DiscountState = "Disable2"
EndIf
EndIf
EndIf
Var KeepBnBtnImage = "/bn_keep.png"
Var KeepBpBtnImage = "/bp_keep.png"
Var PreviousSeeker = "tempSeeker"
Var Seeker.UseGet15Discount = 0
Var PreviousSeeker.UseGetDrink5Bath = 0
If Seeker = "curr" Then
Var PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit
Var PreviousSeeker.UseGet15Discount = 0
Else
If PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit Then
If PreviousSeeker.UseGet15Discount = 1 Then
Var Get15DiscountState = "Disable2"
EndIf
Else
Var PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit
Var PreviousSeeker.UseGet15Discount = 0
EndIf
EndIf
If CoffeePoint >= 28 Then
Var KeepBnBtnImage = "/bn_close.png"
Var KeepBpBtnImage = "/bp_close.png"
Var Get15DiscountState = "Disable"
Var PreviousSeeker.UseGetDrink5Bath = 1
Else
If PreviousSeeker.UseGetDrink5Bath = 1 Then
Var Get15DiscountState = "Disable2"
EndIf
EndIf
DEBUGVAR Seeker
DEBUGVAR Seeker.TNumberTaobinCredit
DEBUGVAR Seeker.UseGet15Discount
DEBUGVAR PreviousSeeker
DEBUGVAR PreviousSeeker.TNumberTaobinCredit
DEBUGVAR PreviousSeeker.UseGet15Discount
Var PointEndDate = ""
GetDateEndOfMonth PointEndDate
DEBUGVAR PointEndDate
@ -646,7 +666,7 @@
;Var Timeout = Timeout + 1
Var Timeout = Timeout + 1
If Timeout > 5 Then
; goto lid straw
@ -656,8 +676,12 @@
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
Else
If CoffeePoint >= 15 Then
Var Discount15Timeout = 1
Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
If Get15DiscountState = "Disable2" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Var Discount15Timeout = 1
Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -826,6 +850,7 @@
<EventClick>
Var Seeker.UseGet15Discount = 1
Var PreviousSeeker.UseGet15Discount = 1
Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
</EventClick>

9
xml/page_display_get_15_discrount.xml → xml/page_display_get_15_discount.xml
View file

@ -117,8 +117,10 @@
<FilenameDisable2> Var( DirImage + "/disable2_get15discount.png" )</FilenameDisable2>
<EventClick>
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Var Seeker.UseGet15Discount = 1
Var PreviousSeeker.UseGet15Discount = 1
Var Discount15Timeout = 0
Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
</EventClick>
</Button>
@ -132,8 +134,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Discount15Timeout = 0
Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
</Button>