San Wai Lwin
|
f1733d9f06
|
Pull from master
|
2018-05-22 13:26:23 +06:30 |
|
San Wai Lwin
|
cfc672dc31
|
Pull from master
|
2018-05-21 11:12:12 +06:30 |
|
San Wai Lwin
|
c1525be826
|
Pull from master
|
2018-05-18 16:26:03 +06:30 |
|
phyusin
|
aede22e976
|
check rounding adj in all_void
|
2018-05-17 14:07:19 +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
|
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
|
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
|
29434f2df9
|
update void paymal search
|
2018-05-16 14:20:20 +06:30 |
|
Aung Myo
|
800ea01f23
|
bugs fixed
|
2018-05-16 13:17:52 +06:30 |
|
Aung Myo
|
c08c72d0cb
|
update cash in and out for shift
|
2018-05-16 09:23:10 +06:30 |
|
San Wai Lwin
|
8fda04372d
|
Add total waste and spoil in close cashier and Closing Balance မွာ Character ေတြ ရိုက္လို႕ရေန
|
2018-05-14 15:31:00 +06:30 |
|
San Wai Lwin
|
49319d80cc
|
Pull from master
|
2018-05-14 11:38:39 +06:30 |
|
phyusin
|
ae5ced251b
|
remove conflict
|
2018-05-11 12:01:27 +06:30 |
|
phyusin
|
760c7685df
|
fixed some issue
|
2018-05-11 11:59:30 +06:30 |
|
Aung Myo
|
5e0bdf1e36
|
update bugs
|
2018-05-11 09:57:26 +06:30 |
|
Aung Myo
|
80f353ba3c
|
update void edit with access code
|
2018-05-10 16:31:39 +06:30 |
|
phyusin
|
70b3e88b0e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-10 14:34:26 +06:30 |
|
Aung Myo
|
6f8cae303e
|
update route conflict for addorder
|
2018-05-10 14:31:24 +06:30 |
|
Aung Myo
|
7b5c04c797
|
update add order cache menu
|
2018-05-10 14:28:28 +06:30 |
|
phyusin
|
d7d3765875
|
add sale_status for waste and spoile
|
2018-05-10 14:22:37 +06:30 |
|
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 |
|
phyusin
|
fe306dc26b
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-09 15:07:29 +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 |
|
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
|
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 |
|
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 |
|