diff --git a/adv/taobin_adv_09.mp4 b/adv/taobin_adv_09.mp4 old mode 100755 new mode 100644 index 74e04053..69be8013 Binary files a/adv/taobin_adv_09.mp4 and b/adv/taobin_adv_09.mp4 differ diff --git a/adv/taobin_adv_10.mp4 b/adv/taobin_adv_10.mp4 old mode 100755 new mode 100644 index f1c917c1..ca1dc86d Binary files a/adv/taobin_adv_10.mp4 and b/adv/taobin_adv_10.mp4 differ diff --git a/adv/taobin_adv_11.mp4 b/adv/taobin_adv_11.mp4 old mode 100755 new mode 100644 index 943877f5..8ca370b3 Binary files a/adv/taobin_adv_11.mp4 and b/adv/taobin_adv_11.mp4 differ diff --git a/adv/taobin_adv_12.mp4 b/adv/taobin_adv_12.mp4 index 233b14a4..834416d4 100644 Binary files a/adv/taobin_adv_12.mp4 and b/adv/taobin_adv_12.mp4 differ diff --git a/adv/taobin_adv_menu2_09.mp4 b/adv/taobin_adv_menu2_09.mp4 old mode 100755 new mode 100644 index 478e792d..47dd559a Binary files a/adv/taobin_adv_menu2_09.mp4 and b/adv/taobin_adv_menu2_09.mp4 differ diff --git a/adv/taobin_adv_menu2_10.mp4 b/adv/taobin_adv_menu2_10.mp4 old mode 100755 new mode 100644 index 16df5c23..689147c4 Binary files a/adv/taobin_adv_menu2_10.mp4 and b/adv/taobin_adv_menu2_10.mp4 differ diff --git a/adv/taobin_adv_menu2_11.mp4 b/adv/taobin_adv_menu2_11.mp4 old mode 100755 new mode 100644 index ee87d476..b7fc4ba7 Binary files a/adv/taobin_adv_menu2_11.mp4 and b/adv/taobin_adv_menu2_11.mp4 differ diff --git a/adv/taobin_adv_menu2_12.mp4 b/adv/taobin_adv_menu2_12.mp4 index d03b248f..f2c58170 100644 Binary files a/adv/taobin_adv_menu2_12.mp4 and b/adv/taobin_adv_menu2_12.mp4 differ diff --git a/adv/taobin_adv_menu_09.mp4 b/adv/taobin_adv_menu_09.mp4 old mode 100755 new mode 100644 index 353b5c45..d40d2e16 Binary files a/adv/taobin_adv_menu_09.mp4 and b/adv/taobin_adv_menu_09.mp4 differ diff --git a/adv/taobin_adv_menu_10.mp4 b/adv/taobin_adv_menu_10.mp4 old mode 100755 new mode 100644 index 321639f0..043462c5 Binary files a/adv/taobin_adv_menu_10.mp4 and b/adv/taobin_adv_menu_10.mp4 differ diff --git a/adv/taobin_adv_menu_11.mp4 b/adv/taobin_adv_menu_11.mp4 old mode 100755 new mode 100644 index 184bf59d..c925c4e9 Binary files a/adv/taobin_adv_menu_11.mp4 and b/adv/taobin_adv_menu_11.mp4 differ diff --git a/adv/taobin_adv_menu_12.mp4 b/adv/taobin_adv_menu_12.mp4 index d10c80cd..df3ff74e 100644 Binary files a/adv/taobin_adv_menu_12.mp4 and b/adv/taobin_adv_menu_12.mp4 differ diff --git a/xml/page_cannotConti.xml b/xml/page_cannotConti.xml index 4f78a127..ac3aa158 100644 --- a/xml/page_cannotConti.xml +++ b/xml/page_cannotConti.xml @@ -55,23 +55,15 @@ DEBUGVAR Seeker.StoreCreditFlag - If Seeker = "curr" Then + DEBUGVAR Seeker + DEBUGVAR Seeker.selected_a_drink + DEBUGVAR Seeker.ServiceAmount2 + + + If Seeker = "curr" Then SAVELOG " cannot on curr" - ;Topping "Select" Seeker.selected_a_drink - - ; Set option toppinng and pack - ;Topping "Select1-ID" Seeker.topping1 - ;Topping "Select2-ID" Seeker.topping2 - ;Topping "Select3-ID" Seeker.topping3 - - ; Pack - Topping "Pack" ExtendDataCurr - DEBUGVAR ExtendDataCurr - Var Seeker.ExtendData = ExtendDataCurr - Var ExtendData = Seeker.ExtendData - Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -99,9 +91,6 @@ Var SelectDrink = Seeker.selected_a_drink Var ServiceAmount2 = Seeker.ServiceAmount2 - DEBUGVAR Seeker - DEBUGVAR Seeker.selected_a_drink - DEBUGVAR Seeker.ServiceAmount2 ; On open move from page_brewing3.xml Var countClick2 = 0 @@ -130,27 +119,27 @@ If ChangeFlag2 = 1 Then - Var TelephoneNumber = "0899999999" - Var PayO2 = "" - Var VendingDiscount = 0 - Var VendingCampaign = 0 - Var ServiceType = "credit" - Var SessionID2 = SelectDrink - Var ServiceCredit = "coffee" - Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Else - If Seeker.StoreCreditFlag = 1 Then - Var VendingDiscount = 0 - Var VendingCampaign = 0 - Var ServiceType = "credit" - Var SessionID2 = SelectDrink - Var ServiceCredit = "coffee" - Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - + If Seeker.StoreCreditFlag = 1 Then + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + - EndIf + EndIf EndIf EndIf @@ -450,20 +439,22 @@ If NextOrderStatus = "Disable" Then Var PayDetail="1/F:1221/0/" + + Else + DEBUGVAR error_code_stop_now + If error_code_stop_now > 0 Then Var PayDetail="1/F:" + error_code_stop_now Var PayDetail = PayDetail + "/0/" + Else + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS EndIf - Else - - - Var PayDetail = "1/" + HURR_FOREVER - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + SAMESALARY - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + NOBONUS - EndIf @@ -509,19 +500,20 @@ If NextOrderStatus = "Disable" Then Var PayDetail="1/F:1221/0/" + + Else DEBUGVAR error_code_stop_now If error_code_stop_now > 0 Then Var PayDetail="1/F:" + error_code_stop_now Var PayDetail = PayDetail + "/0/" + Else + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS EndIf - Else - - Var PayDetail = "1/" + HURR_FOREVER - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + SAMESALARY - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + NOBONUS - EndIf ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" @@ -560,19 +552,21 @@ If NextOrderStatus = "Disable" Then Var PayDetail="1/F:1221/0/" + + Else + DEBUGVAR error_code_stop_now If error_code_stop_now > 0 Then Var PayDetail="1/F:" + error_code_stop_now Var PayDetail = PayDetail + "/0/" + Else + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + EndIf - Else - - - Var PayDetail = "1/" + HURR_FOREVER - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + SAMESALARY - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + NOBONUS EndIf