Commit Graph

1064 Commits

Author SHA1 Message Date
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
efa5350883 cache menu 2018-05-09 16:46:54 +06:30
phyusin
fe306dc26b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-09 15:07:29 +06:30
phyusin
58513dc08a change report 2018-05-09 15:07:19 +06:30
Aung Myo
c06cc1be6d update access code for admin,manager and superviso 2018-05-09 14:06:43 +06:30
Aung Myo
2cdb18d338 menu cache for menu category 2018-05-09 13:56:37 +06:30
phyusin
4faee913f3 change order reservation -not finished 2018-05-09 11:28:01 +06:30
phyusin
313f1b2909 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-08 17:28:19 +06:30
phyusin
1716d14df3 change order reservation 2018-05-08 17:28:09 +06:30
Aung Myo
42a15d3023 update cache menu 2018-05-08 15:54:15 +06:30
Aung Myo
2d73e63e7b update cache menu 2018-05-08 15:47:11 +06:30
phyusin
391cc19117 check order reservation 2018-05-07 13:32:58 +06:30
Aung Myo
be9218dd79 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-04 18:10:14 +06:30
Aung Myo
d0b14cf81b update access code in spereat view 2018-05-04 18:10:00 +06:30
San Wai Lwin
bb4c004406 pull from master 2018-05-04 18:00:44 +06:30
phyusin
6eecd2bdb7 change rounding adj: error 2018-05-04 14:59:15 +06:30
phyusin
fcbd240e5e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-04 14:30:28 +06:30
phyusin
621596690e change UI in order reservation 2018-05-04 14:30:17 +06:30
Aung Myo
4a9f73f006 Merge branch 'adminbsb_material_ui' 2018-05-04 14:19:55 +06:30
Aung Myo
727070a1b8 update void access code 2018-05-04 14:19:17 +06:30
phyusin
0ef0c859b9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-04 14:10:08 +06:30
phyusin
c6f654808c add dine-in cashier settings in lookups 2018-05-04 14:09:58 +06:30
Aung Myo
9abf2d2f5e Merge branch 'adminbsb_material_ui' 2018-05-04 13:46:21 +06:30
Aung Myo
ef81987334 udpate access code for supervisor and manager 2018-05-04 13:16:57 +06:30
phyusin
162327ac4c receipt bill issue 2018-05-04 11:51:14 +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
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
phyusin
965962e49d change some func: 2018-05-02 16:33:04 +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
929919ba0f change order reservation 2018-04-30 09:45:37 +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
San Wai Lwin
8e7fd2d747 Edit in Reference No in CB 2018-04-26 17:23:01 +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