Commit Graph

772 Commits

Author SHA1 Message Date
Moe Su
aa8e795d45 Topup payment 2018-03-16 17:50:45 +06:30
Aung Myo
919846ef5c Merge branch 'adminbsb_material_ui' 2018-03-16 17:42:25 +06:30
Aung Myo
e956b54886 update option and menu export csv single 2018-03-16 17:41:30 +06:30
phyusin
8cea60ec02 SQA urgent issues 2018-03-16 09:42:56 +06:30
Yan
c982da4264 add printer brand and api and type 2018-03-15 18:56:29 +06:30
phyusin
dcac662c8e change set menu item format in api and origami 2018-03-15 15:51:12 +06:30
San Wai Lwin
1188f6e8e9 Pull from master 2018-03-15 13:48:52 +06:30
San Wai Lwin
96f8640df7 Edit Dashboard's photo and Add Bread Crumb Name 2018-03-15 13:46:40 +06:30
phyusin
0a7ced35ab Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-15 11:15:53 +06:30
phyusin
c7f11c2a33 fixed set menu item update and individual payment 2018-03-15 11:15:43 +06:30
phyusin
0edc92d066 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-03-14 09:16:14 +06:30
San Wai Lwin
84fe089568 Active tab in dashboard, Manager Tab, Union Payment 2018-03-13 17:53:04 +06:30
Aung Myo
44389d485a update request bill reload in quick service 2018-03-13 17:38:25 +06:30
Aung Myo
bf1b7ecb56 update payment controller if member 2018-03-13 14:59:23 +06:30
San Wai Lwin
a0c6c363fd Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-03-13 14:53:07 +06:30
San Wai Lwin
9228168ebc route changes 2018-03-13 14:51:07 +06:30
Aung Myo
a95fc4d07a update payment controller if member 2018-03-13 14:43:58 +06:30
Aung Myo
9f0bef732e update change version v3 for api paymal 2018-03-13 14:23:23 +06:30
phyusin
92401ab4f9 merge with old_town_aston req 2018-03-12 12:10:52 +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
9c89bce25d change take away customer for quick service 2018-03-09 14:05:18 +06:30
phyusin
21d39349d3 check shift update data 2018-03-09 11:54:35 +06:30
phyusin
7dd0f71894 check and fixed SQA feedback 2018-03-09 09:49:19 +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
aedd79376f receipt no and print pdf 2018-03-07 15:36:05 +06:30
San Wai Lwin
6cc2ba5110 To add only Other Payment Name beside SX Resturant 2018-03-06 18:24:19 +06:30
phyusin
bd06e80b37 remove conflict data 2018-03-05 16:24:45 +06:30
Aung Myo
01d217fd0f update conflix split pull 2018-02-28 17:04:35 +06:30
San Wai Lwin
07c3bcd7a7 Change Dashboard, Account in login, Shop name, Reference no for other charges 2018-02-28 15:31:55 +06:30
Aung Myo
1d70a9f178 update fixed issues for quickservice from sqa 2018-02-28 14:20:22 +06:30
Aung Myo
0acd533bfe update add oredr 2018-02-28 10:14:18 +06:30
phyusin
adefd8c034 remove conflict data 2018-02-27 14:35:21 +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
4696f65725 Merge branch 'r-1802001-01-c1' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-26 18:47:17 +06:30
phyusin
a44c6c097c conflict remove 2018-02-26 18:47:03 +06:30
San Wai Lwin
72b5701ec9 To add the condition for CloseCashierCustmisePdf 2018-02-26 18:29:58 +06:30
phyusin
760c204044 Merge branch 'r-1802001-01-c1' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-26 17:52:25 +06:30
San Wai Lwin
7d8442fd09 To add the condition for CloseCashierCustmisePdf 2018-02-26 17:49:19 +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
e43aaa915b customize close cashier 2018-02-26 11:36:13 +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
8b064a4428 change assigned item id to order item id 2018-02-26 10:01:35 +06:30
phyusin
d287ab267d Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-26 09:21:46 +06:30
phyusin
7043eccb73 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-26 09:21:08 +06:30
Aung Myo
f4f5915532 update waiter view add order 2018-02-26 09:19:14 +06:30