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

This commit is contained in:
Pakin 2025-07-16 14:11:01 +07:00
commit bbc9525c35
348 changed files with 126954 additions and 46969 deletions

View file

@ -39,6 +39,16 @@ If FromPassionMintPro = 1 Then
Var Seeker.CampaignPPrice = PromotionPriceDrink
EndIf
If Seeker.PriceDiscount > 0 Then
Var PriceDiff = Seeker.PriceMain - Seeker.PriceDiscount
Var Seeker.VendingCode = Seeker.PriceTag
Var Seeker.CodeNumber = "00000000"
Var Seeker.CodeChannel = 1
Var Seeker.FreeVendingCampaign = 0
Var Seeker.IntVendingCampaign = PriceDiff
Var Seeker.VendingCampaignRI3 = PriceDiff
EndIf
If BoxID = 105005 Then
If Seeker.selected_a_drink = "12-05-02-0045" Then
Var PriceDiff = PriceDrink - 25
@ -99,6 +109,15 @@ If FromCoffeeDrink1BathPro = 1 Then
Var PromotionIDCurrentOrder = 3
EndIf
If Seeker.ProductCodeDiscount > 0 Then
Var PriceDiff = PriceDrink - PromotionPriceDrink
Var Seeker.VendingCode = "DFB" + PriceDiff
Var Seeker.CodeNumber = "00000000"
Var Seeker.CodeChannel = 1
Var Seeker.FreeVendingCampaign = 0
Var Seeker.IntVendingCampaign = PriceDiff
Var Seeker.VendingCampaignRI3 = PriceDiff
EndIf
If InternationalEnable = 1 Then