Commit Graph

1614 Commits

Author SHA1 Message Date
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
Aung Myo
800fa41abb Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-05-11 14:09:56 +06:30
phyusin
baac2c33ea move customer func: from doemal 2018-05-11 13:45:04 +06:30
phyusin
9daf8235a7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-05-11 13:06:13 +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
San Wai Lwin
12f79ded6d Edit Customer form 2018-05-11 11:40:27 +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
a2e7ef0e5a change print settings for cloud 2018-05-10 13:59:19 +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
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
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