Commit Graph

4422 Commits

Author SHA1 Message Date
phyusin
aa7012e7ad Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-20 16:53:53 +06:30
phyusin
49ace265dc change query 2018-08-20 16:53:00 +06:30
Aung Myo
4d83a8ebe8 update oqs sidebar 2018-08-20 16:42:30 +06:30
Aung Myo
5c73de2aff Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-08-20 16:17:38 +06:30
Aung Myo
a60268eaa1 update oqs js 2018-08-20 16:17:23 +06:30
phyusin
11074bb308 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-20 16:08:27 +06:30
phyusin
c7ed453c61 change query 2018-08-20 16:05:56 +06:30
Aung Myo
6c602bca21 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2018-08-20 15:44:55 +06:30
Aung Myo
fe11753663 update oqs left sidebar 2018-08-20 15:43:25 +06:30
phyusin
fce09c8f56 add params:item_code for stock check report 2018-08-20 13:22:40 +06:30
phyusin
a2fd489ec4 remove conflict 2018-08-20 12:08:51 +06:30
San Wai Lwin
d486bcc0d2 pull from master 2018-08-20 12:00:13 +06:30
phyusin
49fd427225 change inv query 2018-08-20 11:56:47 +06:30
San Wai Lwin
d1852d24c3 Pull from master 2018-08-20 11:26:07 +06:30
phyusin
0ca0252fed change text to string for sale_audits migrate 2018-08-20 11:23:47 +06:30
San Wai Lwin
3c2faf5970 Edit shop_code 2018-08-20 11:23:05 +06:30
phyusin
ad5815b23e Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-17 17:58:36 +06:30
phyusin
dee3c89ad3 change query and some func: in inv: 2018-08-17 17:57:13 +06:30
Aung Myo
14e63dbadd Merge branch 'adminbsb_material_ui' 2018-08-17 15:18:42 +06:30
Aung Myo
a704decb83 update readme and delivery status for oqs assign item 2018-08-17 15:11:43 +06:30
phyusin
98be1dd01f Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-16 17:42:20 +06:30
phyusin
b91ad06f35 change query for inventory 2018-08-16 17:40:49 +06:30
phyusin
88c2afec90 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-16 15:52:28 +06:30
phyusin
5d6c0d5922 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-08-16 15:50:51 +06:30
phyusin
899f118541 change stock check report and some structure 2018-08-16 15:49:20 +06:30
Jueli Moon Aung
0b892b0000 docker-compose.yml edited online with Bitbucket by Julian 2018-08-16 04:27:55 +00:00
Jueli Moon Aung
ff91894d89 Dockerfile edited online with Bitbucket by Julian 2018-08-16 04:27:12 +00:00
Aung Myo
cc8b107f9f update oqs print in cloud 2018-08-15 15:19:28 +06:30
Aung Myo
0df8a29c2b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-08-14 17:21:23 +06:30
Aung Myo
ba8c723c17 update oqs employee and oqs station 2018-08-14 17:21:06 +06:30
phyusin
a607305b56 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-08-14 15:13:29 +06:30
San Wai Lwin
3a3d281969 Pull from master 2018-08-14 14:04:57 +06:30
San Wai Lwin
ef2fe2ead2 Edit booking_id erroe 2018-08-14 14:03:45 +06:30
San Wai Lwin
400f48967c action.controller 2018-08-14 15:24:17 +06:30
San Wai Lwin
61e4b930c8 edit in check time 2018-08-14 15:22:49 +06:30
San Wai Lwin
671aa155cd Edit for checkin pdf 2018-08-13 14:37:41 +06:30
Aung Myo
f6ec819545 Merge branch 'adminbsb_material_ui' 2018-08-13 11:45:48 +06:30
Aung Myo
74175df8f5 update credit sale with foc 2018-08-13 11:44:59 +06:30
Jueli Moon Aung
a282279ba2 Modify Dockerfile 2018-08-09 10:41:41 +00:00
phyusin
7eb138cdda Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-08 18:02:25 +06:30
phyusin
a6d98093d6 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-08-08 18:01:19 +06:30
San Wai Lwin
f15eea1e5c Edit time 2018-08-08 17:59:15 +06:30
phyusin
9b909ef545 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-08 17:51:03 +06:30
phyusin
cd0184e3c9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-08-08 17:48:47 +06:30
phyusin
83617962c6 add table in receipt detail report 2018-08-08 17:48:22 +06:30
Aung Myo
de20436e8b update order in quick service without dinign 2018-08-08 17:46:01 +06:30
Aung Myo
1c73ee0ed7 update payment controller for print current user with terminal 2018-08-08 16:54:22 +06:30
Aung Myo
9f8aee2251 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-08-08 16:17:22 +06:30
Aung Myo
5e08797b41 print for current cashier 2018-08-08 16:17:04 +06:30
phyusin
78cbbbb956 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-08 14:29:44 +06:30