diff --git a/image/page_drink_disable_n2/IcedCocoax2.png b/image/page_drink_disable_n2/IcedCocoax2.png index 597b57b8..f2e4c14f 100644 Binary files a/image/page_drink_disable_n2/IcedCocoax2.png and b/image/page_drink_disable_n2/IcedCocoax2.png differ diff --git a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png index 0435dd6c..a417fd27 100644 Binary files a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png and b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png index 424228ed..d4e01398 100644 Binary files a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png and b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png index 6afcdaec..4732f5de 100644 Binary files a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png and b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png index f93508d1..b80cb039 100644 Binary files a/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png and b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png b/image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png index 5935e7a3..36214653 100644 Binary files a/image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png and b/image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Cocoa_coconut.png b/image/page_drink_disable_n2/bn_iced_Cocoa_coconut.png index 3770a2c7..93b20ead 100644 Binary files a/image/page_drink_disable_n2/bn_iced_Cocoa_coconut.png and b/image/page_drink_disable_n2/bn_iced_Cocoa_coconut.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png b/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png index e81bf044..5ac40f24 100644 Binary files a/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png and b/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Strawberry_cocoa.png b/image/page_drink_disable_n2/bn_iced_Strawberry_cocoa.png index dde1b98b..045b939e 100644 Binary files a/image/page_drink_disable_n2/bn_iced_Strawberry_cocoa.png and b/image/page_drink_disable_n2/bn_iced_Strawberry_cocoa.png differ diff --git a/image/page_drink_disable_n2/bn_iced_caramel.png b/image/page_drink_disable_n2/bn_iced_caramel.png index 3443be4f..7abd579f 100644 Binary files a/image/page_drink_disable_n2/bn_iced_caramel.png and b/image/page_drink_disable_n2/bn_iced_caramel.png differ diff --git a/image/page_drink_disable_n2/bn_iced_caramel_cocoa.png b/image/page_drink_disable_n2/bn_iced_caramel_cocoa.png index 0b88a888..962cc49f 100644 Binary files a/image/page_drink_disable_n2/bn_iced_caramel_cocoa.png and b/image/page_drink_disable_n2/bn_iced_caramel_cocoa.png differ diff --git a/image/page_drink_disable_n2/bn_iced_cocoa.png b/image/page_drink_disable_n2/bn_iced_cocoa.png index 31422d41..c4570677 100644 Binary files a/image/page_drink_disable_n2/bn_iced_cocoa.png and b/image/page_drink_disable_n2/bn_iced_cocoa.png differ diff --git a/image/page_drink_disable_n2/bn_iced_milk.png b/image/page_drink_disable_n2/bn_iced_milk.png index 250100e6..37715b4b 100644 Binary files a/image/page_drink_disable_n2/bn_iced_milk.png and b/image/page_drink_disable_n2/bn_iced_milk.png differ diff --git a/image/page_drink_disable_n2/bn_iced_milk_coconut.png b/image/page_drink_disable_n2/bn_iced_milk_coconut.png index b09dcdcd..16be3c30 100644 Binary files a/image/page_drink_disable_n2/bn_iced_milk_coconut.png and b/image/page_drink_disable_n2/bn_iced_milk_coconut.png differ diff --git a/image/page_drink_disable_n2/bn_iced_ovaltine.png b/image/page_drink_disable_n2/bn_iced_ovaltine.png index 7a64d57f..dc11f0e1 100644 Binary files a/image/page_drink_disable_n2/bn_iced_ovaltine.png and b/image/page_drink_disable_n2/bn_iced_ovaltine.png differ diff --git a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png index 6ae9f17f..7d84ba62 100644 Binary files a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png and b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_pink_milk.png b/image/page_drink_disable_n2/bn_pink_milk.png index 80bcba95..caa4a895 100644 Binary files a/image/page_drink_disable_n2/bn_pink_milk.png and b/image/page_drink_disable_n2/bn_pink_milk.png differ diff --git a/image/page_drink_disable_n2/bn_smoothie_oreo.png b/image/page_drink_disable_n2/bn_smoothie_oreo.png index 36f78a31..087e03a4 100644 Binary files a/image/page_drink_disable_n2/bn_smoothie_oreo.png and b/image/page_drink_disable_n2/bn_smoothie_oreo.png differ diff --git a/image/page_drink_disable_n2/bn_super_oreo_volcano.png b/image/page_drink_disable_n2/bn_super_oreo_volcano.png index fcc18125..14707166 100644 Binary files a/image/page_drink_disable_n2/bn_super_oreo_volcano.png and b/image/page_drink_disable_n2/bn_super_oreo_volcano.png differ diff --git a/image/page_drink_n/IcedCocoax2.png b/image/page_drink_n/IcedCocoax2.png index 5512c529..b5794742 100644 Binary files a/image/page_drink_n/IcedCocoax2.png and b/image/page_drink_n/IcedCocoax2.png differ diff --git a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png index 8e42c5d1..5ada9b0b 100644 Binary files a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png and b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png differ diff --git a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png index 7d61c08b..0dbc79ec 100644 Binary files a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png and b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png differ diff --git a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png index a8caf92f..f55178c2 100644 Binary files a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png and b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png differ diff --git a/image/page_drink_n/bn_PinkOreo_smoothie.png b/image/page_drink_n/bn_PinkOreo_smoothie.png index b3da405a..509dc6cf 100644 Binary files a/image/page_drink_n/bn_PinkOreo_smoothie.png and b/image/page_drink_n/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_n/bn_iced_Cocoa_coconut.png b/image/page_drink_n/bn_iced_Cocoa_coconut.png index e79d7a17..aa5f8fb9 100644 Binary files a/image/page_drink_n/bn_iced_Cocoa_coconut.png and b/image/page_drink_n/bn_iced_Cocoa_coconut.png differ diff --git a/image/page_drink_n/bn_iced_Strawberry_cocoa.png b/image/page_drink_n/bn_iced_Strawberry_cocoa.png index bfbeb461..08636dce 100644 Binary files a/image/page_drink_n/bn_iced_Strawberry_cocoa.png and b/image/page_drink_n/bn_iced_Strawberry_cocoa.png differ diff --git a/image/page_drink_n/bn_iced_caramel.png b/image/page_drink_n/bn_iced_caramel.png index 4d707afd..31802343 100644 Binary files a/image/page_drink_n/bn_iced_caramel.png and b/image/page_drink_n/bn_iced_caramel.png differ diff --git a/image/page_drink_n/bn_iced_caramel_cocoa.png b/image/page_drink_n/bn_iced_caramel_cocoa.png index a35997fe..6ebed778 100644 Binary files a/image/page_drink_n/bn_iced_caramel_cocoa.png and b/image/page_drink_n/bn_iced_caramel_cocoa.png differ diff --git a/image/page_drink_n/bn_iced_cocoa.png b/image/page_drink_n/bn_iced_cocoa.png index ff1fab0b..c4c547d4 100644 Binary files a/image/page_drink_n/bn_iced_cocoa.png and b/image/page_drink_n/bn_iced_cocoa.png differ diff --git a/image/page_drink_n/bn_iced_milk.png b/image/page_drink_n/bn_iced_milk.png index 96c5e38a..669e577a 100644 Binary files a/image/page_drink_n/bn_iced_milk.png and b/image/page_drink_n/bn_iced_milk.png differ diff --git a/image/page_drink_n/bn_iced_milk_coconut.png b/image/page_drink_n/bn_iced_milk_coconut.png index be82ebe7..4ecc2e16 100644 Binary files a/image/page_drink_n/bn_iced_milk_coconut.png and b/image/page_drink_n/bn_iced_milk_coconut.png differ diff --git a/image/page_drink_n/bn_iced_ovaltine.png b/image/page_drink_n/bn_iced_ovaltine.png index b1e13019..02b14e94 100644 Binary files a/image/page_drink_n/bn_iced_ovaltine.png and b/image/page_drink_n/bn_iced_ovaltine.png differ diff --git a/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png b/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png index 4c3db071..24875400 100644 Binary files a/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png and b/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png differ diff --git a/image/page_drink_n/bn_pink_milk.png b/image/page_drink_n/bn_pink_milk.png index 8f2415f9..6e545128 100644 Binary files a/image/page_drink_n/bn_pink_milk.png and b/image/page_drink_n/bn_pink_milk.png differ diff --git a/image/page_drink_n/bn_smoothie_oreo.png b/image/page_drink_n/bn_smoothie_oreo.png index 0e144c1e..3479c937 100644 Binary files a/image/page_drink_n/bn_smoothie_oreo.png and b/image/page_drink_n/bn_smoothie_oreo.png differ diff --git a/image/page_drink_n/bn_super_oreo_volcano.png b/image/page_drink_n/bn_super_oreo_volcano.png index 67fb645c..8eb0ae9d 100644 Binary files a/image/page_drink_n/bn_super_oreo_volcano.png and b/image/page_drink_n/bn_super_oreo_volcano.png differ diff --git a/image/page_drink_picture2_n/IcedCocoax2.png b/image/page_drink_picture2_n/IcedCocoax2.png index d0085af8..0ef06175 100644 Binary files a/image/page_drink_picture2_n/IcedCocoax2.png and b/image/page_drink_picture2_n/IcedCocoax2.png differ diff --git a/image/page_drink_picture2_n/IcedCocoax3.png b/image/page_drink_picture2_n/IcedCocoax3.png index d6bf729c..90085346 100644 Binary files a/image/page_drink_picture2_n/IcedCocoax3.png and b/image/page_drink_picture2_n/IcedCocoax3.png differ diff --git a/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie.png b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie.png index 979b019e..53017ec7 100644 Binary files a/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie.png and b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie.png b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie.png index 0adb2441..d835c8ba 100644 Binary files a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie.png and b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie.png b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie.png index ff89d05d..05a50e18 100644 Binary files a/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie.png and b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png b/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png index ae380f20..fa7639c8 100644 Binary files a/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png and b/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png b/image/page_drink_picture2_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png index b9712f65..73ec6c21 100644 Binary files a/image/page_drink_picture2_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png and b/image/page_drink_picture2_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Cocoa_coconut.png b/image/page_drink_picture2_n/bn_iced_Cocoa_coconut.png index 1ea43f7d..8d2630b5 100644 Binary files a/image/page_drink_picture2_n/bn_iced_Cocoa_coconut.png and b/image/page_drink_picture2_n/bn_iced_Cocoa_coconut.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Ovaltine_cocoa_smoothie.png b/image/page_drink_picture2_n/bn_iced_Ovaltine_cocoa_smoothie.png index 7a91f264..f901f0bf 100644 Binary files a/image/page_drink_picture2_n/bn_iced_Ovaltine_cocoa_smoothie.png and b/image/page_drink_picture2_n/bn_iced_Ovaltine_cocoa_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Strawberry_cocoa.png b/image/page_drink_picture2_n/bn_iced_Strawberry_cocoa.png index 7cad330f..a65cb47f 100644 Binary files a/image/page_drink_picture2_n/bn_iced_Strawberry_cocoa.png and b/image/page_drink_picture2_n/bn_iced_Strawberry_cocoa.png differ diff --git a/image/page_drink_picture2_n/bn_iced_caramel.png b/image/page_drink_picture2_n/bn_iced_caramel.png index 1f173baa..4023cfda 100644 Binary files a/image/page_drink_picture2_n/bn_iced_caramel.png and b/image/page_drink_picture2_n/bn_iced_caramel.png differ diff --git a/image/page_drink_picture2_n/bn_iced_caramel_cocoa.png b/image/page_drink_picture2_n/bn_iced_caramel_cocoa.png index ad9a7066..234ee950 100644 Binary files a/image/page_drink_picture2_n/bn_iced_caramel_cocoa.png and b/image/page_drink_picture2_n/bn_iced_caramel_cocoa.png differ diff --git a/image/page_drink_picture2_n/bn_iced_cocoa.png b/image/page_drink_picture2_n/bn_iced_cocoa.png index 9c930d2d..176a04a4 100644 Binary files a/image/page_drink_picture2_n/bn_iced_cocoa.png and b/image/page_drink_picture2_n/bn_iced_cocoa.png differ diff --git a/image/page_drink_picture2_n/bn_iced_milk.png b/image/page_drink_picture2_n/bn_iced_milk.png index ff7fb278..377633b3 100644 Binary files a/image/page_drink_picture2_n/bn_iced_milk.png and b/image/page_drink_picture2_n/bn_iced_milk.png differ diff --git a/image/page_drink_picture2_n/bn_iced_milk_coconut.png b/image/page_drink_picture2_n/bn_iced_milk_coconut.png index bf8ede57..7af203bc 100644 Binary files a/image/page_drink_picture2_n/bn_iced_milk_coconut.png and b/image/page_drink_picture2_n/bn_iced_milk_coconut.png differ diff --git a/image/page_drink_picture2_n/bn_iced_ovaltine.png b/image/page_drink_picture2_n/bn_iced_ovaltine.png index aae3ea32..cd3e6c08 100644 Binary files a/image/page_drink_picture2_n/bn_iced_ovaltine.png and b/image/page_drink_picture2_n/bn_iced_ovaltine.png differ diff --git a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png index 90f305dc..c8f0a2c6 100644 Binary files a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png and b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_pink_milk.png b/image/page_drink_picture2_n/bn_pink_milk.png index 5ed5ab44..0af50991 100644 Binary files a/image/page_drink_picture2_n/bn_pink_milk.png and b/image/page_drink_picture2_n/bn_pink_milk.png differ diff --git a/image/page_drink_picture2_n/bn_smoothie_oreo.png b/image/page_drink_picture2_n/bn_smoothie_oreo.png index fe663da3..b584d63f 100644 Binary files a/image/page_drink_picture2_n/bn_smoothie_oreo.png and b/image/page_drink_picture2_n/bn_smoothie_oreo.png differ diff --git a/image/page_drink_picture2_n/bn_super_oreo_volcano.png b/image/page_drink_picture2_n/bn_super_oreo_volcano.png index bd51445d..4437133c 100644 Binary files a/image/page_drink_picture2_n/bn_super_oreo_volcano.png and b/image/page_drink_picture2_n/bn_super_oreo_volcano.png differ diff --git a/image/page_drink_press_n/IcedCocoax2.png b/image/page_drink_press_n/IcedCocoax2.png index 5e4c7222..7665e990 100644 Binary files a/image/page_drink_press_n/IcedCocoax2.png and b/image/page_drink_press_n/IcedCocoax2.png differ diff --git a/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie.png b/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie.png index ba3a23ab..4821aaec 100644 Binary files a/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie.png and b/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie.png b/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie.png index e89413b5..5c224e67 100644 Binary files a/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie.png and b/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie.png b/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie.png index 85f2b7f3..97c58853 100644 Binary files a/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie.png and b/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_PinkOreo_smoothie.png b/image/page_drink_press_n/bn_PinkOreo_smoothie.png index 1a4b4efc..3877ac02 100644 Binary files a/image/page_drink_press_n/bn_PinkOreo_smoothie.png and b/image/page_drink_press_n/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png b/image/page_drink_press_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png index 44eb3856..4367c1d7 100644 Binary files a/image/page_drink_press_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png and b/image/page_drink_press_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png differ diff --git a/image/page_drink_press_n/bn_iced_Cocoa_coconut.png b/image/page_drink_press_n/bn_iced_Cocoa_coconut.png index 710b5a97..1261cc40 100644 Binary files a/image/page_drink_press_n/bn_iced_Cocoa_coconut.png and b/image/page_drink_press_n/bn_iced_Cocoa_coconut.png differ diff --git a/image/page_drink_press_n/bn_iced_Ovaltine_cocoa_smoothie.png b/image/page_drink_press_n/bn_iced_Ovaltine_cocoa_smoothie.png index ca4a6aa4..55127062 100644 Binary files a/image/page_drink_press_n/bn_iced_Ovaltine_cocoa_smoothie.png and b/image/page_drink_press_n/bn_iced_Ovaltine_cocoa_smoothie.png differ diff --git a/image/page_drink_press_n/bn_iced_Strawberry_cocoa.png b/image/page_drink_press_n/bn_iced_Strawberry_cocoa.png index fa2eab57..8f26b7ed 100644 Binary files a/image/page_drink_press_n/bn_iced_Strawberry_cocoa.png and b/image/page_drink_press_n/bn_iced_Strawberry_cocoa.png differ diff --git a/image/page_drink_press_n/bn_iced_caramel.png b/image/page_drink_press_n/bn_iced_caramel.png index bf8bb730..560f474d 100644 Binary files a/image/page_drink_press_n/bn_iced_caramel.png and b/image/page_drink_press_n/bn_iced_caramel.png differ diff --git a/image/page_drink_press_n/bn_iced_caramel_cocoa.png b/image/page_drink_press_n/bn_iced_caramel_cocoa.png index a56dd1e2..f0f21180 100644 Binary files a/image/page_drink_press_n/bn_iced_caramel_cocoa.png and b/image/page_drink_press_n/bn_iced_caramel_cocoa.png differ diff --git a/image/page_drink_press_n/bn_iced_cocoa.png b/image/page_drink_press_n/bn_iced_cocoa.png index 519de700..5f6e1b08 100644 Binary files a/image/page_drink_press_n/bn_iced_cocoa.png and b/image/page_drink_press_n/bn_iced_cocoa.png differ diff --git a/image/page_drink_press_n/bn_iced_milk.png b/image/page_drink_press_n/bn_iced_milk.png index c1a5c236..35a7b78c 100644 Binary files a/image/page_drink_press_n/bn_iced_milk.png and b/image/page_drink_press_n/bn_iced_milk.png differ diff --git a/image/page_drink_press_n/bn_iced_milk_coconut.png b/image/page_drink_press_n/bn_iced_milk_coconut.png index 41c8cccb..af26cfff 100644 Binary files a/image/page_drink_press_n/bn_iced_milk_coconut.png and b/image/page_drink_press_n/bn_iced_milk_coconut.png differ diff --git a/image/page_drink_press_n/bn_iced_ovaltine.png b/image/page_drink_press_n/bn_iced_ovaltine.png index b1e13019..28a3db0e 100644 Binary files a/image/page_drink_press_n/bn_iced_ovaltine.png and b/image/page_drink_press_n/bn_iced_ovaltine.png differ diff --git a/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png b/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png index de6ac677..ec941ddd 100644 Binary files a/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png and b/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png differ diff --git a/image/page_drink_press_n/bn_pink_milk.png b/image/page_drink_press_n/bn_pink_milk.png index 59d075d5..f11e3318 100644 Binary files a/image/page_drink_press_n/bn_pink_milk.png and b/image/page_drink_press_n/bn_pink_milk.png differ diff --git a/image/page_drink_press_n/bn_smoothie_oreo.png b/image/page_drink_press_n/bn_smoothie_oreo.png index 6ddb92b5..3248e8ed 100644 Binary files a/image/page_drink_press_n/bn_smoothie_oreo.png and b/image/page_drink_press_n/bn_smoothie_oreo.png differ diff --git a/image/page_drink_press_n/bn_super_oreo_volcano.png b/image/page_drink_press_n/bn_super_oreo_volcano.png index 60007443..60a03b9c 100644 Binary files a/image/page_drink_press_n/bn_super_oreo_volcano.png and b/image/page_drink_press_n/bn_super_oreo_volcano.png differ diff --git a/inter/tha/xml/multi/page_catalog.lxml b/inter/tha/xml/multi/page_catalog.lxml index d18874ec..a9cd1b25 100644 --- a/inter/tha/xml/multi/page_catalog.lxml +++ b/inter/tha/xml/multi/page_catalog.lxml @@ -18,6 +18,20 @@ DEBUGVAR ToppingNewShow + DEBUGVAR OpenFromPageBoard + If OpenFromPageBoard = 1 Then + Var OpenFromPageBoard = 0 + Var langnext1 = "true" + Var langnext2 = "true" + Var langnext3 = "true" + Var langnext4 = "true" + Var langnext5 = "true" + Var langnext6 = "true" + Var langnext7 = "true" + Var langnext8 = "true" + SAVELOG "======================================= RefreshAll Languages ================================" + EndIf + Var NextPage = "-" Var Seeker.thankLidFlag = 0 @@ -561,6 +575,7 @@ If Inst5MenuLoaded = "done" Then + Var MultiProcess = "Invisible" TabMenuVisibleInst 2 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" @@ -631,6 +646,7 @@ If Inst6MenuLoaded = "done" Then + Var MultiProcess = "Invisible" TabMenuVisibleInst 3 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" @@ -664,6 +680,7 @@ If Inst7MenuLoaded = "done" Then + Var MultiProcess = "Invisible" TabMenuVisibleInst 4 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" @@ -697,6 +714,7 @@ If Inst11MenuLoaded = "done" Then + Var MultiProcess = "Invisible" TabMenuVisibleInst 7 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" @@ -730,6 +748,7 @@ If Inst10MenuLoaded = "done" Then + Var MultiProcess = "Invisible" TabMenuVisibleInst 8 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" @@ -766,6 +785,7 @@ If Inst8MenuLoaded = "done" Then + Var MultiProcess = "Invisible" TabMenuVisibleInst 5 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" @@ -798,6 +818,7 @@ SoundVolume If Inst8MenuLoaded = "done" Then + Var MultiProcess = "Invisible" TabMenuVisibleInst 5 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" @@ -858,6 +879,7 @@ If Inst9MenuLoaded = "done" Then + Var MultiProcess = "Invisible" TabMenuVisibleInst 6 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" diff --git a/inter/uae_dubai/xml/page_catalog_group_other.lxml b/inter/uae_dubai/xml/page_catalog_group_other.lxml index 8eb24cc2..e5738e10 100644 --- a/inter/uae_dubai/xml/page_catalog_group_other.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_other.lxml @@ -1,696 +1,696 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - DEBUGVAR LanguageShow - DEBUGVAR CountryName - - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var DirImage = "ROOT/taobin_project/image/page3" - EndIf - - ;inter-image - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - - ;inter-image - If CountryName = "Australia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - ;inter-image - If CountryName = "UnitedArabEmirates Dubai" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - If LanguageShow = "UAE_DUBAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" - Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/" - Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/" - Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/" - EndIf - - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - ; soda and other - Var Menu6Selected = "PressForever" - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - If LanguageShow = "UAE_DUBAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" - Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/" - Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/" - Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - BackgroundColor - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - - Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" - - If Seeker = "next" Then - Open brewing3ContiInter - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - - DEBUGVAR LanguageShow - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - ;inter-image - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - ;inter-image - If CountryName = "Australia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - ;inter-image - If CountryName = "UnitedArabEmirates Dubai" Then - ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/" - Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/" - Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - If LanguageShow = "UAE_DUBAI" Then - ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" - Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/" - Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/" - Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/" - EndIf - - If UsePepsiTheme = 1 Then - Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImage2 = DirImage2 + "/image/drink_option_en/" - If LanguageShow = "UAE_DUBAI" Then - Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImageAlter = DirImageAlter + "/image/page3_2/" - - Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImage = DirImage + "/image/page3/" - Else - Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImageAlter = DirImageAlter + "/image/page3_2_en/" - - Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImage = DirImage + "/image/page3_en/" - - Var ice_tab_text = "Ice will be ready at " - EndIf - EndIf - - SAVELOG "EventLanguageOnChange menu -list" - - DEBUGVAR DirImage - DEBUGVAR DirImage2 - DEBUGVAR DirImageAlter - DEBUGVAR DirImageAlterMilk - - Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 430 - 38 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - - RefreshAll - - - -; under line - - 0 - 494 - "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - - - - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 940 - 462 - 22 - 170 - 30 - KanitMediumTTF - WTCBlueColor - PriceUnitText - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + DEBUGVAR LanguageShow + DEBUGVAR CountryName + + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + + ;inter-image + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + + ;inter-image + If CountryName = "Australia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + ;inter-image + If CountryName = "UnitedArabEmirates Dubai" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + If LanguageShow = "UAE_DUBAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" + Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/" + Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/" + Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/" + EndIf + + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + ; soda and other + Var Menu6Selected = "PressForever" + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + If LanguageShow = "UAE_DUBAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" + Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/" + Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/" + Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/" + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + BackgroundColor + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + + If Seeker = "next" Then + Open brewing3ContiInter + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + ;inter-image + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + ;inter-image + If CountryName = "Australia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + ;inter-image + If CountryName = "UnitedArabEmirates Dubai" Then + ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/" + Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/" + Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + If LanguageShow = "UAE_DUBAI" Then + ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" + Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/" + Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/" + Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/" + EndIf + + If UsePepsiTheme = 1 Then + Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImage2 = DirImage2 + "/image/drink_option_en/" + If LanguageShow = "UAE_DUBAI" Then + Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImageAlter = DirImageAlter + "/image/page3_2/" + + Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImage = DirImage + "/image/page3/" + Else + Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImageAlter = DirImageAlter + "/image/page3_2_en/" + + Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImage = DirImage + "/image/page3_en/" + + Var ice_tab_text = "Ice will be ready at " + EndIf + EndIf + + SAVELOG "EventLanguageOnChange menu -list" + + DEBUGVAR DirImage + DEBUGVAR DirImage2 + DEBUGVAR DirImageAlter + DEBUGVAR DirImageAlterMilk + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + RefreshAll + + + +; under line + + 0 + 494 + "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + + + + + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 940 + 462 + 22 + 170 + 30 + KanitMediumTTF + WTCBlueColor + PriceUnitText + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + 10 497 @@ -10962,276 +10962,6 @@ center-vertical-horizontal - - ; ==================> Len = 3 - ; - 53-05-02-0114 53-05-03-0114 - - 33 - 22 - 225 - 296 - Flag( 53-05-02-0114.Button,53-05-03-0114.Button,$Sum53050201145305030114) - - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - HeadlineColor - - COCONUT PEPSI - بيبسي مع جوز الهند - COCONUT PEPSI - بيبسي مع جوز الهند - COCONUT PEPSI - بيبسي مع جوز الهند - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - BodyTextColor - - Coconut Syrup, Pepsi and Soda - شراب جوز الهند، بيبسي وصودا - Coconut Syrup, Pepsi and Soda - شراب جوز الهند، بيبسي وصودا - Coconut Syrup, Pepsi and Soda - شراب جوز الهند، بيبسي وصودا - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - TextPriceMenuHotX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - WTCBlueColor - WTCWhiteColor - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $53-05-02-0114.Button - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - WTCBlueColor - WTCWhiteColor - $53-05-02-0114.Button - StringFmt( $53-05-02-0114.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $53-05-03-0114.Button - - - TextPriceMenuBlendX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - WTCBlueColor - WTCWhiteColor - $53-05-03-0114.Button - StringFmt( $53-05-03-0114.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - 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 $Sum53050201145305030114 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $53-05-02-0114.TAG tag2_is_disable - STRCONTAIN "ERR" $53-05-03-0114.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 - WTCMediumBlueColor - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - "disable-show" - $Sum53050201145305030114 - - 000013 - - center-vertical-horizontal - ; ==================> Len = 3 ; - 53-05-02-0093 - @@ -15857,8 +15587,8 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - + + + + + diff --git a/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml b/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml index 05f24919..c34baa11 100644 --- a/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml +++ b/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml @@ -433,11 +433,6 @@ Machine DoorClose - If ShoppyPayEnable = "true" Then - Else - Var PayState5 = "Disable" - Var PayState6 = "Disable" - EndIf If web_readyOK = "true" Then diff --git a/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml b/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml index 1b65baa7..f2105424 100644 --- a/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml +++ b/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml @@ -497,14 +497,6 @@ Machine DoorClose - - If ShoppyPayEnable = "true" Then - Else - Var PayState5 = "Disable" - Var PayState6 = "Disable" - EndIf - - If web_readyOK = "true" Then Var web_readyOK = "false" @@ -548,6 +540,7 @@ EndIf DEBUGVAR DirImage2 + DEBUGVAR PayState5 Var CancelContinue = 0 @@ -874,6 +867,11 @@ 1000 + DEBUGVAR PayState5 + DEBUGVAR CoinAmount + DEBUGVAR SELLONLINE + + If ReadyForBrew = "false" Then SAVELOG "Back to main1" Open "ROOT/taobin_project/xml/page_back_to_main.xml" @@ -913,17 +911,11 @@ If RoadShow = "true" Then Else - Var PayState3 = "Disable" + If PayState3 = "Enable" Then Var PayState3 = "Disable" EndIf - If PayState5 = "Enable" Then - Var PayState3 = "Disable" - EndIf If PayState5 = "Enable" Then Var PayState5 = "Disable" - Var PayState5 = "Disable" - EndIf - Var PayState5 = "Disable" EndIf EndIf diff --git a/xml/page_payment_cash-HKG.xml b/xml/page_payment_cash-HKG.xml index 74ea5c75..74db17a5 100644 --- a/xml/page_payment_cash-HKG.xml +++ b/xml/page_payment_cash-HKG.xml @@ -458,12 +458,6 @@ Machine DoorClose - If ShoppyPayEnable = "true" Then - Else - Var PayState5 = "Disable" - Var PayState6 = "Disable" - EndIf - If web_readyOK = "true" Then diff --git a/xml/page_payment_cash-MYR.xml b/xml/page_payment_cash-MYR.xml index abdac254..9856980e 100644 --- a/xml/page_payment_cash-MYR.xml +++ b/xml/page_payment_cash-MYR.xml @@ -441,12 +441,6 @@ Machine DoorClose - If ShoppyPayEnable = "true" Then - Else - Var PayState5 = "Disable" - Var PayState6 = "Disable" - EndIf - If web_readyOK = "true" Then diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 81d49e69..cb4abb3f 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -1121,14 +1121,7 @@ ; "ROOT/taobin_project/image/ad_medium_2.png" ; - +;include="ROOT/taobin_project/inc/video.inc"