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

fix conflict

Browse source
This commit is contained in:
miggaze 2024-07-01 16:13:02 +07:00
commit 1aa230bc9f
313 changed files with 104942 additions and 5139 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xml/page_payment.xml
View file

@ -96,6 +96,7 @@
EndIf
DEBUGVAR PriceDrink
DEBUGVAR PromotionPriceDrink
@ -296,6 +297,12 @@
DEBUGVAR PriceDrink
DEBUGVAR PriceDrinkTmp
If FromCocoa77Pro = 1 Then
Var PriceDiff = OriginalPrice - PromotionPriceDrink
Var DiscountDrink = PriceDiff
Var Seeker.CampaignPPrice = PromotionPriceDrink
EndIf
If FromRerunPro = 1 Then
Var PriceDiff = PriceDrink - PromoPriceDrink
Var Seeker.VendingCode = RerunProCode