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

This commit is contained in:
Pakin 2024-07-01 16:52:10 +07:00
commit 4a53b41230
189 changed files with 35736 additions and 1022 deletions

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