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

[DUBAI] Fixed credit card payment method

Browse source
This commit is contained in:
Kenta420 2024-09-24 16:30:15 +07:00
parent 58d7b37a2c
commit dbcfc593ea
7 changed files with 297 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

452
inter/uae_dubai/xml/page_brewing3.lxml
View file

File diff suppressed because it is too large Load diff

10
inter/uae_dubai/xml/page_catalog_group_coffee.lxml
View file

@ -3469,7 +3469,7 @@
Var NameLang[0][4] = "" Var NameLang[0][4] = ""
Var NameLang[0][5] = "" Var NameLang[0][5] = ""
Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][2] = "" Var DescLang[0][2] = ""
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
@ -7023,7 +7023,7 @@
Var NameLang[0][4] = "" Var NameLang[0][4] = ""
Var NameLang[0][5] = "" Var NameLang[0][5] = ""
Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][2] = "" Var DescLang[0][2] = ""
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
@ -7035,7 +7035,7 @@
Var NameLang[1][4] = "" Var NameLang[1][4] = ""
Var NameLang[1][5] = "" Var NameLang[1][5] = ""
Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][2] = "" Var DescLang[1][2] = ""
Var DescLang[1][3] = "" Var DescLang[1][3] = ""
Var DescLang[1][4] = "" Var DescLang[1][4] = ""
@ -10311,7 +10311,7 @@
Var NameLang[1][4] = "" Var NameLang[1][4] = ""
Var NameLang[1][5] = "" Var NameLang[1][5] = ""
Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][2] = "" Var DescLang[1][2] = ""
Var DescLang[1][3] = "" Var DescLang[1][3] = ""
Var DescLang[1][4] = "" Var DescLang[1][4] = ""
@ -14645,7 +14645,7 @@
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "Iced MOCHA" Var NameLang[1][0] = "Iced MOCHA"
Var NameLang[1][1] = "موكا مثلج" Var NameLang[1][1] = "موكا مثلجة"
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""
Var NameLang[1][4] = "" Var NameLang[1][4] = ""

10
inter/uae_dubai/xml/page_catalog_group_health.lxml
View file

@ -1828,7 +1828,7 @@
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "Iced MOCHA" Var NameLang[1][0] = "Iced MOCHA"
Var NameLang[1][1] = "موكا مثلج" Var NameLang[1][1] = "موكا مثلجة"
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""
Var NameLang[1][4] = "" Var NameLang[1][4] = ""
@ -2102,7 +2102,7 @@
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "Iced MOCHA" Var NameLang[1][0] = "Iced MOCHA"
Var NameLang[1][1] = "موكا مثلج" Var NameLang[1][1] = "موكا مثلجة"
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""
Var NameLang[1][4] = "" Var NameLang[1][4] = ""
@ -5384,7 +5384,7 @@
Var NameLang[0][4] = "" Var NameLang[0][4] = ""
Var NameLang[0][5] = "" Var NameLang[0][5] = ""
Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice" Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice"
Var DescLang[0][1] = "شاي تايوان، ليمون، ماء وثلج" Var DescLang[0][1] = "شاي تايوان والليمون والماء والثلج"
Var DescLang[0][2] = "" Var DescLang[0][2] = ""
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
@ -5396,7 +5396,7 @@
Var NameLang[1][4] = "" Var NameLang[1][4] = ""
Var NameLang[1][5] = "" Var NameLang[1][5] = ""
Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice" Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice"
Var DescLang[1][1] = "شاي تايوان، ليمون، ماء وثلج" Var DescLang[1][1] = "شاي تايوان والليمون والماء والثلج"
Var DescLang[1][2] = "" Var DescLang[1][2] = ""
Var DescLang[1][3] = "" Var DescLang[1][3] = ""
Var DescLang[1][4] = "" Var DescLang[1][4] = ""
@ -7040,7 +7040,7 @@
Var NameLang[1][4] = "" Var NameLang[1][4] = ""
Var NameLang[1][5] = "" Var NameLang[1][5] = ""
Var DescLang[1][0] = "Thai tea, Limenade, Water, Ice" Var DescLang[1][0] = "Thai tea, Limenade, Water, Ice"
Var DescLang[1][1] = "شاي تايلاندي، ليمون، ماء، ثلج" Var DescLang[1][1] = "الشاي التايلاندي، الليمونيد، الماء، الثلج"
Var DescLang[1][2] = "" Var DescLang[1][2] = ""
Var DescLang[1][3] = "" Var DescLang[1][3] = ""
Var DescLang[1][4] = "" Var DescLang[1][4] = ""

