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

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

Browse source
This commit is contained in:
wanlop run 2024-01-31 21:32:11 +07:00
commit dbfe9cdc99
19 changed files with 273 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/collectiing/text_44.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Before After
Before After

BIN
image/collectiing_en/text_44.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

BIN
image/display_point/imgCoupon120.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
image/display_point/imgCoupon121.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
image/display_point_en/imgCoupon120.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
image/display_point_en/imgCoupon121.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

11
xml/event/script_common_for_open_promotion_xml.ev
View file

@ -33,17 +33,14 @@ Else
EndIf
EndIf
Else
If RerunProEnable = 1 Then
; Temporary debug
If ProPeachEnable = 1 Then
Var BigButtonEnable = "Enable"
Open "ROOT/taobin_project/xml/event/promotion_rerun.xml"
Open "ROOT/taobin_project/xml/event/promotion_peach.xml"
Else
If ProPeachEnable = 1 Then
If RerunProEnable = 1 Then
Var BigButtonEnable = "Enable"
Open "ROOT/taobin_project/xml/event/promotion_peach.xml"
Open "ROOT/taobin_project/xml/event/promotion_rerun.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf

14
xml/event/tricker.ev
View file

@ -62,6 +62,8 @@ Var ProPeachEnable = 0
Var NewCollectPoint = 1
Var NewFlowPaymentCode = 0
If SystemDateMonthInt = 10 Then
@ -120,10 +122,22 @@ EndIf
If BoxID = 173149 Then
Var ProPeachEnable = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 200435 Then
Var ProPeachEnable = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 201316 Then
Var ProPeachEnable = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 105005 Then
Var ProPeachEnable = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 172644 Then

11
xml/page_board.xml
View file

@ -797,6 +797,17 @@
If Not#LanguageLoaded = "" Then
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/mys/menu/lang.tsv"
EndIf
; load credit
If EnableCreditCard = "" Then
CacheVarStr "get" EnableCreditCard
Else
CacheVarStr "put" EnableCreditCard
EndIf
DEBUGVAR EnableCreditCard
EndIf
If CountryName = "Indonesia" Then

1
xml/page_check_member1.xml
View file

@ -75,6 +75,7 @@
Var CoffeePoint1 = Ext1c
INT CoffeePoint1
Var CoffeePointOld = CoffeePoint1
DEBUGVAR CoffeePointOld
Var TaobinName = Ext1d
Var TaobinCoupons = Ext1g

63
xml/page_check_member2.xml
View file

