Aung Myo
|
6d2146893c
|
udpate access code for supervisor and manager
|
2018-05-04 13:45:36 +06:30 |
|
Aung Myo
|
ef81987334
|
udpate access code for supervisor and manager
|
2018-05-04 13:16:57 +06:30 |
|
Aung Myo
|
5099ec6b8f
|
Merge branch 'adminbsb_material_ui'
|
2018-05-03 18:09:28 +06:30 |
|
Aung Myo
|
69eeede474
|
update access code
|
2018-05-03 18:08:27 +06:30 |
|
phyusin
|
ffd3f5f158
|
check exception in check_user
|
2018-05-03 17:53:07 +06:30 |
|
phyusin
|
9e54aa1a27
|
Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-03 17:43:57 +06:30 |
|
phyusin
|
16cb755f11
|
remove conflict
|
2018-05-03 17:43:12 +06:30 |
|
phyusin
|
70c2d0a05d
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-03 17:23:11 +06:30 |
|
phyusin
|
9ff3018323
|
add alert for new,send_to_kitchen and ready_to_delivery
|
2018-05-03 17:22:59 +06:30 |
|
Aung Myo
|
a7721fb706
|
update comflix
|
2018-05-03 09:55:36 +06:30 |
|
Aung Myo
|
28dc5faada
|
update complete tab and other issuse
|
2018-05-03 09:52:53 +06:30 |
|
San Wai Lwin
|
45531453c7
|
Pull from master
|
2018-05-03 09:31:36 +06:30 |
|
San Wai Lwin
|
caa0180e8c
|
Edit UI design and table in OQS
|
2018-05-02 17:55:53 +06:30 |
|
phyusin
|
965962e49d
|
change some func:
|
2018-05-02 16:33:04 +06:30 |
|
San Wai Lwin
|
bd078fc675
|
Edit in customer of Tax Profile
|
2018-05-02 16:00:19 +06:30 |
|
San Wai Lwin
|
e3b2fee46e
|
Change table view in OQS
|
2018-05-02 15:10:58 +06:30 |
|
phyusin
|
6d6b6c6791
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-02 11:59:58 +06:30 |
|
phyusin
|
7c6d842a31
|
change UI and add expected waiting time
|
2018-05-02 11:59:35 +06:30 |
|
Aung Myo
|
bf00eceba0
|
Merge branch 'adminbsb_material_ui'
|
2018-04-30 15:37:43 +06:30 |
|
Aung Myo
|
ff4cdfa158
|
update member discount and tax
|
2018-04-30 15:16:07 +06:30 |
|
phyusin
|
027550121e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-04-30 09:46:04 +06:30 |
|
phyusin
|
929919ba0f
|
change order reservation
|
2018-04-30 09:45:37 +06:30 |
|
Aung Myo
|
57607d0e8b
|
update addorder controller
|
2018-04-27 16:17:55 +06:30 |
|
phyusin
|
11473c7fcd
|
change order reservation
|
2018-04-27 13:47:54 +06:30 |
|
Aung Myo
|
36f097d4cf
|
Merge branch 'adminbsb_material_ui'
|
2018-04-27 10:40:17 +06:30 |
|
Aung Myo
|
eb61e94909
|
update addorder get menu and sub menu
|
2018-04-27 10:39:29 +06:30 |
|
Aung Myo
|
390c9b2dca
|
Merge branch 'adminbsb_material_ui'
|
2018-04-26 13:35:41 +06:30 |
|
Aung Myo
|
3a85481dcd
|
update dinga and paymal
|
2018-04-26 13:07:31 +06:30 |
|
phyusin
|
81407cf95e
|
change query for sale items
|
2018-04-25 15:33:54 +06:30 |
|
phyusin
|
c14960fc96
|
remove conflict data
|
2018-04-25 15:10:10 +06:30 |
|
phyusin
|
b41c85132d
|
add order and reservation, quick service in lookups and add date and order by in order reservation
|
2018-04-25 15:07:43 +06:30 |
|
Aung Myo
|
9b0a564b9a
|
update cable for cloud
|
2018-04-25 13:18:54 +06:30 |
|
phyusin
|
3f13bb6c74
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-04-23 19:21:20 +06:30 |
|
phyusin
|
e62ba4d6c2
|
change params
|
2018-04-23 19:20:03 +06:30 |
|
Nweni
|
285f5d4cd0
|
fixed conflict
|
2018-04-23 18:21:47 +06:30 |
|
Yan
|
86199ab4b4
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-04-23 16:23:35 +06:30 |
|
Yan
|
403f70480d
|
api cloud update
|
2018-04-23 16:23:00 +06:30 |
|
phyusin
|
3d39e398df
|
remove actioncable
|
2018-04-23 16:16:41 +06:30 |
|
Aung Myo
|
6e3a5300a6
|
close cable in cloud mode
|
2018-04-23 15:39:56 +06:30 |
|
Aung Myo
|
31ee7f05fe
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-04-23 14:43:41 +06:30 |
|
Aung Myo
|
5ea950f5aa
|
update addore cable for second display closed
|
2018-04-23 14:43:27 +06:30 |
|
phyusin
|
9b12ed0254
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-04-23 14:41:18 +06:30 |
|
phyusin
|
b92889fb23
|
change base url settings
|
2018-04-23 14:41:07 +06:30 |
|
Aung Myo
|
cbb7a14621
|
update action cable for cloud
|
2018-04-23 14:17:56 +06:30 |
|
Aung Myo
|
8806027793
|
update bugs for demo
|
2018-04-22 16:38:52 +06:30 |
|
Aung Myo
|
1fe48b57d0
|
update action cable for order resservation
|
2018-04-22 14:11:04 +06:30 |
|
Yan
|
268cae09f5
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-04-20 20:27:31 +06:30 |
|
Yan
|
835231bd61
|
edit api cntr
|
2018-04-20 20:27:08 +06:30 |
|
Aung Myo
|
983baa88c9
|
update discount member message
|
2018-04-20 13:00:48 +06:30 |
|
Aung Myo
|
f8687b5010
|
update cloud mode off for order and queue
|
2018-04-20 09:23:11 +06:30 |
|