Commit Graph

77 Commits

Author SHA1 Message Date
phyusin
b3e17f6936 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-09 09:48:35 +06:30
phyusin
2e19d34ced add dinga payment and new payment type in report 2018-04-09 09:40:08 +06:30
Aung Myo
14b33a6f8d add kitchen role for oqs 2018-04-07 15:53:24 +06:30
phyusin
4b78de3f9a add filter in dashboard and Transaction/Sale 2018-03-26 16:42:17 +06:30
phyusin
e0fe0ee8ab dashboard update 2018-03-23 18:06:53 +06:30
Yan
510e3aabec check current user session 2018-03-20 14:32:08 +06:30
San Wai Lwin
9228168ebc route changes 2018-03-13 14:51:07 +06:30
phyusin
ebf01a5d95 change action 2018-03-05 16:28:34 +06:30
phyusin
779ef9a4ba remove conflict data 2018-03-05 16:26:19 +06:30
phyusin
bd06e80b37 remove conflict data 2018-03-05 16:24:45 +06:30
San Wai Lwin
07c3bcd7a7 Change Dashboard, Account in login, Shop name, Reference no for other charges 2018-02-28 15:31:55 +06:30
phyusin
adefd8c034 remove conflict data 2018-02-27 14:35:21 +06:30
Aung Myo
ce8581f892 fixed conflic when pull master item remark 2018-02-26 17:02:46 +06:30
phyusin
7043eccb73 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-26 09:21:08 +06:30
Yan
a6abfb2f49 update token mismatch 2018-02-23 15:49:29 +06:30
Aung Myo
ac47501e01 update conflic for pull master 2018-02-23 14:58:35 +06:30
Yan
25a212bb70 update base controllers 2018-02-23 14:45:53 +06:30
phyusin
7cbb67fd30 add link for oqs in origami 2018-02-22 18:51:57 +06:30
phyusin
eafbb80f51 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-22 09:44:14 +06:30
Yan
643a9d71be remove skip before action in home controller 2018-02-21 17:04:45 +06:30
Yan
3d2d304654 license update for token 2018-02-21 16:30:14 +06:30
phyusin
84c0a60c08 add filter for dashboard 2018-02-21 09:15:41 +06:30
phyusin
521b4d897b change migration file 2018-02-19 15:43:27 +06:30
phyusin
dc5cd84f5c show cashier dashboard view 2018-02-19 13:46:08 +06:30
Aung Myo
974dde54c0 update shop.name 2018-02-09 14:58:08 +06:30
Aung Myo
2f024e8691 update qurick raw 2018-02-01 10:29:24 +06:30
Aung Myo
674f6cd37d update decimal and delimeter for dashboard 2018-01-09 10:52:52 +06:30
phyusin
3d235f9d69 add alert_time_min in api/checkin and check for waiter login 2017-12-27 10:30:22 +06:30
phyusin
c86d91054b change query for dashboard 2017-12-14 12:02:50 +06:30
phyusin
32dac8e9a8 change query for dashboard and time for checkin channel 2017-12-13 18:30:04 +06:30
phyusin
211db16311 add channel for checkin process 2017-12-13 15:58:44 +06:30
phyusin
8611489ecb change dashboard data 2017-12-12 15:43:56 +06:30
phyusin
b64229aded change UI and query for dashboard and UI for Origami/Commissions 2017-11-23 11:56:49 +06:30
Aung Myo
5b7ba0c144 update supervisor wrong spelling 2017-11-22 10:40:43 +06:30
phyusin
f333aa9a66 add top10 and bottom10 products in dashboard 2017-11-17 10:22:04 +06:30
phyusin
4899e624ef change dashboard ui 2017-11-17 09:56:40 +06:30
phyusin
d648bbf100 dashboard ui and checkin checkout process 2017-11-16 18:17:40 +06:30
phyusin
9647a28f91 dashboard chart UI 2017-11-15 13:27:42 +06:30
Aung Myo
f8cd712ad1 update feedback testing 2017-11-09 17:25:54 +06:30
Yan
35161aae91 remove turbolink in backend and update logout 2017-10-30 18:51:05 +06:30
Yan
c8ee056312 fix hourly chart 2017-10-27 12:01:07 +06:30
Aung Myo
06dd5df432 update puts remove 2017-10-24 11:44:31 +06:30
Aung Myo
f7d3920554 update dashboard total credit and card 2017-10-24 11:42:48 +06:30
Aung Myo
59c38b2c96 update dashboard total sale and count 2017-10-24 10:55:02 +06:30
yamin
1aea52619a UI change 2017-10-23 11:38:10 +06:30
Yan
1f6c05b314 merge with chart 2017-10-11 17:51:29 +06:30
Yan
ce315d342f commented group by hour 2017-10-09 10:05:35 +06:30
Yan
c28751a8e0 login ui modified 2017-10-03 14:11:12 +06:30
Yan
8d48a73cfc compatible test 2017-09-28 18:25:31 +06:30
yamin
a53a5a39b1 dashboard chart data 2017-09-22 10:34:14 +06:30