diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml index aafd7ae2..972e797b 100644 --- a/xml/page_payment_cashMore.xml +++ b/xml/page_payment_cashMore.xml @@ -11,12 +11,14 @@ ;SAVELOG NameDrink ;SAVELOG NameDrinkTH ;SAVELOG DrinkDescription + Var PriceDrink = PriceDrinkMulti SAVELOG PriceDrink ;SAVELOG topping1 ;SAVELOG topping2 ;SAVELOG topping3 DEBUGVAR video_menu_0 + DEBUGVAR PriceDrinkMulti Var FlagQROpened = 0 @@ -25,7 +27,7 @@ Var VendingCampaign = Seeker.IntVendingCampaign Var Seeker.VendingCampaign = Seeker.IntVendingCampaign - Var PayAmount = PriceDrink + Var PayAmount = PriceDrinkMulti Var LOADING_STATE = "Invisible" @@ -45,7 +47,7 @@ Var CoinInCounter = 0 Var CancelNumber = 3 - Var PayAmount = PriceDrink + Var PayAmount = PriceDrinkMulti Var RemainAmount = PayAmount - Seeker.IntVendingCampaign Var RemainAmount = RemainAmount - CoinAmount Var RemainAmount = RemainAmount - Seeker.IntVendingCredit @@ -500,7 +502,7 @@ Var TelephoneNumber = "0899999999" Var ServiceType = "coffee" Var ECommerce = "" - Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + PriceDrinkMulti Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + DiscountDrink Var ECommerce = ECommerce + "/" @@ -884,7 +886,7 @@ Var cart3_en = "Invisible" - Var PriceDrink = 0 + Var PriceDrinkMulti = 0 @@ -894,7 +896,7 @@ Var cart1_price = "" + CART1_PRICE Var cart1_en = "Enable" - Var PriceDrink = CART1_PRICE + Var PriceDrinkMulti = CART1_PRICE EndIf If CART_COUNT >= 2 Then @@ -903,7 +905,7 @@ Var cart2_price = "" + CART2_PRICE Var cart2_en = "Enable" - Var PriceDrink = PriceDrink + CART2_PRICE + Var PriceDrinkMulti = PriceDrinkMulti + CART2_PRICE EndIf If CART_COUNT = 3 Then @@ -912,13 +914,13 @@ Var cart3_price = "" + CART3_PRICE Var cart3_en = "Enable" - Var PriceDrink = PriceDrink + CART3_PRICE + Var PriceDrinkMulti = PriceDrinkMulti + CART3_PRICE EndIf - Var ServiceAmountSum = PriceDrink + Var ServiceAmountSum = PriceDrinkMulti If CART_COUNT >= 1 Then @@ -934,7 +936,7 @@ Var QRCODE4 = BoxID Var QRCODE5 = SelectSlot Var QRCODE6 = SelectDrink - Var QRCODE7 = PriceDrink + Var QRCODE7 = PriceDrinkMulti Var QRCODE8 = "" Var SessionID2 = SelectSlot + ":" @@ -945,7 +947,7 @@ Var TelephoneNumberQR = "0899999999" Var ServiceType = "coffee-multi" Var ECommerceQR = "" - Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + PriceDrinkMulti Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" @@ -1177,7 +1179,7 @@ Var TelephoneNumberQR = "0899999999" Var ServiceType = "coffee-multi" Var ECommerceQR = "" - Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + PriceDrinkMulti Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" @@ -1300,7 +1302,7 @@ Var TelephoneNumberQR = "0899999999" Var ServiceType = "coffee-multi" Var ECommerceQR = "" - Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + PriceDrinkMulti Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + DiscountDrink Var ECommerceQR = ECommerceQR + "/" diff --git a/xml/page_payment_multi.xml b/xml/page_payment_multi.xml index 0d1c1e86..e19845bf 100644 --- a/xml/page_payment_multi.xml +++ b/xml/page_payment_multi.xml @@ -42,7 +42,7 @@ Var cart2_en = "Invisible" Var cart3_en = "Invisible" - Var PriceDrink = 0 + Var PriceDrinkMulti = 0 Var CART_INDEX = 0 @@ -55,7 +55,7 @@ Var cart1_price = "" + CART1_PRICE Var cart1_en = "Enable" - Var PriceDrink = PriceDrink + CART1_PRICE + Var PriceDrinkMulti = PriceDrinkMulti + CART1_PRICE EndIf @@ -65,7 +65,7 @@ Var cart2_price = "" + CART2_PRICE Var cart2_en = "Enable" - Var PriceDrink = PriceDrink + CART2_PRICE + Var PriceDrinkMulti = PriceDrinkMulti + CART2_PRICE EndIf @@ -75,7 +75,7 @@ Var cart3_price = "" + CART3_PRICE Var cart3_en = "Enable" - Var PriceDrink = PriceDrink + CART3_PRICE + Var PriceDrinkMulti = PriceDrinkMulti + CART3_PRICE EndIf @@ -89,7 +89,7 @@ Var cart1_price = "" + CART1_PRICE Var cart1_en = "Enable" - Var PriceDrink = PriceDrink + CART1_PRICE + Var PriceDrinkMulti = PriceDrinkMulti + CART1_PRICE EndIf @@ -99,7 +99,7 @@ Var cart2_price = "" + CART2_PRICE Var cart2_en = "Enable" - Var PriceDrink = PriceDrink + CART2_PRICE + Var PriceDrinkMulti = PriceDrinkMulti + CART2_PRICE EndIf @@ -109,11 +109,11 @@ Var cart3_price = "" + CART3_PRICE Var cart3_en = "Enable" - Var PriceDrink = PriceDrink + CART3_PRICE + Var PriceDrinkMulti = PriceDrinkMulti + CART3_PRICE EndIf EndIf - Var ServiceAmountSum = PriceDrink + Var ServiceAmountSum = PriceDrinkMulti ; On open @@ -140,7 +140,7 @@ Var QRCODE4 = BoxID Var QRCODE5 = SelectSlot Var QRCODE6 = SelectDrink - Var QRCODE7 = PriceDrink + Var QRCODE7 = PriceDrinkMulti Var QRCODE8 = "" Var CountStepPackPayment = 0 @@ -216,7 +216,7 @@ Var cartNumText = cartNumText + " แก้ว" EndIf - Var PayAmount = PriceDrink + Var PayAmount = PriceDrinkMulti Var RemainAmountStr = "" + PayAmount Var showRemaining = charOfBaht + RemainAmountStr @@ -267,7 +267,7 @@ ;Var TelephoneNumberQR = "0899999999" ;Var ServiceType = "coffee-multi" ;Var ECommerceQR = "" - ;Var ECommerceQR = ECommerceQR + PriceDrink + ;Var ECommerceQR = ECommerceQR + PriceDrinkMulti ;Var ECommerceQR = ECommerceQR + "/" ;Var ECommerceQR = ECommerceQR + DiscountDrink ;Var ECommerceQR = ECommerceQR + "/"