Commit Graph

3931 Commits

Author SHA1 Message Date
phyusin
dbafa59b74 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-15 18:23:23 +06:30
phyusin
86b83125e6 change some fun: for dashboard 2018-06-15 18:19:53 +06:30
phyusin
7bd9e17529 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-15 16:52:46 +06:30
phyusin
c33ae58b07 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-15 16:52:08 +06:30
phyusin
eccadd0c1a add in duty report and change in duty module 2018-06-15 16:51:32 +06:30
Aung Myo
3ac9a4b3c5 Merge branch 'adminbsb_material_ui' 2018-06-15 11:40:49 +06:30
Aung Myo
2bd2de7da6 fixed validate item attributes 2018-06-15 11:39:39 +06:30
phyusin
4a2d4b1007 fixed for reprint and query 2018-06-13 17:40:18 +06:30
Aung Myo
6952ce7359 update move table 2018-06-13 14:14:14 +06:30
Aung Myo
fcac3cf46f update move table 2018-06-13 13:55:57 +06:30
Aung Myo
bcf009d322 update move table 2018-06-13 13:54:39 +06:30
Aung Myo
3909d98c70 Merge branch 'adminbsb_material_ui' 2018-06-13 13:43:45 +06:30
Aung Myo
f41b882730 update move table 2018-06-13 13:43:02 +06:30
phyusin
7f58a27f71 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-13 11:24:58 +06:30
San Wai Lwin
223a84ec67 Pull from masterဓ 2018-06-13 11:19:52 +06:30
Aung Myo
7e1154eb16 Merge branch 'adminbsb_material_ui' 2018-06-13 11:18:55 +06:30
San Wai Lwin
9df975db1c Modified reprint color and click event 2018-06-13 11:18:32 +06:30
Aung Myo
676ec4d611 update addorder for product 2018-06-13 11:18:16 +06:30
Aung Myo
33324ed511 Merge branch 'adminbsb_material_ui' 2018-06-13 09:54:01 +06:30
Aung Myo
b949263979 update type password for access code 2018-06-13 09:53:07 +06:30
Aung Myo
dda4aa986d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-06-12 18:02:40 +06:30
Aung Myo
995c8480e0 update foc with other payment 2018-06-12 18:02:17 +06:30
phyusin
a7bb8d202a Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-12 17:33:46 +06:30
phyusin
9882d0902f check color in completed 2018-06-12 17:33:06 +06:30
San Wai Lwin
c037c85055 Edit pagination 2018-06-12 17:11:43 +06:30
phyusin
63b3f7ce65 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-12 14:47:27 +06:30
Aung Myo
ea7b15fe0b Merge branch 'adminbsb_material_ui' 2018-06-12 14:36:33 +06:30
Aung Myo
4722db7854 update addorder set 2018-06-12 14:35:38 +06:30
phyusin
db1668de5e check reprint route 2018-06-12 14:17:52 +06:30
phyusin
b45f6b129f Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-12 14:15:59 +06:30
phyusin
986bf21baf Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-12 14:15:09 +06:30
phyusin
b36801add9 check reprint route 2018-06-12 14:14:48 +06:30
San Wai Lwin
90cdc04300 Pull from master 2018-06-12 14:10:15 +06:30
San Wai Lwin
dde691fa5b Chnage Void buttom color 2018-06-12 14:04:18 +06:30
Aung Myo
2bd87e6bb6 update pending 2018-06-12 13:36:07 +06:30
phyusin
76ae983141 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-12 13:26:04 +06:30
Aung Myo
09cfdb8df2 Merge branch 'adminbsb_material_ui' 2018-06-12 10:38:56 +06:30
Aung Myo
0b3b191cc0 update access code 2018-06-12 10:38:02 +06:30
phyusin
9f8bb1d3c8 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-11 18:26:58 +06:30
phyusin
bb2a1a364f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-11 18:26:31 +06:30
phyusin
2b2b1d5090 add msg reply for JunctionPay 2018-06-11 18:26:03 +06:30
Aung Myo
8de699a7ea Merge branch 'adminbsb_material_ui' 2018-06-11 17:48:33 +06:30
Aung Myo
c5c28bf44d update rain bow land request 2018-06-11 17:47:36 +06:30
phyusin
e2fdf994d7 check JunctionPay 2018-06-11 17:20:47 +06:30
phyusin
425e72afe7 add payment type in order reservation 2018-06-11 16:19:59 +06:30
phyusin
859794e291 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-11 14:42:37 +06:30
phyusin
fd125834ad Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-11 14:42:19 +06:30
phyusin
5d49d07cf5 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-11 14:39:29 +06:30
phyusin
1e76c434ef Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-11 14:37:42 +06:30
phyusin
5b8b471b30 change seed 2018-06-11 14:37:04 +06:30