4
inter/uae_dubai/xml/page_catalog_group_recommend.lxml
View file

@ -6469,7 +6469,7 @@
Var NameLang[0][4] = "" Var NameLang[0][4] = ""
Var NameLang[0][5] = "" Var NameLang[0][5] = ""
Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][2] = "" Var DescLang[0][2] = ""
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
@ -6481,7 +6481,7 @@
Var NameLang[1][4] = "" Var NameLang[1][4] = ""
Var NameLang[1][5] = "" Var NameLang[1][5] = ""
Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][2] = "" Var DescLang[1][2] = ""
Var DescLang[1][3] = "" Var DescLang[1][3] = ""
Var DescLang[1][4] = "" Var DescLang[1][4] = ""

4
inter/uae_dubai/xml/page_catalog_group_recommend_multi_pro.lxml
View file

@ -5850,7 +5850,7 @@
Var NameLang[0][4] = "" Var NameLang[0][4] = ""
Var NameLang[0][5] = "" Var NameLang[0][5] = ""
Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][2] = "" Var DescLang[0][2] = ""
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
@ -5862,7 +5862,7 @@
Var NameLang[1][4] = "" Var NameLang[1][4] = ""
Var NameLang[1][5] = "" Var NameLang[1][5] = ""
Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع." Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][2] = "" Var DescLang[1][2] = ""
Var DescLang[1][3] = "" Var DescLang[1][3] = ""
Var DescLang[1][4] = "" Var DescLang[1][4] = ""

10
inter/uae_dubai/xml/page_catalog_group_tea.lxml
View file

@ -2923,7 +2923,7 @@
Var NameLang[0][4] = "" Var NameLang[0][4] = ""
Var NameLang[0][5] = "" Var NameLang[0][5] = ""
Var DescLang[0][0] = "Thai Tea, Limenade, Sugar & Water" Var DescLang[0][0] = "Thai Tea, Limenade, Sugar & Water"
Var DescLang[0][1] = "الشاي التايلاندي والليمون والسكر والماء" Var DescLang[0][1] = "شاي تايلاندي، ليمون، سكر وماء"
Var DescLang[0][2] = "" Var DescLang[0][2] = ""
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
@ -2935,7 +2935,7 @@
Var NameLang[1][4] = "" Var NameLang[1][4] = ""
Var NameLang[1][5] = "" Var NameLang[1][5] = ""
Var DescLang[1][0] = "Thai Tea, Limenade, Sugar & Water" Var DescLang[1][0] = "Thai Tea, Limenade, Sugar & Water"
Var DescLang[1][1] = "الشاي التايلاندي والليمون والسكر والماء" Var DescLang[1][1] = "شاي تايلاندي، ليمون، سكر وماء"
Var DescLang[1][2] = "" Var DescLang[1][2] = ""
Var DescLang[1][3] = "" Var DescLang[1][3] = ""
Var DescLang[1][4] = "" Var DescLang[1][4] = ""
@ -2947,7 +2947,7 @@
Var NameLang[2][4] = "" Var NameLang[2][4] = ""
Var NameLang[2][5] = "" Var NameLang[2][5] = ""
Var DescLang[2][0] = "Thai Tea, Limenade, Sugar & Water" Var DescLang[2][0] = "Thai Tea, Limenade, Sugar & Water"
Var DescLang[2][1] = "الشاي التايلاندي والليمون والسكر والماء" Var DescLang[2][1] = "شاي تايلاندي، ليمون، سكر وماء"
Var DescLang[2][2] = "" Var DescLang[2][2] = ""
Var DescLang[2][3] = "" Var DescLang[2][3] = ""
Var DescLang[2][4] = "" Var DescLang[2][4] = ""
@ -11143,7 +11143,7 @@
Var NameLang[0][4] = "" Var NameLang[0][4] = ""
Var NameLang[0][5] = "" Var NameLang[0][5] = ""
Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice" Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice"
Var DescLang[0][1] = "شاي تايوان، ليمون، ماء وثلج" Var DescLang[0][1] = "شاي تايوان والليمون والماء والثلج"
Var DescLang[0][2] = "" Var DescLang[0][2] = ""
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
@ -11155,7 +11155,7 @@
Var NameLang[1][4] = "" Var NameLang[1][4] = ""
Var NameLang[1][5] = "" Var NameLang[1][5] = ""
Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice" Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice"
Var DescLang[1][1] = "شاي تايوان، ليمون، ماء وثلج" Var DescLang[1][1] = "شاي تايوان والليمون والماء والثلج"
Var DescLang[1][2] = "" Var DescLang[1][2] = ""
Var DescLang[1][3] = "" Var DescLang[1][3] = ""
Var DescLang[1][4] = "" Var DescLang[1][4] = ""

