diff --git a/image/collectiing/text_45.png b/image/collectiing/text_45.png new file mode 100644 index 00000000..21208ca0 Binary files /dev/null and b/image/collectiing/text_45.png differ diff --git a/image/collectiing_en/text_45.png b/image/collectiing_en/text_45.png new file mode 100644 index 00000000..ab070ea6 Binary files /dev/null and b/image/collectiing_en/text_45.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_dirty_light_honduras.png b/inter/aus/image/page_drink_disable_n2/bn_dirty_light_honduras.png index 4ee123eb..60a1d95b 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_dirty_light_honduras.png and b/inter/aus/image/page_drink_disable_n2/bn_dirty_light_honduras.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png b/inter/aus/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png deleted file mode 100644 index dc0a16b5..00000000 Binary files a/inter/aus/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png and /dev/null differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_americano_light_honduras.png b/inter/aus/image/page_drink_disable_n2/bn_hot_americano_light_honduras.png index 72044b30..0e12707d 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_americano_light_honduras.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_americano_light_honduras.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png b/inter/aus/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png deleted file mode 100644 index 9d1310c6..00000000 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png and /dev/null differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_espresso_light_honduras.png b/inter/aus/image/page_drink_disable_n2/bn_hot_espresso_light_honduras.png index b624fc9d..4a781132 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_espresso_light_honduras.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_espresso_light_honduras.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png b/inter/aus/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png deleted file mode 100644 index 99db29a2..00000000 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png and /dev/null differ diff --git a/inter/aus/image/page_drink_n/bn_dirty_light_honduras.png b/inter/aus/image/page_drink_n/bn_dirty_light_honduras.png index 382f4160..2468ba14 100644 Binary files a/inter/aus/image/page_drink_n/bn_dirty_light_honduras.png and b/inter/aus/image/page_drink_n/bn_dirty_light_honduras.png differ diff --git a/inter/aus/image/page_drink_n/bn_dirty_light_whiskydude.png b/inter/aus/image/page_drink_n/bn_dirty_light_whiskydude.png deleted file mode 100644 index c0da6b30..00000000 Binary files a/inter/aus/image/page_drink_n/bn_dirty_light_whiskydude.png and /dev/null differ diff --git a/inter/aus/image/page_drink_n/bn_hot_americano_light_honduras.png b/inter/aus/image/page_drink_n/bn_hot_americano_light_honduras.png index 39d7c5f9..25b08085 100644 Binary files a/inter/aus/image/page_drink_n/bn_hot_americano_light_honduras.png and b/inter/aus/image/page_drink_n/bn_hot_americano_light_honduras.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_americano_light_whiskydude.png b/inter/aus/image/page_drink_n/bn_hot_americano_light_whiskydude.png deleted file mode 100644 index e49661e9..00000000 Binary files a/inter/aus/image/page_drink_n/bn_hot_americano_light_whiskydude.png and /dev/null differ diff --git a/inter/aus/image/page_drink_n/bn_hot_espresso_light_honduras.png b/inter/aus/image/page_drink_n/bn_hot_espresso_light_honduras.png index f97d888a..7ff120cc 100644 Binary files a/inter/aus/image/page_drink_n/bn_hot_espresso_light_honduras.png and b/inter/aus/image/page_drink_n/bn_hot_espresso_light_honduras.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_espresso_light_whiskydude.png b/inter/aus/image/page_drink_n/bn_hot_espresso_light_whiskydude.png deleted file mode 100644 index 10332d04..00000000 Binary files a/inter/aus/image/page_drink_n/bn_hot_espresso_light_whiskydude.png and /dev/null differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_dirty_light_honduras.png b/inter/aus/image/page_drink_picture2_n/bn_dirty_light_honduras.png index 4fb9db31..8dfd9c42 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_dirty_light_honduras.png and b/inter/aus/image/page_drink_picture2_n/bn_dirty_light_honduras.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_dirty_light_whiskydude.png b/inter/aus/image/page_drink_picture2_n/bn_dirty_light_whiskydude.png deleted file mode 100644 index fb06bca4..00000000 Binary files a/inter/aus/image/page_drink_picture2_n/bn_dirty_light_whiskydude.png and /dev/null differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_americano_light_honduras.png b/inter/aus/image/page_drink_picture2_n/bn_hot_americano_light_honduras.png index 280f20de..4450802a 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_americano_light_honduras.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_americano_light_honduras.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_americano_light_whiskydude.png b/inter/aus/image/page_drink_picture2_n/bn_hot_americano_light_whiskydude.png deleted file mode 100644 index 92bf908f..00000000 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_americano_light_whiskydude.png and /dev/null differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_espresso_light_honduras.png b/inter/aus/image/page_drink_picture2_n/bn_hot_espresso_light_honduras.png index 46de0aa4..ba1d9e35 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_espresso_light_honduras.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_espresso_light_honduras.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_espresso_light_whiskydude.png b/inter/aus/image/page_drink_picture2_n/bn_hot_espresso_light_whiskydude.png deleted file mode 100644 index 73d35f81..00000000 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_espresso_light_whiskydude.png and /dev/null differ diff --git a/inter/aus/image/page_drink_press_n/bn_dirty_light_honduras.png b/inter/aus/image/page_drink_press_n/bn_dirty_light_honduras.png index 22ab24f5..9fa0c36a 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_dirty_light_honduras.png and b/inter/aus/image/page_drink_press_n/bn_dirty_light_honduras.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_dirty_light_whiskydude.png b/inter/aus/image/page_drink_press_n/bn_dirty_light_whiskydude.png deleted file mode 100644 index 37cd29e9..00000000 Binary files a/inter/aus/image/page_drink_press_n/bn_dirty_light_whiskydude.png and /dev/null differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_americano_light_honduras.png b/inter/aus/image/page_drink_press_n/bn_hot_americano_light_honduras.png index d76613ae..912f08e2 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_hot_americano_light_honduras.png and b/inter/aus/image/page_drink_press_n/bn_hot_americano_light_honduras.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_americano_light_whiskydude.png b/inter/aus/image/page_drink_press_n/bn_hot_americano_light_whiskydude.png deleted file mode 100644 index e866a030..00000000 Binary files a/inter/aus/image/page_drink_press_n/bn_hot_americano_light_whiskydude.png and /dev/null differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_espresso_light_honduras.png b/inter/aus/image/page_drink_press_n/bn_hot_espresso_light_honduras.png index 84e07fbe..f77e7969 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_hot_espresso_light_honduras.png and b/inter/aus/image/page_drink_press_n/bn_hot_espresso_light_honduras.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_espresso_light_whiskydude.png b/inter/aus/image/page_drink_press_n/bn_hot_espresso_light_whiskydude.png deleted file mode 100644 index 71a89941..00000000 Binary files a/inter/aus/image/page_drink_press_n/bn_hot_espresso_light_whiskydude.png and /dev/null differ diff --git a/xml/page_catalog_group_pro_peach.xml b/xml/page_catalog_group_pro_peach.xml index 8de9a15a..54f26486 100644 --- a/xml/page_catalog_group_pro_peach.xml +++ b/xml/page_catalog_group_pro_peach.xml @@ -795,7 +795,260 @@ Sugar, Water" center-vertical-horizontal - ; - - - + ; 12-21-01-0059 12-21-02-0059 - + + 33 + 22 + 225 + 296 + Flag( 12-21-01-0059.Button,12-21-02-0059.Button,$Sum12210100591221020059) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พีชเทลมีเลิฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ น้ำ และ น้ำเชื่อมพีช" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PEACH Tell me love" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Peach Syrup, +Sugar, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-21-01-0059.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-01-0059.Button + StringFmt( $12-21-01-0059.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-21-02-0059.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-02-0059.Button + StringFmt( $12-21-02-0059.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 183 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + 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 + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + 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 + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12210100591221020059 + text_unavailable + center-vertical-horizontal + + ; ==================> Len = 12 ; 12-01-01-0060 12-01-02-0060 12-01-03-0060 @@ -1052,7 +1305,261 @@ Sugar, Milk" center-vertical-horizontal - ; - - - + ; 12-21-01-0060 12-21-02-0060 12-21-03-0060 + + 33 + 22 + 225 + 296 + Flag( 12-21-01-0060.Button,12-21-02-0060.Button,12-21-03-0060.Button,$Sum122101006012210200601221030060) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พีชบีมายด์ลาสท์เลิฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ น้ำ นม และ น้ำเชื่อมพีช" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PEACH be +my last love" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Peach Syrup, +Sugar, Milk" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-21-01-0060.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-01-0060.Button + StringFmt( $12-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-21-02-0060.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-02-0060.Button + StringFmt( $12-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-21-03-0060.Button + + + 183 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-03-0060.Button + StringFmt( $12-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + 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 + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + 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 + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum122101006012210200601221030060 + text_unavailable + center-vertical-horizontal + + ; ==================> Len = 12 ; 12-02-01-0051 12-02-02-0051 12-02-03-0051 diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index 5752d0e1..78ff60c9 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -1175,7 +1175,8 @@ GETACCEXT TNumberTaobinMemberXXX 14 - + Var CoffeePointOld = 0 + Var CoffeePoint = 0 Open "ROOT/taobin_project/xml/page_check_member_point.xml" diff --git a/xml/page_payment_credit3-Topup.xml b/xml/page_payment_credit3-Topup.xml index e6a54f0d..cacb8ce3 100644 --- a/xml/page_payment_credit3-Topup.xml +++ b/xml/page_payment_credit3-Topup.xml @@ -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 @@ -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 diff --git a/xml/page_payment_credit3-TopupCash.xml b/xml/page_payment_credit3-TopupCash.xml index ac47e9ec..dfd0fed9 100644 --- a/xml/page_payment_credit3-TopupCash.xml +++ b/xml/page_payment_credit3-TopupCash.xml @@ -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 diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index a60fbaa1..acb5438f 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -364,6 +364,7 @@ Var Seeker.CurrCreditPinNum = Seeker.CoffeePinNumber DEBUGVAR Seeker.CurrCreditAmount + DEBUGVAR Seeker.CreditNotEnoughRefID If Seeker.CreditNotEnoughRefID = "" Then Var CurrAmount = Seeker.CurrCreditAmount