Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into wso

Browse source

...

This commit is contained in:

thanawat saiyota 2024-11-13 12:10:15 +07:00

parent 61bbdef355 e3b9c092e7

commit a7fb727db5

384 changed files with 8780 additions and 7552 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

image/collectiing/bd_pay_with_cashACU.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.1 KiB

BIN

image/collectiing/bn_pay_with_cashACU.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 9.2 KiB

BIN

image/collectiing/bp_pay_with_cashACU.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 9 KiB

BIN

image/event/oreo_11/bn_close_en.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

image/event/oreo_11/bn_close_th.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

image/event/oreo_11/bp_close_en.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

image/event/oreo_11/bp_close_th.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

image/event/oreo_11/error_en.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.3 MiB

BIN

image/event/oreo_11/error_th.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.3 MiB

BIN

image/event/weekday_discount/weekday_discount_en.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 104 KiB After Width:  |  Height:  |  Size: 106 KiB

BIN

image/event/weekday_discount/weekday_discount_th.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 107 KiB After Width:  |  Height:  |  Size: 108 KiB

BIN

image/page_doing/brewing_txt_adv16.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 49 KiB

BIN

image/page_doing/brewing_txt_adv16_en.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 50 KiB

BIN

image/page_doing/brewing_txt_adv17.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 46 KiB

BIN

image/page_doing/brewing_txt_adv17_en.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 50 KiB

BIN

image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 17 KiB

BIN

image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 17 KiB

BIN

image/page_drink_disable_n2/bn_iced_Jemila_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 18 KiB

BIN

image/page_drink_disable_n2/bn_iced_americano_soda_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 12 KiB After Width:  |  Height:  |  Size: 15 KiB

BIN

image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 15 KiB

BIN

image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 15 KiB

BIN

image/page_drink_disable_n2/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 11 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

image/page_drink_disable_n2/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 17 KiB

BIN

image/page_drink_disable_n2/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 18 KiB

BIN

image/page_drink_disable_n2/bn_smoothie_coconut_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 17 KiB

BIN

image/page_drink_disable_n2/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

image/page_drink_disable_n2/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 18 KiB

BIN

image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 15 KiB

BIN

image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 17 KiB

BIN

image/page_drink_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 18 KiB

BIN

image/page_drink_n/bn_iced_americano_soda_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

image/page_drink_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 15 KiB

BIN

image/page_drink_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

image/page_drink_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 10 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

image/page_drink_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 17 KiB

BIN

image/page_drink_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 18 KiB

BIN

image/page_drink_n/bn_smoothie_coconut_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 17 KiB

BIN

image/page_drink_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

image/page_drink_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

image/page_drink_n/bn_super_oreo_volcano_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 18 KiB

BIN

image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 31 KiB After Width:  |  Height:  |  Size: 34 KiB

BIN

image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 32 KiB After Width:  |  Height:  |  Size: 35 KiB

BIN

image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 34 KiB After Width:  |  Height:  |  Size: 36 KiB

BIN

image/page_drink_picture2_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 30 KiB After Width:  |  Height:  |  Size: 33 KiB

BIN

image/page_drink_picture2_n/bn_iced_americano_soda_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 27 KiB After Width:  |  Height:  |  Size: 30 KiB

BIN

image/page_drink_picture2_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 24 KiB After Width:  |  Height:  |  Size: 27 KiB

BIN

image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 24 KiB After Width:  |  Height:  |  Size: 27 KiB

BIN

image/page_drink_picture2_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 23 KiB

BIN

image/page_drink_picture2_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 29 KiB After Width:  |  Height:  |  Size: 32 KiB

BIN

image/page_drink_picture2_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 30 KiB After Width:  |  Height:  |  Size: 33 KiB

BIN

image/page_drink_picture2_n/bn_smoothie_coconut_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 28 KiB After Width:  |  Height:  |  Size: 31 KiB

BIN

image/page_drink_picture2_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 28 KiB After Width:  |  Height:  |  Size: 31 KiB

BIN

image/page_drink_picture2_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 28 KiB After Width:  |  Height:  |  Size: 30 KiB

BIN

image/page_drink_picture2_n/bn_super_oreo_volcano_oreo_11_th.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 60 KiB After Width:  |  Height:  |  Size: 36 KiB

BIN

image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 35 KiB After Width:  |  Height:  |  Size: 38 KiB

BIN

image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 17 KiB

BIN

image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 17 KiB

BIN

image/page_drink_press_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 18 KiB

BIN

image/page_drink_press_n/bn_iced_americano_soda_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 15 KiB

BIN

image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 15 KiB

BIN

image/page_drink_press_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 15 KiB

BIN

image/page_drink_press_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 10 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

image/page_drink_press_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 17 KiB

BIN

image/page_drink_press_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 18 KiB

BIN

image/page_drink_press_n/bn_smoothie_coconut_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 17 KiB

BIN

image/page_drink_press_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

image/page_drink_press_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

image/page_drink_press_n/bn_super_oreo_volcano_weekday_discount_event_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 19 KiB

BIN

image/page_payment/img_popup22.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 15 KiB

BIN

image/page_payment_en/page_payment/img_popup1-AUS.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 12 KiB

BIN

image/page_payment_en/page_payment/img_popup22.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 14 KiB