Merge branch 'master' of kong:/1TBHDD/ikong/taobin_project

2023-09-28 17:54:27 +07:00 · 2023-09-28 17:54:27 +07:00 · 1d5ee46326
commit 1d5ee46326
parent fe89554503 c30ff69302
53 changed files with 1218 additions and 790 deletions
--- a/xml/event/pepween/page_pepween_error.xml
+++ b/xml/event/pepween/page_pepween_error.xml
@ -0,0 +1,107 @@
+<Popup>
+    <Cache> "Enable" </Cache>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <Volume> SoundVolume </Volume>
+    ;<Background> "0xeae6e1" </Background>
+
+    <EventOpen>
+        Var Timeout = 0
+        DEBUGVAR Timeout
+    </EventOpen>
+
+    <Video>
+        <X> 0 </X>
+        <Y> 0 </Y>
+        <Width> 1080</Width>
+        <Height> 380 </Height>
+        <Loop> "true" </Loop>
+        <Filename> video_menu_0 </Filename>
+    </Video>
+
+    ; Show error
+
+    <Image>
+        <X> 0 </X>
+        <Y> 380 </Y>
+        <Width> 1080 </Width>
+        <Height> 1540 </Height>
+        <Filename> "ROOT/taobin_project/image/event/pepween/page_offline_bg.png" </Filename>
+    </Image>
+
+    ; Broken Coffin
+    <Image>
+        <X> 264 </X>
+        <Y> 724 </Y>
+        <Filename> "ROOT/taobin_project/image/event/pepween/page_offline_brokencoff.png" </Filename>
+    </Image>
+
+
+    ; Text top thai
+    <Image>
+        <X> 165 </X>
+        <Y> 622 </Y>
+        <Filename> "ROOT/taobin_project/image/event/pepween/error/text_failed_coupon.png" </Filename>
+        <Width> 776 </Width>
+        <Height> 96 </Height>
+        <State>
+            eval(
+                If show_eng = "true" Then
+                    Var return = "Invisible"
+                Else
+                    Var return = "Enable"
+                EndIf
+            )
+        </State>
+    </Image>
+
+    ; Text top eng
+    <Image>
+        <X> 68 </X>
+        <Y> 626 </Y>
+        <Filename> "ROOT/taobin_project/image/event/pepween/error_en/text_failed_coupon.png" </Filename>
+        <Width> 921 </Width>
+        <Height> 75 </Height>
+        <State>
+            eval(
+                If show_eng = "true" Then
+                    Var return = "Enable"
+                Else
+                    Var return = "Invisible"
+                EndIf
+            )
+        </State>
+    </Image>
+
+
+    <Image>
+        <X> 25 </X>
+        <Y> 1535 </Y>
+        <Filename> eval(
+            If show_eng = "true" Then
+                Var return = "ROOT/taobin_project/image/event/pepween/error_en/text_failed_network_disrupt.png"
+            Else
+                Var return = "ROOT/taobin_project/image/event/pepween/error/text_failed_network_disrupt.png"
+            EndIf
+            ) </Filename>
+        <Width> 1080 </Width>
+        <Height> 156 </Height>
+    </Image>
+
+    <Button>
+        <X> 424 </X>
+        <Y> 1710 </Y>
+        <Filename> 
+            eval(
+                If show_eng = "true" Then
+                    Var return = "ROOT/taobin_project/image/event/pepween/error_en/bn_confirm.png"
+                Else
+                    Var return = "ROOT/taobin_project/image/event/pepween/error/bn_confirm.png"
+                EndIf
+            ) 
+        </Filename>
+        <EventOnClick>
+            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+        </EventOnClick>
+    </Button>
+</Popup>
--- a/xml/event/pepween/page_pepween_random.xml
+++ b/xml/event/pepween/page_pepween_random.xml
@ -166,6 +166,8 @@

            Var UserCouponReward = couponList[randResult]

+            ; Send to server
+
            Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
        </EventOnClick>
    </Button>
@ -185,6 +187,8 @@

            Var UserCouponReward = couponList[randResult]

+            ; Send to server
+
            Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
        </EventOnClick>
    </Button>
@ -204,6 +208,8 @@

            Var UserCouponReward = couponList[randResult]

+            ; Send to server
+
            Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
        </EventOnClick>
    </Button>
@ -223,6 +229,8 @@

            Var UserCouponReward = couponList[randResult]

+            ; Send to server
+
            Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
        </EventOnClick>
    </Button>
@ -242,6 +250,8 @@

            Var UserCouponReward = couponList[randResult]

+            ; Send to server
+
            Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
        </EventOnClick>
    </Button>
--- a/xml/event/pepween/page_pepween_result.xml
+++ b/xml/event/pepween/page_pepween_result.xml
@ -6,6 +6,9 @@
    ;<Background> "0xeae6e1" </Background>

    <EventOpen>
+        Var Timeout = 0
+        Var ServerRespond = 0
+
        Var RewardDisplayDir = "ROOT/taobin_project/image/event/pepween/"

        If show_eng = "true" Then
@ -22,6 +25,40 @@
        Var isCoffinPress = "Disable"
    </EventOpen>

