Commit Graph

1826 Commits

Author SHA1 Message Date
phyusin
91fc8696af check order items arr 2018-07-17 14:45:14 +06:30
phyusin
50f5094efc remove conflict 2018-07-16 10:58:12 +06:30
phyusin
6fd04b4632 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-07-16 09:54:09 +06:30
phyusin
4783e35942 add dashboard settings and customer create 2018-07-13 18:00:49 +06:30
San Wai Lwin
b25dfa420c Delect in OQS_station_by_zone 2018-07-13 15:26:33 +06:30
phyusin
0096c1479d remove conflict 2018-07-13 14:49:56 +06:30
phyusin
533a3999fb change credit payment query 2018-07-13 14:44:29 +06:30
San Wai Lwin
043a1efb2a Delete in table 2018-07-13 14:04:38 +06:30
phyusin
dd4db6d2e7 remove conflict data 2018-07-12 15:54:30 +06:30
phyusin
03abeabb4e close cashier pdf and receipt bill pdf changes for credit payment 2018-07-12 15:50:58 +06:30
San Wai Lwin
042aec0121 Pull from master 2018-07-12 15:09:37 +06:30
San Wai Lwin
052d5e8c9c Edit dashboard ligin 2018-07-12 15:07:52 +06:30
Aung Myo
eef4af4cc6 update sale audit 2018-07-12 13:55:27 +06:30
Aung Myo
7945da99ed update sale audit all process in origami 2018-07-12 13:10:11 +06:30
phyusin
c4ab456176 credit payment for quick service 2018-07-11 18:32:09 +06:30
phyusin
47b59cca59 remove conflict data 2018-07-10 18:13:41 +06:30
phyusin
bf0f76ebc7 credit payment function 2018-07-10 18:12:25 +06:30
Aung Myo
441f37ba8a update repriint 2018-07-10 16:13:09 +06:30
Aung Myo
1fc4483817 Merge branch 'adminbsb_material_ui' 2018-07-10 16:11:40 +06:30
Aung Myo
9924aaef8a update vodi and pay foc waste and spoil for other paymtnt amount in receipt pdf 2018-07-10 16:10:04 +06:30
Aung Myo
158760abdb update vodi and pay foc waste and spoil for other paymtnt amount in receipt pdf 2018-07-10 16:05:37 +06:30
Aung Myo
8307dea14b Merge branch 'ui_ux_changes' 2018-07-10 15:24:31 +06:30
Aung Myo
5c8fd3666d update other charge add to recipt bill and close pdf 2018-07-10 15:16:49 +06:30
Aung Myo
bfce0dc044 added receipt no detail report 2018-07-09 17:27:51 +06:30
phyusin
a60f80a874 remove conflict 2018-07-09 09:44:36 +06:30
San Wai Lwin
6891756ae8 Pull from master 2018-07-09 09:27:52 +06:30
phyusin
5ff15a1eff edit order on off with setting 2018-07-06 15:53:37 +06:30
Aung Myo
a5bb0a6746 update optimization 2018-07-05 18:19:16 +06:30
phyusin
794c4e9ed2 credit payment view 2018-07-05 17:03:29 +06:30
San Wai Lwin
e5eb9b90ad Pull from master 2018-07-05 15:42:58 +06:30
San Wai Lwin
ebaf4ad418 Add Account Filture 2018-07-05 15:29:33 +06:30
phyusin
a635856662 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-07-05 13:13:49 +06:30
Aung Myo
f0df6a80ba update optimzation 2018-07-05 12:50:16 +06:30
phyusin
2a4a796ae5 conflict data 2018-07-04 18:47:26 +06:30
phyusin
2d05886be4 UI for credit payment 2018-07-04 18:46:13 +06:30
Aung Myo
43fffe9c62 pull ui_ux 2018-07-04 18:12:39 +06:30
Aung Myo
4f9a4e2984 update db index 2018-07-04 18:08:15 +06:30
San Wai Lwin
a3c24e8bf6 Pull from master 2018-07-04 15:23:57 +06:30
San Wai Lwin
d076e50cdb Edit Order item unmatch 2018-07-04 15:22:39 +06:30
Aung Myo
bdd20f727e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-07-04 14:25:07 +06:30
Aung Myo
69333505e7 update reduce loading 2018-07-04 14:24:31 +06:30
phyusin
9de4ca04dc check query and tax for webview 2018-07-04 11:42:19 +06:30
Aung Myo
4750f03ea8 Merge branch 'adminbsb_material_ui' 2018-07-01 15:55:39 +06:30
Aung Myo
985604cd1f update zone json 2018-07-01 15:54:44 +06:30
phyusin
60a1ef61a4 add payment type filter for order reservation 2018-07-03 10:34:24 +06:30
Aung Myo
e94024644d Merge branch 'adminbsb_material_ui' 2018-07-01 17:38:21 +06:30
Aung Myo
a69128da0d update new request fixed 2018-07-01 17:14:08 +06:30
phyusin
6fd337a8e0 reprint for cloud 2018-06-29 14:36:52 +06:30
phyusin
f6e0e14383 change some report format 2018-06-28 11:45:07 +06:30
phyusin
399c72e128 cloud domain 2018-06-27 14:38:22 +06:30