Commit Graph

3911 Commits

Author SHA1 Message Date
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
phyusin
27655cfe31 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-11 13:50:10 +06:30
phyusin
df2c7d5cf3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-11 13:49:43 +06:30
phyusin
13c2c00263 add tax cal for Edit 2018-06-11 13:49:21 +06:30
San Wai Lwin
97f4a9df11 Pull from master 2018-06-11 13:18:18 +06:30
Aung Myo
83dd8dd803 Merge branch 'adminbsb_material_ui' 2018-06-11 12:02:57 +06:30
Aung Myo
8c5fce8516 update bill js 2018-06-11 12:02:06 +06:30
phyusin
fe4ac6a8f3 add set item price 2018-06-11 11:29:49 +06:30
San Wai Lwin
019db9f5d1 Edit Survey 2018-06-11 11:02:40 +06:30
phyusin
507865c14e Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-08 16:50:57 +06:30
phyusin
c8642548e5 check order reservation update and payment route fixed 2018-06-08 16:50:06 +06:30
San Wai Lwin
a04bb14477 Edit first bill button 2018-06-08 16:48:52 +06:30
phyusin
630e82a306 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-08 11:37:00 +06:30
San Wai Lwin
9bae3445d3 Edit reprint 2018-06-08 11:28:01 +06:30
San Wai Lwin
ce3ab0b0eb Pull from master 2018-06-08 10:31:02 +06:30
San Wai Lwin
b3e85ff25e Edit Reprint in QS and change void button color 2018-06-08 10:29:45 +06:30
phyusin
b053c2ae24 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-07 16:23:15 +06:30
phyusin
3252db7203 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-07 16:22:13 +06:30
Aung Myo
cec87e023b Merge branch 'adminbsb_material_ui' 2018-06-07 16:17:53 +06:30
Aung Myo
58cb957078 update promotion for nil item 2018-06-07 16:13:10 +06:30
San Wai Lwin
13e11bf777 Cloud mode in reprint 2018-06-07 16:11:34 +06:30