Commit Graph

157 Commits

Author SHA1 Message Date
phyusin
8e14d93c4c merge with master 2018-03-30 15:36:41 +06:30
phyusin
996392a041 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-30 15:25:15 +06:30
phyusin
6a9fd67bff check payment method 2018-03-30 15:24:51 +06:30
Aung Myo
5588f40753 update waste and spoilage 2018-03-30 14:20:47 +06:30
phyusin
1873633ab2 check inventory 2018-03-28 11:07:48 +06:30
phyusin
3e8c3f8225 check tax profile and member poup 2018-03-23 13:54:19 +06:30
phyusin
246f9afff5 sqa req: 2018-03-22 15:13:41 +06:30
Aung Myo
80853fb666 update jade print in pay,void and foc 2018-03-21 15:37:45 +06:30
phyusin
0977363518 check tax profile process 2018-03-21 11:53:27 +06:30
phyusin
bf84392ef8 SQA feedback 2018-03-19 19:34:34 +06:30
phyusin
25b6458450 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-19 18:41:50 +06:30
Yan
0c61a98150 merge with master 2018-03-19 14:41:40 +06:30
Yan
259778a891 add junctionpay(vaap) 2018-03-19 14:38:55 +06:30
phyusin
a9c8eb4e93 check tax profile 2018-03-19 11:35:43 +06:30
Yan
fa125df355 add junction pay 2018-03-16 18:37:54 +06:30
Moe Su
aa8e795d45 Topup payment 2018-03-16 17:50:45 +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
0edc92d066 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-03-14 09:16:14 +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
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
phyusin
bd06e80b37 remove conflict data 2018-03-05 16:24:45 +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
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
Aung Myo
f4f5915532 update waiter view add order 2018-02-26 09:19:14 +06:30
Aung Myo
ac47501e01 update conflic for pull master 2018-02-23 14:58:35 +06:30
Aung Myo
77a66d726b update foc and void overall add remark 2018-02-23 14:53:08 +06:30
phyusin
e2903075b2 change split bill equal person flow 2018-02-21 18:24:04 +06:30
Aung Myo
5e6b096111 Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-21 16:12:46 +06:30
Aung Myo
0302bb408b update no table oqs print 2018-02-21 16:11:05 +06:30
phyusin
75a774b6fa Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-21 13:41:50 +06:30
Aung Myo
4455b03e8a update print pay in qs 2018-02-21 12:34:03 +06:30
phyusin
317a79446f add precision in payment page 2018-02-21 11:17:25 +06:30
phyusin
4bfb5842bf split bill process 2018-02-20 13:33:59 +06:30
Aung Myo
c064f9d6f5 fixed conflix after pull split bill 2018-02-19 14:21:26 +06:30
phyusin
0ddaee7444 equal split and order split in order tab' 2018-02-16 12:13:35 +06:30
Aung Myo
47ffc5fa51 update no table quick srevice 2018-02-14 18:21:10 +06:30
Aung Myo
80ab7e7c12 test no table 2018-02-14 14:33:30 +06:30
Aung Myo
b2cec95064 test no table 2018-02-14 14:26:36 +06:30
Aung Myo
aeafbb4fae update pull split bill 2018-02-09 14:31:34 +06:30
Aung Myo
edade3662b update quickservice 2018-02-09 11:32:29 +06:30
San Wai Lwin
860e8db202 conflic data 2018-02-09 10:17:56 +06:30