Commit Graph

1636 Commits

Author SHA1 Message Date
Aung Myo
df781395c8 update oqs and read me 2018-03-13 11:40:05 +06:30
Aung Myo
40d55ae546 Merge branch 'adminbsb_material_ui' 2018-03-13 10:31:03 +06:30
Aung Myo
5b99a8cf65 update reload second display 2018-03-13 10:26:18 +06:30
phyusin
92401ab4f9 merge with old_town_aston req 2018-03-12 12:10:52 +06:30
Aung Myo
6e9ecd342b update second display 2018-03-12 10:42:29 +06:30
Aung Myo
04b053d2b7 fixed conflix payment page 2018-03-11 16:37:33 +06:30
Aung Myo
4ea2337fae update second display 2018-03-11 16:14:44 +06:30
phyusin
b0c35baf50 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-09 14:19:13 +06:30
phyusin
9a96f066e9 change print popup function 2018-03-09 14:17:40 +06:30
Aung Myo
1f4ea558c6 Merge branch 'adminbsb_material_ui' 2018-03-09 14:05:39 +06:30
phyusin
9c89bce25d change take away customer for quick service 2018-03-09 14:05:18 +06:30
Aung Myo
8ce14f8c99 update queui chang 2018-03-09 14:04:26 +06:30
phyusin
91e76c7381 check click event for logout 2018-03-09 13:29:24 +06:30
phyusin
21d39349d3 check shift update data 2018-03-09 11:54:35 +06:30
phyusin
d7d5f8afc7 check manager account login error in dashboard 2018-03-09 10:55:28 +06:30
phyusin
7dd0f71894 check and fixed SQA feedback 2018-03-09 09:49:19 +06:30
phyusin
fcc076a19e change route in other payment 2018-03-08 15:16:39 +06:30
phyusin
23be4771fd add function for member card and qr code in payment 2018-03-08 14:57:45 +06:30
phyusin
d9a7e341fa cadd print pdf in payment page 2018-03-08 10:01:54 +06:30
phyusin
5d8ba3c416 remove comment in action controller 2018-03-07 15:55:55 +06:30
phyusin
aedd79376f receipt no and print pdf 2018-03-07 15:36:05 +06:30
phyusin
8dbe7e20c4 check dining facility in transactions 2018-03-05 16:58:11 +06:30
phyusin
311bef4411 merge with Old Town Req 2018-03-05 15:10:36 +06:30
phyusin
5eec1ad377 check product sale query 2018-03-05 14:12:30 +06:30
Aung Myo
87b51dbf82 Merge branch 'quick_service' 2018-03-05 13:56:23 +06:30
Aung Myo
01d217fd0f update conflix split pull 2018-02-28 17:04:35 +06:30
phyusin
a70b649e46 Merge branch 'r-1802001-01-c1' of bitbucket.org:code2lab/sxrestaurant into r-1802001-01-c1 2018-02-28 16:27:05 +06:30
phyusin
2f7d9523ec check product sale 2018-02-28 16:26:40 +06:30
San Wai Lwin
bb6b3794b3 Edit in dashboard Total Sale->Net Sale, Grand Total->Gross Sale to same with close_cashier_customise_pdf.rb 2018-02-28 16:16:14 +06:30
phyusin
32818abf49 change in xls 2018-02-28 15:44:15 +06:30
phyusin
7c8b5def81 check product sale 2018-02-28 15:42:07 +06:30
Aung Myo
1d70a9f178 update fixed issues for quickservice from sqa 2018-02-28 14:20:22 +06:30
phyusin
32340c52e6 check discount calculation 2018-02-28 13:55:24 +06:30
Aung Myo
0acd533bfe update add oredr 2018-02-28 10:14:18 +06:30
phyusin
5886389827 check discount 2018-02-28 10:01:42 +06:30
phyusin
adefd8c034 remove conflict data 2018-02-27 14:35:21 +06:30
phyusin
3e0943275f check bacck btn 2018-02-27 11:35:26 +06:30
phyusin
fc3cd1e72d check order item 2018-02-27 11:33:51 +06:30
phyusin
28a8b863aa Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-27 11:09:40 +06:30
phyusin
d8243afaab check = split btn 2018-02-27 11:09:28 +06:30
phyusin
700ff91127 product sale 2018-02-27 10:27:52 +06:30
phyusin
1b1206d735 add Old Town req: 2018-02-27 10:02:14 +06:30
phyusin
a44c6c097c conflict remove 2018-02-26 18:47:03 +06:30
Aung Myo
ce8581f892 fixed conflic when pull master item remark 2018-02-26 17:02:46 +06:30
Aung Myo
b38e98a22a update edit with remark 2018-02-26 16:56:57 +06:30
phyusin
0f36e44d1c check route in product sale 2018-02-26 11:33:51 +06:30
phyusin
5523ff6fc1 check product sale report 2018-02-26 11:24:47 +06:30
phyusin
a76d0ddbcd change assigned order item id to order item id in Origami/Room 2018-02-26 10:09:33 +06:30
phyusin
da7dad05e4 Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-26 10:01:49 +06:30
phyusin
8b064a4428 change assigned item id to order item id 2018-02-26 10:01:35 +06:30