Commit Graph

1327 Commits

Author SHA1 Message Date
phyusin
6e5064cf9f remove confilct data 2018-05-14 10:17:26 +06:30
phyusin
050d3379c0 check api issue 2018-05-12 15:20:57 +06:30
phyusin
d77d774a6f check token 2018-05-12 12:25:11 +06:30
phyusin
c7c32ffff4 change order reservation 2018-05-12 11:38:43 +06:30
phyusin
baac2c33ea move customer func: from doemal 2018-05-11 13:45:04 +06:30
phyusin
a76f9068da check nil for cus info 2018-05-11 13:39:32 +06:30
Aung Myo
cf44fbdf88 fixed first bill with discount 2018-05-11 13:01:03 +06:30
Aung Myo
87913956f1 fixed first bill with discount 2018-05-11 11:54:53 +06:30
Aung Myo
5e0bdf1e36 update bugs 2018-05-11 09:57:26 +06:30
phyusin
abbff492e8 add API for order reservation 2018-05-10 12:37:17 +06:30
phyusin
d2ae16177b change tax with takeaway 2018-05-10 09:17:26 +06:30
phyusin
0127b23e93 change order reservation data 2018-05-09 19:10:11 +06:30
phyusin
0f1ce09416 change customer and sale tax for takeaway 2018-05-09 15:40:13 +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
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
phyusin
cb3711e84b Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-04 16:52:51 +06:30
San Wai Lwin
2f398bcfeb Pull from master 2018-05-04 16:08:45 +06:30
phyusin
c6f654808c add dine-in cashier settings in lookups 2018-05-04 14:09:58 +06:30
San Wai Lwin
084bf7eb1b remove comment data 2018-05-04 10:12:28 +06:30
San Wai Lwin
39264db517 Edit Waste and Spoil report showing by menu category,sorting by menu category, product name Qty and UI change 2018-05-04 09:52:52 +06:30
San Wai Lwin
45531453c7 Pull from master 2018-05-03 09:31:36 +06:30
phyusin
faa8b82295 Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-05-02 13:49:17 +06:30
phyusin
7c6d842a31 change UI and add expected waiting time 2018-05-02 11:59:35 +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
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
314058282e puma deleted by sqa-1804-001 2018-04-25 15:14:40 +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
d0ad95c8d6 change name 2018-04-23 19:32:32 +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
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
Aung Myo
6e3a5300a6 close cable in cloud mode 2018-04-23 15:39:56 +06:30
phyusin
2255fcd2d4 add token in lookups 2018-04-23 15:09:04 +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
Yan
6ce1fbf8a9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-23 11:49:58 +06:30
Yan
509d3a2b18 add mysql config option wait timeout 2018-04-23 11:49:36 +06:30
Aung Myo
b949020153 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-22 15:07:56 +06:30
Aung Myo
def208bc75 update requestBill 2018-04-22 14:43:32 +06:30
Aung Myo
5f95bf5f4d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-22 14:12:33 +06:30