+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+        DEBUGVAR Timeout
+
+        If PayOfflineMode = 1 Then
+            Var ServerRespond = 0
+            Var CouponResponeFailed = 1
+        EndIf
+
+        If Timeout > 60 Then
+            ; Check and return Error
+            Var CouponResponeFailed = 1
+            Open "ROOT/taobin_project/xml/event/pepween/page_pepween_error.xml"
+        EndIf
+
+        Var Timeout = Timeout + 1
+        TimerReset
+    </EventTimeout>
+    
+    <EventActionOk>
+        If CouponResponeFailed = 0 Then
+            ; TODO:
+            ;Open "ROOT/taobin_project/xml/event/pepween/page_pepween_error.xml"
+        EndIf
+
+    </EventActionOk>
+
+    <EventActionError>
+        ; TODO: open coupon send error page
+        If CouponResponeFailed = 1 Then
+            Open "ROOT/taobin_project/xml/event/pepween/page_pepween_error.xml"
+        EndIf
+    </EventActionError>
+
    <Video>
        <X> 0 </X>
        <Y> 0 </Y>
@ -32,13 +69,17 @@
    </Video>

    ; 
-    <Button>
+    <Image>
        <X> 0 </X>
        <Y> 380 </Y>
        <Width> 1080 </Width>
        <Height> 1540 </Height>
        <Filename> RewardDisplay </Filename>
-    </Button>
+    </Image>


+    <EventUnitTest1>
+        Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+    </EventUnitTest1>
+
 </Popup>
--- a/xml/event/promotion_pepween.xml
+++ b/xml/event/promotion_pepween.xml
@ -9223,10 +9223,10 @@ LIMENADE SODA" </Value>

        		

-        ;Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepween.xml"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepween.xml"
 		
 		; test random page
-		Open "ROOT/taobin_project/xml/event/pepween/page_pepween_random.xml"
+		;Open "ROOT/taobin_project/xml/event/pepween/page_pepween_random.xml"

        
 </EventOnClick>
--- a/xml/page_catalog_group_pro_pepween.xml
+++ b/xml/page_catalog_group_pro_pepween.xml
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@ -541,7 +541,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 33
+; menu_new_list 34
 	; ==================> Len = 11
 	; 12-02-01-0001 12-02-02-0001 12-02-03-0001 
 <Block>
@ -6090,6 +6090,258 @@ LIMENADE" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 16
+	; 12-02-01-0050 12-02-02-0050 12-02-03-0050 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-02-01-0050.Button,12-02-02-0050.Button,12-02-03-0050.Button,$Sum120201005012020200501202030050) </State> 
+	<Button>
+	<State> $Sum120201005012020200501202030050 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = " MATCHA LATTE MINT"
+		Var NameDrinkTH = "มัทฉะลาเต้มิ้นท์"
+		Var DrinkDescriptionTH = "ชาเขียวมัทฉะ น้ำเชื่อมมิ้นท์และ นมอุ่น"
+		Var DrinkDescription = "Matcha, Mint Syrup &Milk"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-02-01-0050.Price
+		Var PriceD2 = $12-02-02-0050.Price
+		Var PriceD3 = $12-02-03-0050.Price
+		Var PD_CODE1 = "12-02-01-0050"
+		Var PD_CODE2 = "12-02-02-0050"
+		Var PD_CODE3 = "12-02-03-0050"
+		Var PD_STAGE_1 = $12-02-01-0050.Button
+		Var PD_STAGE_2 = $12-02-02-0050.Button
+		Var PD_STAGE_3 = $12-02-03-0050.Button
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0050"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0050"
+			Else
+			Topping "Load" "12-02-03-0050"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-02-01-0050.NameE
+		Var menu_desc_eng_hot = $12-02-01-0050.descriptionE
+		Var menu_name_thai_hot = $12-02-01-0050.Name
+		Var menu_desc_thai_hot = $12-02-01-0050.description
+		
+		Var menu_name_eng_cold = $12-02-02-0050.NameE
+		Var menu_desc_eng_cold = $12-02-02-0050.descriptionE
+		Var menu_name_thai_cold = $12-02-02-0050.Name
+		Var menu_desc_thai_cold = $12-02-02-0050.description
+		
+		Var menu_name_eng_blender = $12-02-03-0050.NameE
+		Var menu_desc_eng_blender = $12-02-03-0050.descriptionE
+		Var menu_name_thai_blender = $12-02-03-0050.Name
+		Var menu_desc_thai_blender = $12-02-03-0050.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "มัทฉะลาเต้มิ้นท์" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "ชาเขียวมัทฉะ น้ำเชื่อมมิ้นท์และ นมอุ่น" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> " MATCHA LATTE MINT" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Matcha, Mint Syrup &Milk" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $12-02-01-0050.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-02-01-0050.Button </State>
+	<Value> StringFmt(  $12-02-01-0050.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $12-02-02-0050.Button </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-02-02-0050.Button </State>
+	<Value> StringFmt( $12-02-02-0050.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> $12-02-03-0050.Button </State>
+	</Image>
+	<Text>
+	<X> 180 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-02-03-0050.Button </State>
+	<Value> StringFmt(  $12-02-03-0050.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum120201005012020200501202030050 = "Disable" Then
+				Var ice_tab_process_show = "Disable"
+			Else
+				Var ice_tab_process_show = "Enable"
+			EndIf
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum120201005012020200501202030050 = "Disable" Then
+				STRCONTAIN "ERR" $12-02-01-0050.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-02-02-0050.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-02-03-0050.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum120201005012020200501202030050 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; - - - 
 	; ==================> Len = 16