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 |
|
phyusin
|
45d50180a1
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-17 11:46:37 +06:30 |
|
phyusin
|
7b97135645
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-17 11:43:38 +06:30 |
|
phyusin
|
234ab26644
|
check survey issue
|
2018-05-17 11:43:04 +06:30 |
|
phyusin
|
01a545b9ec
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-17 11:23:23 +06:30 |
|
phyusin
|
b44d2845ef
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-17 11:22:38 +06:30 |
|
phyusin
|
b7c65dd0ca
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-17 11:22:01 +06:30 |
|
phyusin
|
62dec82bd8
|
change dailysale report and check tax in add to existing
|
2018-05-17 11:21:38 +06:30 |
|
Aung Myo
|
3dc2863c4f
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-17 10:44:37 +06:30 |
|
Aung Myo
|
942380afff
|
update discount with junctionpay
|
2018-05-17 10:40:29 +06:30 |
|
San Wai Lwin
|
9dc6aa289c
|
Edit in Survey form javascript
|
2018-05-17 10:16:04 +06:30 |
|
Aung Myo
|
e5ea6a90e8
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-17 09:29:41 +06:30 |
|
Aung Myo
|
ca360c75d6
|
update cash in and out for quick service
|
2018-05-16 18:01:47 +06:30 |
|
phyusin
|
02ff79a68c
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-16 17:16:23 +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
|
c386fcfa03
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-16 14:23:36 +06:30 |
|
Aung Myo
|
29434f2df9
|
update void paymal search
|
2018-05-16 14:20:20 +06:30 |
|
Aung Myo
|
95faa6fdb4
|
update edit controller for update qty without assigne items
|
2018-05-16 13:54:14 +06:30 |
|
Aung Myo
|
695461d2c5
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-16 13:18:04 +06:30 |
|
Aung Myo
|
800ea01f23
|
bugs fixed
|
2018-05-16 13:17:52 +06:30 |
|
San Wai Lwin
|
40b27e8d8d
|
Pull from master
|
2018-05-16 10:30:29 +06:30 |
|