Commit Graph

728 Commits

Author SHA1 Message Date
phyusin
e1bb01c029 change dashboard query and report 2018-05-18 18:01:44 +06:30
San Wai Lwin
c1525be826 Pull from master 2018-05-18 16:26:03 +06:30
Yan
5e4b727d52 remove console.log 2018-05-18 16:00:45 +06:30
Yan
0e4d321142 actioncable test 2018-05-18 15:32:29 +06:30
Yan
881593ce2c acable test 2018-05-18 15:12:58 +06:30
Yan
ba1ad69181 acable test 2018-05-18 14:58:51 +06:30
Yan
b1449d8d35 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-18 14:38:48 +06:30
Yan
0d2f609b07 ac test 2018-05-18 14:38:31 +06:30
Aung Myo
e120a32307 Merge branch 'adminbsb_material_ui' 2018-05-18 12:26:44 +06:30
Aung Myo
9c26e63110 update menu asc with name 2018-05-18 11:57:20 +06:30
Yan
39e7269fc1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-18 11:15:52 +06:30
Yan
1e38ebcd51 update cable 2018-05-18 11:15:25 +06:30
phyusin
6890b3a01e check report and change alert for order reservation 2018-05-17 17:51:47 +06:30
phyusin
62dec82bd8 change dailysale report and check tax in add to existing 2018-05-17 11:21:38 +06:30
phyusin
95e94bd0fd Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-16 17:15:43 +06:30
phyusin
dc23df673f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-16 17:15:17 +06:30
phyusin
fa4c5d075e check menu is_available, survey id and check status with sale items SUM in receipBill 2018-05-16 17:08:00 +06:30
Aung Myo
800ea01f23 bugs fixed 2018-05-16 13:17:52 +06:30
phyusin
af9efb5fa0 hide popup modal in order reservation 2018-05-14 18:14:23 +06:30
phyusin
cef2249214 change modal close function 2018-05-14 16:38:40 +06:30
phyusin
5ddfad7ef8 conflict data remove 2018-05-14 15:46:34 +06:30
phyusin
39dce3424e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-14 15:42:35 +06:30
phyusin
1c8ea30efa change popup ui 2018-05-14 15:42:11 +06:30
San Wai Lwin
8fda04372d Add total waste and spoil in close cashier and Closing Balance မွာ Character ေတြ ရိုက္လို႕ရေန 2018-05-14 15:31:00 +06:30
Aung Myo
e264e7a32b update addorder js and css 2018-05-14 15:23:15 +06:30
phyusin
cc0178eb65 check code in mp3 file 2018-05-14 11:34:33 +06:30
phyusin
050d3379c0 check api issue 2018-05-12 15:20:57 +06:30
phyusin
c7c32ffff4 change order reservation 2018-05-12 11:38:43 +06:30
phyusin
7d45e6ca81 check token for cloud 2018-05-11 17:52:52 +06:30
phyusin
c65bf1c163 check shop code in order reservation 2018-05-11 17:14:42 +06:30
phyusin
0a07b3479d check shop code for new order 2018-05-11 17:03:53 +06:30
Aung Myo
d141947eb0 update oqs and addorder qty 0 2018-05-11 14:06:23 +06:30
phyusin
760c7685df fixed some issue 2018-05-11 11:59:30 +06:30
phyusin
39d4a6ae48 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-10 15:51:00 +06:30
phyusin
9fe77bb283 chagne notification modal 2018-05-10 15:50:46 +06:30
Aung Myo
f239a3f87c update pdf view height 2018-05-10 15:40:56 +06:30
Aung Myo
6f8cae303e update route conflict for addorder 2018-05-10 14:31:24 +06:30
Aung Myo
7b5c04c797 update add order cache menu 2018-05-10 14:28:28 +06:30
phyusin
abbff492e8 add API for order reservation 2018-05-10 12:37:17 +06:30
phyusin
4d2e872c7d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-10 09:13:29 +06:30
phyusin
0127b23e93 change order reservation data 2018-05-09 19:10:11 +06:30
Aung Myo
1a56109d66 update conflict with addorderjs 2018-05-09 19:01:38 +06:30
Aung Myo
5d870df7f5 update addorder cache 2018-05-09 18:59:37 +06:30
Aung Myo
09628b959c update addorder js for set item 2018-05-09 17:15:52 +06:30
Aung Myo
efa5350883 cache menu 2018-05-09 16:46:54 +06:30
phyusin
58513dc08a change report 2018-05-09 15:07:19 +06:30
Aung Myo
2cdb18d338 menu cache for menu category 2018-05-09 13:56:37 +06:30
phyusin
1e05522c42 change report UI 2018-05-09 13:34:30 +06:30
phyusin
a11fc9e31c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-09 11:28:15 +06:30
phyusin
4faee913f3 change order reservation -not finished 2018-05-09 11:28:01 +06:30