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

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-07-26 16:40:44 +07:00
commit 4c17118f9a
11 changed files with 380 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/sgp/image/collectiing/QR_contract.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 28 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
inter/sgp/image/collectiing/text_11.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 63 KiB

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

@ -1614,6 +1614,14 @@
Var BREW_COUNT_DOWN_FROM_APP = "off"
Var CountDownBrewing = 2
</EventUnitTest2>
<EventUnitTest3>
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
</EventUnitTest3>
<EventUnitTest4>
; test drinkfail with phone number
Var TelephoneNumberProblem = "12345678"
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
</EventUnitTest4>
;
;
;

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

@ -162,6 +162,24 @@
INT TaobinPDPA
DEBUGVAR TaobinName
Var CatchNotMember = 0
If TaobinName = "" Then
Var CatchNotMember = 1
Endif
If TaobinName = "-" Then
Var CatchNotMember = 1
EndIf
DEBUGVAR CatchNotMember
If CatchNotMember = 1 Then
Var TaobinName = ""
DEBUGVAR MemberPrompt
Open MemberPrompt
EndIf
Var TelephoneNumber = TelephoneNumberX
Var TNumberTaobinMemberXXX = TelephoneNumber

267
inter/sgp/xml/page_drinkfail_sg.lxml Normal file
View file

