Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
wanlop run 2024-02-05 21:48:24 +07:00
commit 5ff368f812
31 changed files with 562 additions and 10 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

View file

@ -795,7 +795,260 @@ Sugar, Water" </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; - - -
; 12-21-01-0059 12-21-02-0059 -
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-21-01-0059.Button,12-21-02-0059.Button,$Sum12210100591221020059) </State>
<Button>
<State> $Sum12210100591221020059 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_peach.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_peach.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_americano_peach.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<OverlayImage> xmlpro( 12-21-01-0059, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<EventOnClick>
Var NameDrink = "PEACH Tell me love"
Var NameDrinkTH = "พีชเทลมีเลิฟ"
Var DrinkDescriptionTH = "กาแฟ น้ำ และ น้ำเชื่อมพีช"
Var DrinkDescription = "Espresso, Peach Syrup, Sugar, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_peach.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-21-01-0059.Price
Var PriceD2 = $12-21-02-0059.Price
Var PriceD3 = $-.Price
Var PD_CODE1 = "12-21-01-0059"
Var PD_CODE2 = "12-21-02-0059"
Var PD_CODE3 = "##-##-##-####"
Var PD_STAGE_1 = $12-21-01-0059.Button
Var PD_STAGE_2 = $12-21-02-0059.Button
Var PD_STAGE_3 = "Disable2"
Var OverlayMenuFilter !assigned xmlpro( 12-21-01-0059, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
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-21-02-0059"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "12-21-01-0059"
Else
Topping "Load" "-"
EndIf
EndIf
Var menu_name_eng_hot = $12-21-01-0059.NameE
Var menu_desc_eng_hot = $12-21-01-0059.descriptionE
Var menu_name_thai_hot = $12-21-01-0059.Name
Var menu_desc_thai_hot = $12-21-01-0059.description
Var menu_name_eng_cold = $12-21-02-0059.NameE
Var menu_desc_eng_cold = $12-21-02-0059.descriptionE
Var menu_name_thai_cold = $12-21-02-0059.Name
Var menu_desc_thai_cold = $12-21-02-0059.description
Var menu_name_eng_blender = $##-##-##-####.NameE
Var menu_desc_eng_blender = $##-##-##-####.descriptionE
Var menu_name_thai_blender = $##-##-##-####.Name
Var menu_desc_thai_blender = $##-##-##-####.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> "PEACH Tell me love" </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> "Espresso, Peach Syrup,
Sugar, Water" </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-21-01-0059.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-21-01-0059.Button </State>
<Value> StringFmt( $12-21-01-0059.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-21-02-0059.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-21-02-0059.Button </State>
<Value> StringFmt( $12-21-02-0059.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> "Invisible" </State>
</Image>
<Text>
<X> 183 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
<Y> 264 </Y>
<State>
eval(
If ICE_PROCESS_STATUS = 2 Then
If $Sum12210100591221020059 = "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 $Sum12210100591221020059 = "Disable" Then
STRCONTAIN "ERR" $12-21-01-0059.TAG tag1_is_disable
STRCONTAIN "ERR" $12-21-02-0059.TAG tag2_is_disable
STRCONTAIN "ERR" $##-##-##-####.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> $Sum12210100591221020059 </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; ==================> Len = 12
; 12-01-01-0060 12-01-02-0060 12-01-03-0060
<Block>
@ -1052,7 +1305,261 @@ Sugar, Milk" </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; - - -
; 12-21-01-0060 12-21-02-0060 12-21-03-0060
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-21-01-0060.Button,12-21-02-0060.Button,12-21-03-0060.Button,$Sum122101006012210200601221030060) </State>
<Button>
<State> $Sum122101006012210200601221030060 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_peach_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_peach_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_peach_latte.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<OverlayImage> xmlpro( 12-21-01-0060, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<EventOnClick>
Var NameDrink = "PEACH be my last love"
Var NameDrinkTH = "พีชบีมายด์ลาสท์เลิฟ"
Var DrinkDescriptionTH = "กาแฟ น้ำ นม และ น้ำเชื่อมพีช"
Var DrinkDescription = "Espresso, Peach Syrup, Sugar, Milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_peach_latte.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-21-01-0060.Price
Var PriceD2 = $12-21-02-0060.Price
Var PriceD3 = $12-21-03-0060.Price
Var PD_CODE1 = "12-21-01-0060"
Var PD_CODE2 = "12-21-02-0060"
Var PD_CODE3 = "12-21-03-0060"
Var PD_STAGE_1 = $12-21-01-0060.Button
Var PD_STAGE_2 = $12-21-02-0060.Button
Var PD_STAGE_3 = $12-21-03-0060.Button
Var OverlayMenuFilter !assigned xmlpro( 12-21-01-0060, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
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-21-02-0060"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "12-21-01-0060"
Else
Topping "Load" "12-21-03-0060"
EndIf
EndIf
Var menu_name_eng_hot = $12-21-01-0060.NameE
Var menu_desc_eng_hot = $12-21-01-0060.descriptionE
Var menu_name_thai_hot = $12-21-01-0060.Name
Var menu_desc_thai_hot = $12-21-01-0060.description
Var menu_name_eng_cold = $12-21-02-0060.NameE
Var menu_desc_eng_cold = $12-21-02-0060.descriptionE
Var menu_name_thai_cold = $12-21-02-0060.Name
Var menu_desc_thai_cold = $12-21-02-0060.description
Var menu_name_eng_blender = $12-21-03-0060.NameE
Var menu_desc_eng_blender = $12-21-03-0060.descriptionE
Var menu_name_thai_blender = $12-21-03-0060.Name
Var menu_desc_thai_blender = $12-21-03-0060.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> "PEACH be
my last love" </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> "Espresso, Peach Syrup,
Sugar, 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-21-01-0060.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-21-01-0060.Button </State>
<Value> StringFmt( $12-21-01-0060.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-21-02-0060.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-21-02-0060.Button </State>
<Value> StringFmt( $12-21-02-0060.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-21-03-0060.Button </State>
</Image>
<Text>
<X> 183 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-21-03-0060.Button </State>
<Value> StringFmt( $12-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
<Y> 264 </Y>
<State>
eval(
If ICE_PROCESS_STATUS = 2 Then
If $Sum122101006012210200601221030060 = "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 $Sum122101006012210200601221030060 = "Disable" Then
STRCONTAIN "ERR" $12-21-01-0060.TAG tag1_is_disable
STRCONTAIN "ERR" $12-21-02-0060.TAG tag2_is_disable
STRCONTAIN "ERR" $12-21-03-0060.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> $Sum122101006012210200601221030060 </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; ==================> Len = 12
; 12-02-01-0051 12-02-02-0051 12-02-03-0051
<Block>

View file

@ -1175,7 +1175,8 @@
<EventClick>
GETACCEXT TNumberTaobinMemberXXX 14
Var CoffeePointOld = 0
Var CoffeePoint = 0
Open "ROOT/taobin_project/xml/page_check_member_point.xml"
</EventClick>
</Button>

View file

@ -22,7 +22,6 @@
Var GetCreditFlag = 0
Var posX = 400
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_en"
@ -34,11 +33,9 @@
If show_eng = "true" Then
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var posX = 270
Else
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
@ -52,17 +49,34 @@
Var GetPayInfoFlag = 0
Var ReqPayWithCash = 0
Var TextWaiting = ""
GenHashWithTimeStamp PointCrm
Var text_44 = "/text_44.png"
Var text_show_amountInvalid = "/text_show_amountInvalid.png"
Var text_show_amountInvalid2 = "/text_show_amountInvalid2.png"
If SumCreditAmount < PayAmountSubDiscount Then
Var Text_X = 246
Var Min = PayAmountSubDiscount - SumCreditAmount
If show_eng = "true" Then
Var Text_X = 170
Var posX = 250
Else
Var Text_X = 255
Var posX = 380
EndIf
Else
Var Text_X = 263
Var text_44 = "/text_45.png"
If show_eng = "true" Then
Var Text_X = 263
Var posX = 350
Else
Var Text_X = 246
Var posX = 380
EndIf
Var Min = PayAmountSubDiscount
EndIf
@ -150,6 +164,16 @@ If ViewBill > 0 Then
Open "ROOT/taobin_project/xml/page_payment_credit3-TopupQR.xml"
EndIf
If ReqPayWithCash = 1 Then
Var Seeker.CreditReferenceTmp = "" + useCreditAmount
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/"
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm
Var Seeker.StoreCreditFlag = 1
Var Seeker.CreditNotEnoughRefID = PointCrm
Open "ROOT/taobin_project/xml/page_payment_credit3-TopupCash.xml"
EndIf
Refresh
</EventActionOk>
@ -560,7 +584,14 @@ If ViewBill > 0 Then
Else
If PayCreditChannel = "cash" Then
Open "ROOT/taobin_project/xml/page_payment_credit3-TopupCash.xml"
If ReqPayWithCash = 0 Then
Var TelephoneNumber = Seeker.TNumberTaobinCredit
Var useCreditAmount = SumCreditAmount
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
Var ReqPayWithCash = 1
EndIf
Else

View file

@ -170,6 +170,12 @@
If CancelFlag = 0 Then
SAVELOG "ButtonCancleAlpha2 > Timeout Order."
If ReqPayWithCash = 1 Then
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 24 TelephoneNumber BmiYear PointCrm GetScore
EndIf
Var CancelFlag = 1
Var CancelCounter = 0
Var RemainAmountStr = "คืนเงิน"
@ -497,6 +503,12 @@ TimerReset
If CancelFlag = 0 Then
SAVELOG "ButtonCancleAlpha2 > Cancle Order."
If ReqPayWithCash = 1 Then
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 24 TelephoneNumber BmiYear PointCrm GetScore
EndIf
Var CancelFlag = 1
Var CancelCounter = 0
If show_eng = "true" Then

View file

@ -364,6 +364,7 @@
Var Seeker.CurrCreditPinNum = Seeker.CoffeePinNumber
DEBUGVAR Seeker.CurrCreditAmount
DEBUGVAR Seeker.CreditNotEnoughRefID
If Seeker.CreditNotEnoughRefID = "" Then
Var CurrAmount = Seeker.CurrCreditAmount