Commit Graph

3675 Commits

Author SHA1 Message Date
phyusin
aa3da073bd back btn for pending 2018-05-22 10:59:56 +06:30
Aung Myo
b68169b244 update promotion with tax 2018-05-21 17:26:48 +06:30
Aung Myo
fcfeb6fd98 update js for precompile 2018-05-21 16:57:32 +06:30
Aung Myo
80e9f4fc36 update menu json for unscope4 2018-05-21 15:59:42 +06:30
Aung Myo
f5ad727c08 update menu cateogry and myanmar font in xls 2018-05-21 15:30:15 +06:30
Aung Myo
073e054666 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-21 14:18:09 +06:30
Aung Myo
99b987adea update receipt pdf for 0price 2018-05-21 14:17:15 +06:30
Aung Myo
38e89674e9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-21 13:05:09 +06:30
Aung Myo
5a9dae725e update conflict js 2018-05-21 13:04:00 +06:30
Aung Myo
7e8b69aa7c update action cable and other bugs 2018-05-21 13:00:55 +06:30
phyusin
ea01290a19 remove back btn 2018-05-21 12:39:34 +06:30
San Wai Lwin
cfc672dc31 Pull from master 2018-05-21 11:12:12 +06:30
San Wai Lwin
85625b7090 Edit in A5pdf 2018-05-21 11:08:08 +06:30
San Wai Lwin
98b043c170 Edit in receipt Bill 2018-05-21 10:11:12 +06:30
phyusin
75d7999f76 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-18 18:17:36 +06:30
phyusin
dbfebde010 action controller 2018-05-18 18:16:54 +06:30
phyusin
e0a1c6c0e7 order reservation 2018-05-18 18:15:42 +06:30
phyusin
5316f23ba7 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-18 18:02:40 +06:30
phyusin
4069f61bfc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-18 18:02:20 +06:30
phyusin
e1bb01c029 change dashboard query and report 2018-05-18 18:01:44 +06:30
Aung Myo
e722ab88e9 Merge branch 'adminbsb_material_ui' 2018-05-18 17:38:17 +06:30
Aung Myo
d7992cd4b8 update access code for void foc and edit 2018-05-18 16:57:34 +06:30
San Wai Lwin
c1525be826 Pull from master 2018-05-18 16:26:03 +06:30
San Wai Lwin
610d39847e Add Approved By for waste & Spolie in Receive 2018-05-18 16:23:14 +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
b2c66f3a92 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-18 13:06:50 +06:30
Aung Myo
e120a32307 Merge branch 'adminbsb_material_ui' 2018-05-18 12:26:44 +06:30
Aung Myo
0b7834ff29 update pay process order 2018-05-18 12:25:47 +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
f5604d8c9c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-18 09:49:50 +06:30
San Wai Lwin
fa160c8292 Pull from master 2018-05-18 09:49:47 +06:30
phyusin
fbb80c3f01 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-17 17:53:29 +06:30
phyusin
679d3f838c Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-17 17:52:49 +06:30
phyusin
e609e33246 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-17 17:52:14 +06:30
phyusin
6890b3a01e check report and change alert for order reservation 2018-05-17 17:51:47 +06:30
Aung Myo
fb5cfc9bd7 Merge branch 'adminbsb_material_ui' 2018-05-17 17:02:04 +06:30
Aung Myo
a3f7e21120 update touch start in print 2018-05-17 17:01:18 +06:30
phyusin
a276646a03 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-17 16:42:16 +06:30
phyusin
3838ee29e0 change func: for receipt bill 2018-05-17 16:39:59 +06:30
phyusin
cf4978fca0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-17 14:12:37 +06:30
phyusin
1c366839db Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-17 14:09:10 +06:30
phyusin
34fd712f5e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-17 14:08:25 +06:30
phyusin
aede22e976 check rounding adj in all_void 2018-05-17 14:07:19 +06:30