diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 91d5af8a..76db5770 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -296,9 +296,12 @@ DEBUGVAR PriceDrink DEBUGVAR PriceDrinkTmp + DEBUGVAR OriginalPrice + DEBUGVAR TOPPING_PRICE If FromCocoa77Pro = 1 Then - Var PriceDiff = OriginalPrice - PromotionPriceDrink + Var OriginalPriceWithTopping = OriginalPrice + TOPPING_PRICE + Var PriceDiff = OriginalPriceWithTopping - PromotionPriceDrink Var DiscountDrink = PriceDiff Var Seeker.CampaignPPrice = PromotionPriceDrink EndIf diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index 63d08432..f69b21de 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -919,10 +919,7 @@ ;Open PreviseXMLFileName2 DEBUGVAR OpenFromXML - Var FromPowerUpPro = 0 - Var FromEnergyDrink1BathPro = 0 - Var FromCoffeeDrink1BathPro = 0 - Var FromNamHomCoconutPro = 0 + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" @@ -6247,6 +6244,7 @@ Var FromPowerUpPro = 0 Var FromEnergyDrink1BathPro = 0 + Var FromCocoa77Pro = 0 If Seeker = "next" Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"