@ -0,0 +1,267 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xEFEDEA" </Background>
<Volume> SoundVolume </Volume>
<Refresh> "Partial" </Refresh>
<EventOpen>
; On open
Var DirImage = CountryRootPath + "/image/collectiing/"
Var Timeout = 0
StopLongPlay
Var MachineErrorDetailAll = MachineErrorDetail + " / "
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
DEBUGVAR TelephoneNumberProblem
; try-get-user
Var payload = "SG/" + TelephoneNumberProblem
Var payload = payload + "/-"
Var payload = payload + "/-"
Var payload = payload + "/-"
Var payload = payload + "/-"
DEBUGVAR payload
Var Seeker.IsMember = 0
Var SendProblemOfMember = 0
Var ShowQRByNoMember = "Invisible"
Var TaobinName = ""
If TelephoneNumberProblem = "" Then
Var ShowQRByNoMember = "Enable"
Else
GETACCEXT payload 35
EndIf
Var StepX = 1
Var Ext1a = ""
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
If Timeout > 30 Then
If SendProblemOfMember = 1 Then
DEBUGVAR TelephoneNumberProblem
StrLen TelephoneNumberProblem TelNumLen
If TelNumLen >= MinPhoneNumber Then
Var ProblemID = 7
Var ChooseProblem = "taobin purchasing problems"
If Seeker.PayWithQR = 1 Then
Var VendingTSIDProblem = VendingTSIDTmp
If Seeker.CampaignPayChanel = "promptpay" Then
Var ProblemID = 8
Var ChooseProblem = "taobin purchasing problems(Void Failed)"
EndIf
Else
Var VendingTSIDProblem = VendingTSID
EndIf
PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem
EndIf
EndIf
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
Else
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
EndIf
TimerReset
</EventTimeout>
;include="ROOT/taobin_project/inc/video.inc"
<EventActionOk>
If StepX = 1 Then
If Ext1a = "ok" Then
Var TaobinName = Ext1d
If TaobinName = "" Then
Var Seeker.IsMember = 0
Else
If TaobinName = "-" Then
Var Seeker.IsMember = 0
Else
Var Seeker.IsMember = 1
EndIf
EndIf
DEBUGVAR Seeker.IsMember
If Seeker.IsMember = 1 Then
SAVELOG "Already member, will send problem"
Var SendProblemOfMember = 1
Else
SAVELOG "Not member, show QR"
Var SendProblemOfMember = 0
Var ShowQRByNoMember = "Enable"
EndIf
Else
Var Seeker.IsMember = 0
SAVELOG "StepX.error, show QR"
Var ShowQRByNoMember = "Enable"
EndIf
EndIf
</EventActionOk>
<EventActionError>
If StepX = 1 Then
SAVELOG "ActionError show QR"
Var ShowQRByNoMember = "Enable"
EndIf
</EventActionError>
<Image>
<X> 43 </X>
<Y> 428 </Y>
<Filename> Var( DirImage + "/text_11.png" ) </Filename>
</Image>
<Image>
<X> 429 </X>
<Y> 1301 </Y>
<State> ShowQRByNoMember </State>
<Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
</Image>
;<Image>
;<X> 190 </X>
;<Y> 1548 </Y>
;<Filename> Var( DirImage + "/text13.png" ) </Filename>
;</Image>
<Button>
<X> 392 </X>
<Y> 1720 </Y>
<Filename> Var( DirImage + "/bn_close.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
StrLen TelephoneNumberProblem TelNumLen
If SendProblemOfMember = 1 Then
If TelNumLen >= MinPhoneNumber Then
Var ProblemID = 7
Var ChooseProblem = "taobin purchasing problems"
If Seeker.PayWithQR = 1 Then
Var VendingTSIDProblem = VendingTSIDTmp
If Seeker.CampaignPayChanel = "promptpay" Then
Var ProblemID = 8
Var ChooseProblem = "taobin purchasing problems(Void Failed)"
EndIf
Else
Var VendingTSIDProblem = VendingTSID
EndIf
PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem
EndIf
EndIf
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
Else
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
</EventClick>
</Button>
<Text>
<X> 5 </X>
<Y> 1868 </Y>
<Size> 24 </Size>
<Align> Center </Align>
<Width> 1080 </Width>
<Font> RobotoRegular </Font>
<Color> 0xDE794E </Color>
<Value> MachineErrorDetailAll </Value>
</Text>
</Popup>

14
inter/sgp/xml/page_member_prompt.lxml
View file

@ -9,6 +9,17 @@
Var DisplayPrompt = "Enable"
Var DisplayQR = "Invisible"
If CatchNotMember = 1 Then
Var DisplayPrompt = "Invisible"
Var DisplayQR = "Enable"
Var Timeout = 10
Var CatchNotMember = 0
Else
Var Timeout = 0
EndIf
; img
Var ImgDir = CountryRootPath + "/image/page_member/"
Var PromptDialogImg = ImgDir + "ask_member_dialog.png"
@ -17,8 +28,7 @@
Var YesPressButton = ImgDir + "bp_yes.png"
Var NoPressButton = ImgDir + "bp_no.png"
Var QRImg = ImgDir + "qr_regis.png"
Var Timeout = 0
Var UseSGPCollectFlag = 0
DEBUGVAR YesButton

32
xml/page_board.xml
View file

@ -862,6 +862,14 @@
Var SettingIgnoreCollectPoint = 0
EndIf
READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev
STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg
If enable_pt_mode_by_cfg = "true" Then
DEBUGVAR enable_pt_mode_by_cfg
Var SettingIgnoreCollectPoint = 0
EndIf
Var SettingVideoBrewingUseCommon = 1
Var MinPhoneNumber = 8
@ -1270,7 +1278,7 @@
DEBUGVAR ProfileIndex[9]
DEBUGVAR ProfileIndex[10]
PRICE "Reload" ""
</EventUnitTest5>
</EventUnitTest5>
<EventUnitTest6>
@ -1315,6 +1323,28 @@
</EventUnitTest7>
<EventUnitTest8>
Var XMLProfile = "$Discount90Per"
CacheVarStr "put" XMLProfile
PRICE "Reset" "-"
PRICE "Load" "-"
PRICE "CheckAndApply" XMLProfile
DEBUGVAR ProfileIndex[0]
DEBUGVAR ProfileIndex[1]
DEBUGVAR ProfileIndex[2]
DEBUGVAR ProfileIndex[3]
DEBUGVAR ProfileIndex[4]
DEBUGVAR ProfileIndex[5]
DEBUGVAR ProfileIndex[6]
DEBUGVAR ProfileIndex[7]
DEBUGVAR ProfileIndex[8]
DEBUGVAR ProfileIndex[9]
DEBUGVAR ProfileIndex[10]
PRICE "Reload" ""
</EventUnitTest8>
<EventDrink>
SAVELOG "EventDrink EventDrink EventDrink EventDrink EventDrink "
</EventDrink>

36
xml/page_drinkfail2.xml
View file

@ -15,7 +15,9 @@
DEBUGVAR Seeker.PromotionIDCurrentOrder
If CountryName = "Singapore" Then
Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
EndIf
@ -67,14 +69,22 @@
If CountryName = "Malaysia" Then
Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
Else
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
If CountryName = "Singapore" Then
Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
Else
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
EndIf
EndIf
Else
;inter-xml-open
If CountryName = "Malaysia" Then
Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
Else
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
If CountryName = "Singapore" Then
Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
Else
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
EndIf
EndIf
EndIf
@ -595,15 +605,19 @@
If CountryName = "Malaysia" Then
Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
Else
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
If CountryName = "Singapore" Then
Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
EndIf
EndIf

17
xml/page_thankyou.xml
View file

@ -271,7 +271,7 @@
If IgnoreNetCore = "true" Then
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -293,7 +293,7 @@
If RoadShow = "true" Then
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -376,7 +376,7 @@
If CART_INDEX >= 2 Then
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -412,6 +412,9 @@
If Seeker.CreditNotEnoughRefID = "" Then
Var CurrAmount = Seeker.CurrCreditAmount
If CoinAmount > 0 Then
Var CurrAmount = CurrAmount + CoinAmount
EndIf
Var CurrTelePhoneNum = Seeker.CurrCreditTelNum
Var CurrPinNum = Seeker.CurrCreditPinNum
Var RefID = ""
@ -470,7 +473,7 @@
EndIf
EndIf
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -481,7 +484,7 @@
Else
If CART_INDEX >= 2 Then
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -557,7 +560,7 @@
EndIf
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -568,7 +571,7 @@
Else
If CART_INDEX >= 2 Then
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"

18
xml/page_topup_credit3_cash_warning.xml
View file

@ -110,17 +110,17 @@
Open "ROOT/taobin_project/xml/page_member_topupCash.xml"
Else
If TopupFromPage = "payment" Then
If NotEnoughPayment = 1 Then
If ReqPayWithCash = 0 Then
Var TelephoneNumber = Seeker.TNumberTaobinCredit
If ReqPayWithCash = 0 Then
Var TelephoneNumber = Seeker.TNumberTaobinCredit
If NotEnoughPayment = 1 Then
Var useCreditAmount = SumCreditAmount
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
Var ReqPayWithCash = 1
Else
Var useCreditAmount = PayAmountSubDiscount
EndIf
Else
Open "ROOT/taobin_project/xml/page_payment_credit3-TopupCash.xml"
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
Var ReqPayWithCash = 1
EndIf
Else
Open "ROOT/taobin_project/xml/page_topup_credit3-TopupCash.xml"