@ -323,7 +323,7 @@
Var FromCheckMemberPoint = 0
@ -486,6 +486,13 @@
If CouponTypeA = "113" Then
Var CouponNameA = "/imgCoupon113.png"
EndIf
If CouponTypeA = "120" Then
Var CouponNameA = "/imgCoupon120.png"
EndIf
If CouponTypeA = "121" Then
Var CouponNameA = "/imgCoupon121.png"
EndIf
INT CouponExireA_D
INT CouponExireA_Y
@ -598,6 +605,13 @@
Var CouponNameB = "/imgCoupon113.png"
EndIf
If CouponTypeB = "120" Then
Var CouponNameB = "/imgCoupon120.png"
EndIf
If CouponTypeB = "121" Then
Var CouponNameB = "/imgCoupon121.png"
EndIf
INT CouponExireB_D
INT CouponExireB_Y
Var CouponExireB_Y = CouponExireB_Y + 0
@ -715,6 +729,13 @@
Var CouponNameA = "/imgCoupon113.png"
EndIf
If CouponTypeA = "120" Then
Var CouponNameA = "/imgCoupon120.png"
EndIf
If CouponTypeA = "121" Then
Var CouponNameA = "/imgCoupon121.png"
EndIf
INT CouponExireA_D
INT CouponExireA_Y
Var CouponExireA_Y = CouponExireA_Y + 543
@ -825,6 +846,13 @@
Var CouponNameB = "/imgCoupon113.png"
EndIf
If CouponTypeB = "120" Then
Var CouponNameB = "/imgCoupon120.png"
EndIf
If CouponTypeB = "121" Then
Var CouponNameB = "/imgCoupon121.png"
EndIf
INT CouponExireB_D
INT CouponExireB_Y
Var CouponExireB_Y = CouponExireB_Y + 543
@ -1137,22 +1165,25 @@
</Text>
;<Button>
;<X> 156 </X>
;<Y> 1746 </Y>
;<Filename> Var( DirImage + "/bn_checkKradong.png" )</Filename>
;<FilenamePress> Var( DirImage + "/bp_checkKradong.png" )</FilenamePress>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
; Open "ROOT/taobin_project/xml/page_check_member_point.xml"
;</EventClick>
;</Button>
<Button>
<X> 156 </X>
<Y> 1746 </Y>
<Filename> Var( DirImage + "/bn_checkKradong.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_checkKradong.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
GETACCEXT TNumberTaobinMemberXXX 14
Open "ROOT/taobin_project/xml/page_check_member_point.xml"
</EventClick>
</Button>
<Button>
<X> 397 </X>
;<X> 630 </X>
;<X> 397 </X>
<X> 630 </X>
<Y> 1746 </Y>
<Filename> Var( DirImage + bn_exit )</Filename>
<FilenamePress> Var( DirImage + bp_exit )</FilenamePress>
@ -1211,7 +1242,7 @@
<Text>
<X> 372 </X>
<Y> 1370 </Y>
<Y> 1375 </Y>
<Size> 15 </Size>
<Width> 600 </Width>
<Font> KanitRegularTTF </Font>
@ -1244,7 +1275,7 @@
<Text>
<X> 372 </X>
<Y> 1613 </Y>
<Y> 1618 </Y>
<Size> 15 </Size>
<Width> 600 </Width>
<Font> KanitRegularTTF </Font>

65
xml/page_check_member_point.xml
View file

@ -666,12 +666,6 @@
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing
Var Timeout = Timeout + 1
If Timeout > 15 Then
@ -705,36 +699,24 @@
</EventSecurity>
<EventActionOk>
If CheckCoupons = 1 Then
Var MakeDrinkState = 1
Var CouponPage = 1
Var CouponInfo1 = Ext1a
Var CouponInfo2 = Ext1b
Var CouponInfo3 = Ext1c
Var CouponInfo4 = Ext1d
Var CouponInfo5 = Ext1e
Var CouponInfo6 = Ext1f
Var CouponInfo7 = Ext1g
Var CouponInfo8 = Ext1h
Var CouponInfo9 = Ext1i
Var CouponInfo10 = Ext1j
If Ext1a = "ok" Then
Var CoffeePoint1 = Ext1c
INT CoffeePoint1
Var CoffeePointOld = CoffeePoint1
Var CoffeePoint = CoffeePoint1
DEBUGVAR CoffeePointOld
Var TelephoneNumber = TelephoneNumberX
GETACCEXT TelephoneNumber 13
Var CheckCoupons = 2
Var TaobinName = Ext1d
Var TaobinCoupons = Ext1g
Var TaobinExpire = Ext1f
Var TaobinLevel = Ext1e
Else
Var CoffeePointRank = Ext1b
INT CoffeePointRank
Var CoffeePointRankTmp = CoffeePointRank
If CheckCoupons = 2 Then
Var TaobinCredit = Ext1b
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
Open "ROOT/taobin_project/xml/page_check_member_point.xml"
EndIf
</EventActionOk>
@ -1176,25 +1158,6 @@
</Text>
;
<Image>
<X> 751 </X>
<Y> 413 </Y>
<Filename> IMG_CNT </Filename>
</Image>
;
<Text>
<X> XPosiShowCountDownBrew </X>
<Y> 470 </Y>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Value> ShowCountDownBrewing </Value>
</Text>
<EventUnitTest1>
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
</EventUnitTest1>

41
xml/page_display_get_15_discount.xml
View file

@ -29,10 +29,15 @@
<EventTimeout>
Var Timeout = Timeout + 1
If Timeout > 5 Then
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If FromCheckMemberPoint = 1 Then
If Timeout > 10 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
Else
If Timeout > 5 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
TimerReset
@ -110,8 +115,22 @@
<FilenameDisable2> Var( DirImage + "/disable2_get15discount.png" )</FilenameDisable2>
<EventClick>
; goto lid straw
Var Seeker.UseGet15Discount = 1
Var PreviousSeeker.UseGet15Discount = 1
DEBUGVAR FromCheckMemberPoint
If FromCheckMemberPoint = 1 Then
Var PointTaobinStr = "0/00-00-00-0000/cash"
Var PointCrm = "0"
Var GetScore = 1
Var Cid = 39
DEBUGVAR "AddData 39"
DEBUGVAR TNumberTaobinMemberXXX
AddData Cid TNumberTaobinMemberXXX PointTaobinStr PointCrm GetScore
Else
Var Seeker.UseGet15Discount = 1
Var PreviousSeeker.UseGet15Discount = 1
EndIf
Var PopUpState2 = "Invisible"
Var PopUpState1 = "Enable"
Var Timeout = 0
@ -129,7 +148,11 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
</EventClick>
</Button>
@ -144,7 +167,11 @@
<EventClick>
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
</EventClick>
</Button>

11
xml/page_display_get_drink_5_baht.xml
View file

@ -23,6 +23,13 @@
Var PopUpState1 = "Invisible"
Var PopUpState2 = "Invisible
EndIf
If FromCheckMemberPoint = 1 Then
Var PointTaobinStr = "0/00-00-00-0000/cash"
Var PointCrm = "0"
Var GetScore = "0"
AddData 40 TNumberTaobinMemberXXX PointTaobinStr PointCrm GetScore
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
@ -43,7 +50,7 @@
EndIf
Else
If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member3.xml"
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -139,7 +146,7 @@
Refresh
Else
If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member3.xml"
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf

32
xml/page_enable_credit_card.xml
View file

@ -20,7 +20,13 @@
EndIf
If EnableCreditCard = "true" Then
Var showStatusText = "OK"
If NetworkStatus = "ACTIVATE" Then
Var showStatusText = "OK"
Else
Var showStatusText = "NETWORK DOWN"
EndIf
Else
Var showStatusText = "OFF"
EndIf
@ -274,8 +280,23 @@
; Validate
If PassPhrase = "16583" Then
Var EnableCreditCard = "true"
Var showStatusText = "OK"
If NetworkStatus = "ACTIVATE" Then
Var EnableCreditCard = "true"
Var showStatusText = "OK"
CacheVarStr "put" EnableCreditCard
Var PassPhrase = ""
Else
Var EnableCreditCard = ""
Var showStatusText = "NETWORK DOWN"
CacheVarStr "put" EnableCreditCard
Var PassPhrase = ""
EndIf
Refresh
Else
@ -284,6 +305,11 @@
Var EnableCreditCard = ""
Var showStatusText = "OFF"
CacheVarStr "put" EnableCreditCard
Var PassPhrase = ""
Refresh
Else

13
xml/page_payment_cash-MYR.xml
View file

@ -454,7 +454,17 @@
If EnableCreditCard = "true" Then
Var PayState5 = "Enable"
DEBUGVAR EnableCreditCard
DEBUGVAR SELLONLINE
DEBUGVAR SELLSTATUAS
DEBUGVAR NetworkStatus
DEBUGVAR NetworkDown
If NetworkStatus = "ACTIVATE" Then
Var PayState5 = "Enable"
Else
Var PayState5 = "Disable"
EndIf
DEBUGVAR EnableCreditCard
Else
Var PayState5 = "Disable"
EndIf
@ -690,6 +700,7 @@
Var QR_POPUP = "/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var alphaState = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1

136
xml/page_payment_credit2.xml
View file

@ -932,91 +932,95 @@
<Function2>
If NewFlowPaymentCode = 1 Then
Var ShowSentSmsText = "Invisible"
Var Timeout = 0
Var ShowSentSmsText = "Invisible"
Var Timeout = 0
If PinNumberUser = PinNumber Then
If PinNumberUser = PinNumber Then
Var SumCreditAmount = CoffeeCredit
Var SumCreditAmount = CoffeeCredit
If SumCreditAmount >= PayAmountSubDiscount Then
If SumCreditAmount >= PayAmountSubDiscount Then
Open "ROOT/taobin_project/xml/page_payment_credit3-0.xml"
Else
Var ShowNotEnoughText = "Enable"
Var Seeker.TNumberTaobinCredit = TelephoneNumber
Var Seeker.CoffeePinNumber = PinNumber
Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml"
EndIf
Open "ROOT/taobin_project/xml/page_payment_credit3-0.xml"
Else
Var ShowNotEnoughText = "Enable"
Var Seeker.TNumberTaobinCredit = TelephoneNumber
Var Seeker.CoffeePinNumber = PinNumber
Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml"
Var ShowErrorText = "Enable"
Var PinNumber = ""
Var ShowTextNumber1 = "Invisible"
Var ShowTextNumber2 = "Invisible"
Var ShowTextNumber3 = "Invisible"
Var ShowTextNumber4 = "Invisible"
EndIf
Var ReqFlag = 0
Refresh
Else
Var ShowSentSmsText = "Invisible"
Var Timeout = 0
Var ShowErrorText = "Enable"
Var PinNumber = ""
Var ShowTextNumber1 = "Invisible"
Var ShowTextNumber2 = "Invisible"
Var ShowTextNumber3 = "Invisible"
Var ShowTextNumber4 = "Invisible"
If PinNumberUser = PinNumber Then
Var SumCreditAmount = CoffeeCredit
If SumCreditAmount >= PayAmountSubDiscount Then
If ReqAdddata22 = 0 Then
;If Seeker = "next" Then
; Var Curr = "curr"
; If TelephoneNumber = Curr.CurrCreditTelNum Then
; Var SumCreditAmount = CoffeeCredit + Curr.CurrCreditAmount
; EndIf
;EndIf
Var useCreditAmount = PayAmountSubDiscount
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
Var ReqAdddata22 = 1
EndIf
Else
Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
EndIf
Else
Var ShowErrorText = "Enable"
Var PinNumber = ""
Var ShowTextNumber1 = "Invisible"
Var ShowTextNumber2 = "Invisible"
Var ShowTextNumber3 = "Invisible"
Var ShowTextNumber4 = "Invisible"
EndIf
;Var DataTmp = TelephoneNumber + "/"
;Var DataTmp = DataTmp + PinNumber
;GETACCEXT DataTmp 19
Var ReqFlag = 0
Refresh
EndIf
Var ReqFlag = 0
Refresh
</Function2>
<Function3>
Var ShowSentSmsText = "Invisible"
Var Timeout = 0
If PinNumberUser = PinNumber Then
Var SumCreditAmount = CoffeeCredit
If SumCreditAmount >= PayAmountSubDiscount Then
If ReqAdddata22 = 0 Then
;If Seeker = "next" Then
; Var Curr = "curr"
; If TelephoneNumber = Curr.CurrCreditTelNum Then
; Var SumCreditAmount = CoffeeCredit + Curr.CurrCreditAmount
; EndIf
;EndIf
Var useCreditAmount = PayAmountSubDiscount
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
Var ReqAdddata22 = 1
EndIf
Else
Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
EndIf
Else
Var ShowErrorText = "Enable"
Var PinNumber = ""
Var ShowTextNumber1 = "Invisible"
Var ShowTextNumber2 = "Invisible"
Var ShowTextNumber3 = "Invisible"
Var ShowTextNumber4 = "Invisible"
EndIf
;Var DataTmp = TelephoneNumber + "/"
;Var DataTmp = DataTmp + PinNumber
;GETACCEXT DataTmp 19
Var ReqFlag = 0
Refresh
</Function3>

19
xml/page_payment_credit3-Topup.xml
View file

@ -35,7 +35,7 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var posX = 430
Var posX = 270
Else
@ -58,7 +58,16 @@
Var text_show_amountInvalid = "/text_show_amountInvalid.png"
Var text_show_amountInvalid2 = "/text_show_amountInvalid2.png"
Var Min = PayAmountSubDiscount
If SumCreditAmount < PayAmountSubDiscount Then
Var Text_X = 246
Var Min = PayAmountSubDiscount - SumCreditAmount
Else
Var Text_X = 263
Var Min = PayAmountSubDiscount
EndIf
;Var Min = PayAmountSubDiscount
Var Max = 5000
;inter-image
@ -634,7 +643,7 @@ If ViewBill > 0 Then
<Width> 250 </Width>
<Font> KanitRegularTTF </Font>
<Color> 0xDE794E </Color>
<Value> PayAmountSubDiscount </Value>
<Value> Min </Value>
</Text>
@ -648,8 +657,8 @@ If ViewBill > 0 Then
<Image>
<X> 188 </X>
<Y> 640 </Y>
<X> Text_X </X>
<Y> 650 </Y>
<Refresh> "Enable" </Refresh>
<Filename> Var( DirImage + text_44 )</Filename>
</Image>

21
xml/page_payment_credit3-TopupCode.xml
View file

@ -56,14 +56,21 @@
If ReqAdddata42 = 1 Then
If Timeout = 3 Then
If ReqAdddata22 = 0 Then
GenHashWithTimeStamp PointCrm
Var useCreditAmount = PayAmountSubDiscount
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
Var ReqAdddata22 = 1
Var Timeout = 0
Var SumCreditAndCouponAmount = IntAmoutCoupon + SumCreditAmount
If SumCreditAndCouponAmount < PayAmountSubDiscount Then
Var SumCreditAmount = SumCreditAndCouponAmount
Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml"
Else
GenHashWithTimeStamp PointCrm
Var useCreditAmount = PayAmountSubDiscount
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
Var ReqAdddata22 = 1
Var Timeout = 0
EndIf
EndIf
EndIf
EndIf