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-07-08 15:03:08 +07:00
commit 79fc27dc9b
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xml/page_payment.xml
View file

@ -296,9 +296,12 @@
DEBUGVAR PriceDrink DEBUGVAR PriceDrink
DEBUGVAR PriceDrinkTmp DEBUGVAR PriceDrinkTmp
DEBUGVAR OriginalPrice
DEBUGVAR TOPPING_PRICE
If FromCocoa77Pro = 1 Then If FromCocoa77Pro = 1 Then
Var PriceDiff = OriginalPrice - PromotionPriceDrink Var OriginalPriceWithTopping = OriginalPrice + TOPPING_PRICE
Var PriceDiff = OriginalPriceWithTopping - PromotionPriceDrink
Var DiscountDrink = PriceDiff Var DiscountDrink = PriceDiff
Var Seeker.CampaignPPrice = PromotionPriceDrink Var Seeker.CampaignPPrice = PromotionPriceDrink
EndIf EndIf

6
xml/page_topping_select7.xml
View file

@ -919,10 +919,7 @@
;Open PreviseXMLFileName2 ;Open PreviseXMLFileName2
DEBUGVAR OpenFromXML DEBUGVAR OpenFromXML
Var FromPowerUpPro = 0 TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
Var FromEnergyDrink1BathPro = 0
Var FromCoffeeDrink1BathPro = 0
Var FromNamHomCoconutPro = 0
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
@ -6247,6 +6244,7 @@
Var FromPowerUpPro = 0 Var FromPowerUpPro = 0
Var FromEnergyDrink1BathPro = 0 Var FromEnergyDrink1BathPro = 0
Var FromCocoa77Pro = 0
If Seeker = "next" Then If Seeker = "next" Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"