Aung Myo
|
1a56109d66
|
update conflict with addorderjs
|
2018-05-09 19:01:38 +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 |
|
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 |
|
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 |
|
phyusin
|
ddc759926b
|
check sale_status for split bill
|
2018-05-04 16:52:18 +06:30 |
|
phyusin
|
6eecd2bdb7
|
change rounding adj: error
|
2018-05-04 14:59:15 +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
|
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 |
|
Yan
|
fc69efff16
|
merged master
|
2018-05-04 11:16:44 +06:30 |
|
Yan
|
44ac3bcd0c
|
no change base origami
|
2018-05-04 11:14:54 +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 |
|
Yan
|
57b9c44349
|
merge with master
|
2018-05-03 17:57:49 +06:30 |
|
Yan
|
b0377afb8f
|
no change
|
2018-05-03 17:53:34 +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 |
|
Yan
|
02fe2e57cc
|
no changes
|
2018-05-03 09:29:18 +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 |
|