Commit Graph

191 Commits

Author SHA1 Message Date
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
Aung Myo
a687b45193 update adminbsbs 2017-10-30 12:14:11 +06:30
Yan
772b65f2d8 merge with augn myo 2017-10-27 18:41:44 +06:30
Yan
61c9fd0c81 test for js 2017-10-27 16:53:32 +06:30
Aung Myo
b4005efa1b fixed conflic 2017-10-27 13:25:13 +06:30
Aung Myo
188d091884 update checkout all formm 2017-10-27 13:17:32 +06:30
Yan
18aa3d1e0f ui updated 2017-10-27 11:37:47 +06:30
Yan
4607321726 merge with origin 2017-10-26 17:58:43 +06:30
Yan
0da1aeaeb9 ui review and edited 2017-10-26 17:54:22 +06:30
Aung Myo
92ef1dcdae update material ui 2017-10-26 17:02:26 +06:30
Aung Myo
6b88403186 update notification 2017-10-26 14:06:42 +06:30
Aung Myo
15604fea2c update notification 2017-10-26 13:49:15 +06:30
Aung Myo
fa5b544416 update site bar and credit note view in transaction 2017-10-25 15:06:28 +06:30
Yan
5c8adbe618 remove no need crm js 2017-10-23 15:49:55 +06:30
Yan
ac42c4a78e ui edited 2017-10-23 13:20:41 +06:30
Aung Myo
e428a1bc87 update origin themem change sidebar 2017-10-23 13:19:59 +06:30
Aung Myo
c4b810dcd4 update origin themem change sidebar 2017-10-23 12:58:44 +06:30
Aung Myo
1147b81a8a Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 11:48:01 +06:30
Aung Myo
973e6dc11e update admin bsb for layout nav bar 2017-10-23 11:47:35 +06:30