Commit graph

2686 commits

Author SHA1 Message Date
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
Kenta420
ab57f05898 [SGP] Move CashlessReq SUCCESS to EventActionOK 2024-09-24 16:27:34 +07:00
wanlop run
875c4fbf81 Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-09-24 10:24:31 +07:00
Kenta420
e2003d1f54 [THAI] Update Image Jemila reward out of stock 2024-09-24 10:12:49 +07:00
Pakin
d5ca231b2d Merge branch 'masterpiece' into sgp_blue 2024-09-24 09:34:53 +07:00
Pakin
0f6ed6c9bf WTC_SGP: Add banner and QR Contract 2024-09-24 09:31:50 +07:00
Pakin
2d265a5afa Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-09-24 09:06:24 +07:00
Pakin
26a15c104c MYS: add promotion profile to restore as previous profile after promo ends 2024-09-24 09:01:26 +07:00
wanlop run
4bcade7be8 Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece 2024-09-23 18:58:30 +07:00
wanlop run
2ce4e71a81 Merge and remvoe move promotion_mystery_cup_35 2024-09-23 18:58:13 +07:00
wanlop run
0e00048943 Merge 2024-09-23 18:56:10 +07:00
Kenta420
ccc6cc58b7 DUBAI: enable Coin Card at pay with credit_card_and_qr 2024-09-23 18:54:39 +07:00
wanlop run
35b11f8276 Add image picture 2024-09-23 18:44:54 +07:00
Kenta420
46897fb739 [THAI] Added Jemila promotion 2024-09-23 18:01:18 +07:00
Kenta420
e454479817 THAI: Added Jemila sound 2024-09-23 18:00:54 +07:00
thanawat saiyota
b84ca35c68 Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-09-23 10:08:58 +07:00
thanawat saiyota
edcc51503e edit video advert 2024-09-23 10:08:19 +07:00
Pakin
1687d8e612 MYS: update biscoff menus text 2024-09-23 09:04:29 +07:00
Pakin
c0172b6c34 MYS: Split discount ev for inter, add vendingcode for 2 promos 2024-09-23 08:25:54 +07:00
Kenta420
bfbaac6752 THAI: Added Jemila promotion collect point and random reward 2024-09-21 23:59:18 +07:00
Pakin
ee1d55c074 Merge branch 'masterpiece' into sgp_blue 2024-09-20 15:20:47 +07:00
Pakin
227e0d7879 Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece 2024-09-20 15:12:00 +07:00
Pakin
05ab6366f8 SGP: remove QR on drink fail & change contacts at show_error 2024-09-20 13:33:51 +07:00
Pakin
2fc794aa18 MYS: add biscoff menus 2024-09-19 13:49:34 +07:00
Kenta420
73effb090c THAI: Added assets sound for Jemila pro 2024-09-18 23:54:57 +07:00
Kenta420
f7373767a4 DUBAI: add coconut menu images 2024-09-18 23:51:08 +07:00
thanawat saiyota
76dbe9dd39 Merge branch 'sgp_blue' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into sgp_blue 2024-09-18 15:11:34 +07:00
Kenta420
1b11f656fb DUBAI: update text & price 2024-09-18 12:51:20 +07:00
wanlop run
903e17f5d2 Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece 2024-09-18 10:33:39 +07:00
wanlop run
8f2a4a9f9e Add video 2024-09-18 10:12:04 +07:00
Kenta420
21c2b0a7fc 832 => 893 2024-09-17 18:17:35 +07:00
Pakin
e2a4299282 Merge branch 'masterpiece' into sgp_blue 2024-09-17 16:00:06 +07:00
Pakin
fdf60f3f0c SGP: Fix video not correct path 2024-09-17 15:59:33 +07:00
Pakin
685fae11ba SGP: Fix video not correct path 2024-09-17 15:55:27 +07:00
Pakin
dcf94d4fc3 Merge branch 'masterpiece' into sgp_blue 2024-09-17 15:06:32 +07:00