Commit graph

2720 commits

Author SHA1 Message Date
Pakin
95025531da DUBAI: rm sound thai & fix bug next order (dubai) not show 2024-10-02 15:14:06 +07:00
Pakin
c86afed35d Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-10-02 08:55:36 +07:00
Pakin
036c7f1c2a DUBAI: revert lang to default theme 2024-10-02 08:55:28 +07:00
Kenta420
b5e861794e THAI: Update Drink Jemila images 2024-10-01 18:08:39 +07:00
Pakin
4af130ebc6 Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-10-01 17:12:16 +07:00
Pakin
9133b6e076 INTER: add check if empty buttonRemoveCup, init it. 2024-10-01 17:11:48 +07:00
Kenta420
e619be8ea1 DUBAI: split page_collect_point_1.lxml 2024-10-01 15:05:26 +07:00
Pakin
d00b7702cd MYS: fix bug point 3 not found 2024-10-01 11:44:01 +07:00
Pakin
f6a7b3d2bc MYS: fix vending code not correct 2024-10-01 09:49:03 +07:00
Pakin
6348890a34 DUBAI: done catalog group, WIP payment 2024-09-30 17:28:24 +07:00
Pakin
fff39356d6 Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-09-30 17:21:21 +07:00
Pakin
e0ab34821b DUBAI: change theme topping_select 2024-09-30 17:21:11 +07:00
thanawat saiyota
833692a605 DUBAI: add image/page_payment_en 2024-09-30 17:19:28 +07:00
thanawat saiyota
0fe78effa5 DUBAI: add image/page_payment_cash 2024-09-30 17:13:44 +07:00
Pakin
57682d762c Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-09-30 15:51:53 +07:00
thanawat saiyota
55c2246f59 DUBAI: add image/topping2_en/high_light 2024-09-30 15:51:30 +07:00
Pakin
32487d108c Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-09-30 15:39:57 +07:00
Pakin
dfd78510a2 MYS: change end date of pro yuzu 2024-09-30 15:38:57 +07:00
thanawat saiyota
c1a8e2e44b DUBAI: add image/topping2_en 2024-09-30 15:33:48 +07:00
thanawat saiyota
33ffb6b2de DUBAI: add image/topping2_en 2024-09-30 15:16:07 +07:00
thanawat saiyota
a311035516 DUBAI: add image/*** 2024-09-30 14:55:45 +07:00
Pakin
e1d30f0253 DUBAI: WIP catalog blue theme 2024-09-30 14:00:11 +07:00
Pakin
6f9173e806 SGP: rename txt doing image 2024-09-30 12:58:15 +07:00
Pakin
c892f3f8f5 Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-09-30 11:08:56 +07:00
Pakin
7055336d98 DUBAI: init blue theme 2024-09-30 11:08:04 +07:00
Kenta420
7f27751639 AUS: update tricker and promotion image 2024-09-30 10:26:25 +07:00
Pakin
53fc901dc0 Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-09-27 15:47:26 +07:00
Kenta420
6343376a6e THAI: Update Jemila promotion 2024-09-27 09:32:03 +07:00
Pakin
73e3670e63 NEWUI+SGP: add fan to lang tsv 2024-09-26 17:25:49 +07:00
Pakin
c958e15b68 Merge branch 'masterpiece' into sgp_blue 2024-09-26 17:24:09 +07:00
Pakin
27e0ba93c9 Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-09-26 17:23:29 +07:00
Kenta420
abe76682f6 Merge branch 'masterpiece' of kong:/1TBHDD/ikong/taobin_project into masterpiece 2024-09-26 15:22:52 +07:00
Kenta420
950794676e [DUBAI] Update pay with credit card 2024-09-26 14:55:34 +07:00
Pakin
be69b246cc NEWUI: add fan at lang tsv 2024-09-26 14:34:36 +07:00
Pakin
220ceeedad WTC+SGP: fix page_remove_cup not in theme 2024-09-26 14:33:03 +07:00
Pakin
3f41c3621c Merge branch 'masterpiece' into sgp_blue 2024-09-25 15:35:21 +07:00
Pakin
5ca63d3dcd Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-09-25 15:33:38 +07:00
Pakin
7eb2025801 WTC+SGP: fix drinkfail 3 not in theme & popup not enough change in payment case 2024-09-25 15:33:17 +07:00
wanlop run
7925710901 DO 2024-09-25 15:31:26 +07:00
Pakin
be7e1adb60 Merge branch 'sgp_blue' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into sgp_blue 2024-09-25 15:14:03 +07:00
thanawat saiyota
ceda037221 Merge branch 'sgp_blue' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into sgp_blue 2024-09-25 15:11:21 +07:00
thanawat saiyota
1444aeccf2 WTC: add image/colectiing_en 2024-09-25 15:09:51 +07:00
wanlop run
703acf2f25 fix 2024-09-25 13:38:13 +07:00
Pakin
fdc39ab672 Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-09-25 10:24:08 +07:00
Pakin
068788bf1e WTC+SGP: fix soda ginger menu pic, banner & QR 2024-09-25 10:10:45 +07:00
wanlop run
6317a68847 Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece 2024-09-24 23:47:54 +07:00
wanlop run
cdb07f757d Fix bug page_thankyouConti.xml 2024-09-24 23:47:36 +07:00
Kenta420
f710fa6df3 [DUBAI] Fixed credit card again 2024-09-24 17:03:51 +07:00
Kenta420
dbcfc593ea [DUBAI] Fixed credit card payment method 2024-09-24 16:30:15 +07:00
Kenta420
58d7b37a2c [UNIVERSE] Remove bug Git conflict vscode 2024-09-24 16:28:55 +07:00