93
xml/page_payment_cash-UAE.xml
View file

@ -741,6 +741,8 @@
Var Seeker.CreditCard = 1 Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef Var Seeker.CreditCardRef = CreditCardRef
CashlessReq SUCCESS
Open "ROOT/taobin_project/xml/page_thankyou.xml" Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf EndIf
@ -784,13 +786,17 @@
If VendingCashless = "ERROR" Then If VendingCashless = "ERROR" Then
Var Timeout = 0 If CoinInOK = 1 Then
;Var QRErrorFlag = 1 Else
If alphaState = "Enable" Then Var Timeout = 0
Var QRErrorState = "Enable" EndIf
Var LOADING_STATE = "Invisible"
EndIf ;Var QRErrorFlag = 1
If alphaState = "Enable" Then
Var QRErrorState = "Enable"
Var LOADING_STATE = "Invisible"
EndIf
EndIf EndIf
@ -802,9 +808,38 @@
<EventCashlessCard> <EventCashlessCard>
SAVELOG "EventCashlessCard"
Var CreditCardRef = ""
GenHashWithTimeStamp CreditCardRef
DEBUGVAR VendingCashless
Var QRCODE99 = ""
Var Timeout = 0
Var QRErrorState = "Invisible"
;add-pd-to-ref
Var CreditCardRef = CreditCardRef + "/"
Var CreditCardRef = CreditCardRef + SelectDrink
DEBUGVAR CreditCardRef
If VendingCashless = "READY" Then
If CoinInOK = 1 Then
Else
Var Timeout = 0
EndIf
Var QRErrorState = "Invisible"
Var QR_POPUP = "/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
EndIf
Refresh Refresh
</EventCashlessCard> </EventCashlessCard>
@ -1486,40 +1521,18 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
If alphaState = "Invisible" Then If alphaState = "Invisible" Then
If CoinInFlag = 0 Then If CoinInFlag = 0 Then
If CancelFlag = 0 Then If CancelFlag = 0 Then
Var QR_POPUP = "/img_popup8.png" Var QR_POPUP = "/img_popup8.png"
Var alphaState = "Enable" Var alphaState = "Enable"
Coin CARD Coin CARD
Var ReqPayInfoFromCashOther = 2
EndIf
EndIf
EndIf
Var ReqPayInfoFromCashOther = 2 Refresh
Var CreditCardRef = ""
GenHashWithTimeStamp CreditCardRef
DEBUGVAR VendingCashless
Var QRCODE99 = ""
Var Timeout = 0
Var QRErrorState = "Invisible"
;add-pd-to-ref
Var CreditCardRef = CreditCardRef + "/"
Var CreditCardRef = CreditCardRef + SelectDrink
DEBUGVAR CreditCardRef
;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
EndIf
EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>