Commit Graph

4077 Commits

Author SHA1 Message Date
phyusin
bf0f76ebc7 credit payment function 2018-07-10 18:12:25 +06:30
phyusin
d0118d2cfc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-07-09 10:19:26 +06:30
phyusin
a35a76b1ce remove alert 2018-07-09 10:17:40 +06:30
phyusin
96d539f141 remove conflict data 2018-07-09 10:12:06 +06:30
phyusin
a60f80a874 remove conflict 2018-07-09 09:44:36 +06:30
phyusin
146f727f46 Merge branch 'doemal_ordering' of bitbucket.org:code2lab/sxrestaurant 2018-07-06 18:26:15 +06:30
EikhantMon
26412da8ad change tax func: 2018-07-06 18:24:03 +06:30
phyusin
c6d7b466f5 Merge branch 'doemal_ordering' of bitbucket.org:code2lab/sxrestaurant 2018-07-06 17:12:23 +06:30
EikhantMon
08ae578e39 Merge branch 'doemal_ordering' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-07-06 17:08:34 +06:30
EikhantMon
884f411f57 check tax function 2018-07-06 17:08:12 +06:30
Aung Myo
1635db7247 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-07-06 15:54:40 +06:30
Aung Myo
7208b11071 update payment view for cloud 2018-07-06 15:54:18 +06:30
phyusin
5ff15a1eff edit order on off with setting 2018-07-06 15:53:37 +06:30
phyusin
8e28559fb0 add index in migrate file 2018-07-06 11:55:22 +06:30
EikhantMon
56ad5153bc Merge branch 'doemal_ordering' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-07-06 09:56:54 +06:30
Aung Myo
6e197fb37e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-07-05 18:35:46 +06:30
Aung Myo
a5bb0a6746 update optimization 2018-07-05 18:19:16 +06:30
Jueli Moon Aung
58eb7ecb00 .gitignore edited online with Bitbucket 2018-07-05 10:55:32 +00:00
phyusin
794c4e9ed2 credit payment view 2018-07-05 17:03:29 +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
EikhantMon
6369ec972e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-07-05 09:40:00 +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
EikhantMon
8079282cb6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-07-04 14:28:44 +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
EikhantMon
002083ca21 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-07-04 11:46:23 +06:30
phyusin
9de4ca04dc check query and tax for webview 2018-07-04 11:42:19 +06:30
EikhantMon
6033fb929e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-07-03 16:03:29 +06:30
EikhantMon
c35b6e7a1d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-07-03 13:16:52 +06:30
EikhantMon
29c127099b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-07-03 11:50:24 +06:30
Aung Myo
4750f03ea8 Merge branch 'adminbsb_material_ui' 2018-07-01 15:55:39 +06:30
phyusin
8afb2e7c5e Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-07-03 13:31:20 +06:30
phyusin
65ef676a24 check foc and void for not cashier role 2018-07-03 13:30:34 +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
0ffcd281b7 Merge branch 'adminbsb_material_ui' 2018-07-02 11:33:06 +06:30
Aung Myo
ecf9134b04 update printsetting form 2018-07-02 11:32:10 +06:30
Aung Myo
a69128da0d update new request fixed 2018-07-01 17:14:08 +06:30
Aung Myo
985604cd1f update zone json 2018-07-01 15:54:44 +06:30
Aung Myo
80b84eb175 update move table 2018-07-01 13:14:38 +06:30
Aung Myo
96b2be96b0 Merge branch 'adminbsb_material_ui' 2018-07-01 11:47:01 +06:30
Aung Myo
0897068e5b update move loading 2018-07-01 11:45:54 +06:30
phyusin
6fd337a8e0 reprint for cloud 2018-06-29 14:36:52 +06:30
phyusin
ecfecf2e6f receipt no report tax 2018-06-28 18:06:46 +06:30