Commit Graph

3409 Commits

Author SHA1 Message Date
phyusin
57a6f03917 image import from csv 2018-06-21 15:42:11 +06:30
phyusin
6ed3cb64e8 checked shift open or not 2018-06-21 14:28:01 +06:30
phyusin
00ff9432fa Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-21 11:33:43 +06:30
phyusin
9c6edffd59 menu export import 2018-06-21 11:33:22 +06:30
Aung Myo
e45e17968f update receipt bill pdf for promotion % and netprice with sub total wrong 2018-06-20 17:54:31 +06:30
phyusin
84084303f4 check tax for promo activated 2018-06-20 14:57:52 +06:30
phyusin
d024810739 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-20 11:10:51 +06:30
San Wai Lwin
036a4a3ff0 Edit route for delete in print Settings 2018-06-20 11:09:25 +06:30
phyusin
ac5fda7c2a change promotion item query for bill 2018-06-20 11:09:14 +06:30
phyusin
994b104239 check print_settings is active or not in check-out 2018-06-20 09:26:53 +06:30
Aung Myo
4be28c1e67 update other payment with bank 2018-06-19 14:56:23 +06:30
Aung Myo
51a49f2171 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-06-19 14:52:07 +06:30
Aung Myo
adbccb950e update other payment with bank 2018-06-19 14:51:21 +06:30
phyusin
c1a31faf05 check update order in api 2018-06-19 14:34:10 +06:30
phyusin
7199f724ef Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-19 14:04:02 +06:30
phyusin
5dbf622401 check survey shift update 2018-06-19 14:03:24 +06:30
San Wai Lwin
ec7ee8d675 Add Change Order PDF 2018-06-19 13:35:11 +06:30
San Wai Lwin
8d1b15f119 Pull from master 2018-06-19 11:02:09 +06:30
phyusin
1deac0107c Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-19 10:53:13 +06:30
phyusin
3a8fba973e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-19 10:52:15 +06:30
San Wai Lwin
555ff6e684 Delect Lookup for check in out 2018-06-19 10:48:56 +06:30
Aung Myo
316b8a5197 Merge branch 'adminbsb_material_ui' 2018-06-19 09:56:11 +06:30
Aung Myo
c7fde4b60c update secret file for devlopment 2018-06-19 09:55:06 +06:30
phyusin
eac5f8a7d4 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-18 17:35:55 +06:30
phyusin
74be50492d check multiple cashier terminal in bill_controller 2018-06-18 16:25:45 +06:30
San Wai Lwin
234c00f105 pull from master 2018-06-18 16:14:59 +06:30
San Wai Lwin
25a8381681 Add Check in out pdf 2018-06-18 16:05:54 +06:30
phyusin
f6843068d9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-18 11:48:07 +06:30
phyusin
7277af0437 change header text 2018-06-18 11:47:35 +06:30
Aung Myo
2de538aee6 update conflic 2018-06-18 10:41:50 +06:30
Aung Myo
aec212d127 update lookup display type 2018-06-18 10:39:52 +06:30
phyusin
b9a8912f01 reduce query in dashboard 2018-06-18 10:29:30 +06:30
phyusin
86b83125e6 change some fun: for dashboard 2018-06-15 18:19:53 +06:30
phyusin
c33ae58b07 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-15 16:52:08 +06:30
phyusin
eccadd0c1a add in duty report and change in duty module 2018-06-15 16:51:32 +06:30
Aung Myo
3ac9a4b3c5 Merge branch 'adminbsb_material_ui' 2018-06-15 11:40:49 +06:30
Aung Myo
2bd2de7da6 fixed validate item attributes 2018-06-15 11:39:39 +06:30
phyusin
4a2d4b1007 fixed for reprint and query 2018-06-13 17:40:18 +06:30
Aung Myo
6952ce7359 update move table 2018-06-13 14:14:14 +06:30
Aung Myo
fcac3cf46f update move table 2018-06-13 13:55:57 +06:30
Aung Myo
bcf009d322 update move table 2018-06-13 13:54:39 +06:30
Aung Myo
3909d98c70 Merge branch 'adminbsb_material_ui' 2018-06-13 13:43:45 +06:30
Aung Myo
f41b882730 update move table 2018-06-13 13:43:02 +06:30
San Wai Lwin
223a84ec67 Pull from masterဓ 2018-06-13 11:19:52 +06:30
San Wai Lwin
9df975db1c Modified reprint color and click event 2018-06-13 11:18:32 +06:30
Aung Myo
676ec4d611 update addorder for product 2018-06-13 11:18:16 +06:30
Aung Myo
33324ed511 Merge branch 'adminbsb_material_ui' 2018-06-13 09:54:01 +06:30
Aung Myo
b949263979 update type password for access code 2018-06-13 09:53:07 +06:30
Aung Myo
dda4aa986d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-06-12 18:02:40 +06:30
Aung Myo
995c8480e0 update foc with other payment 2018-06-12 18:02:17 +06:30