Commit Graph

209 Commits

Author SHA1 Message Date
phyusin
ce217e1e0b check waiter role 2018-02-23 10:53:12 +06:30
phyusin
7cbb67fd30 add link for oqs in origami 2018-02-22 18:51:57 +06:30
Aung Myo
9757c34a09 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-14 15:01:57 +06:30
Aung Myo
839fb14436 update inventory 2018-02-13 11:34:06 +06:30
Aung Myo
aeafbb4fae update pull split bill 2018-02-09 14:31:34 +06:30
phyusin
4c563e23bf add shop info in split bill 2018-02-09 14:19:53 +06:30
Aung Myo
54cb5b0c87 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-09 11:32:49 +06:30
Aung Myo
edade3662b update quickservice 2018-02-09 11:32:29 +06:30
San Wai Lwin
860e8db202 conflic data 2018-02-09 10:17:56 +06:30
phyusin
d42fc485ae change ui for left sidebar 2018-02-08 18:10:11 +06:30
San Wai Lwin
3f247f731e Shop name in navbar,linke to shop info 2018-02-05 18:11:45 +06:30
Yan
384923133b license flash msg and add set Item price 2018-01-19 10:43:08 +06:30
Aung Myo
eb29b20654 update combine cloud and master bugs 2018-01-16 10:57:20 +06:30
phyusin
0aba9e8d76 change css for logo 2017-12-27 11:27:13 +06:30
phyusin
3d235f9d69 add alert_time_min in api/checkin and check for waiter login 2017-12-27 10:30:22 +06:30
Yan
5e6d7bb958 merge with aung myo 2017-12-14 13:49:55 +06:30
Yan
e8c5cd1219 call waiter css 2017-12-14 11:51:44 +06:30
Yan
e55948a7b2 login keyup changed 2017-12-12 15:33:23 +06:30
Aung Myo
7ce71a1960 update inventory hide and cancan update 2017-11-30 11:19:15 +06:30
Yan
f33be9e707 Merge branch 'master' into license 2017-11-28 17:07:58 +06:30
phyusin
ab337a3b8a add css for logout icon 2017-11-28 15:01:58 +06:30
phyusin
98be8b37a4 change Logout UI 2017-11-27 09:55:17 +06:30
Yan
a5a33b269a Merge branch 'master' into license 2017-11-24 10:15:37 +06:30
phyusin
200d013060 change font-size for logout text 2017-11-23 14:00:45 +06:30
phyusin
86ec4c7c80 change UI for logout 2017-11-23 11:07:21 +06:30
Yan
06582d755e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-22 18:40:38 +06:30
phyusin
5ff93ad20d add icon before Logout 2017-11-22 17:36:08 +06:30
Aung Myo
5b7ba0c144 update supervisor wrong spelling 2017-11-22 10:40:43 +06:30
Yan
34fd7a80d6 Merge branch 'master' into license 2017-11-17 10:25:32 +06:30
Yan
178b3484be added license 2017-11-16 16:13:26 +06:30
Aung Myo
6360a914b4 update add order for popup qty 2017-11-16 14:23:51 +06:30
Yan
e263ba2433 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-15 12:06:55 +06:30
Aung Myo
1c0a93d56d update pagination and booking and rebate redeem 2017-11-15 12:02:02 +06:30
Yan
fa7cb53e55 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-14 13:08:22 +06:30
Aung Myo
f1a28d64e1 update OQS and cashier 2017-11-14 09:43:13 +06:30
Yan
053a8dbf8a activation form 2017-11-09 18:30:20 +06:30
Aung Myo
482d0559eb update login dashoborad 2017-11-08 11:09:53 +06:30
Yan
6dd0faee10 change ui for delete backend 2017-11-07 20:00:51 +06:30
Yan
15196053a0 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-01 17:14:44 +06:30
Aung Myo
ebb2114243 update payment method report and from,to time change 2017-11-01 16:14:45 +06:30
Yan
4660530218 upgrade version 2017-10-31 18:41:19 +06:30
Yan
cd11841df1 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-31 13:41:36 +06:30
Yan
89381eb72b add manage in ability for supervisor 2017-10-31 13:34:52 +06:30
Aung Myo
1239b308f9 update void alert 2017-10-31 13:34:01 +06:30
Aung Myo
cfa819f985 fixed conflic 2017-10-31 12:13:19 +06:30
Aung Myo
56940d7f00 update sale audit 2017-10-31 12:08:27 +06:30
Yan
c1db3ba8be merge with aung myo 2017-10-30 18:52:48 +06:30
Yan
35161aae91 remove turbolink in backend and update logout 2017-10-30 18:51:05 +06:30
Yan
da0558b5ef remove turbolinks in form for conflict 2017-10-30 17:26:38 +06:30
Yan
7beb4e7563 test for turbolink 2017-10-30 14:33:05 +06:30