Commit Graph

671 Commits

Author SHA1 Message Date
Aung Myo
9836e3690e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-03-19 18:14:04 +06:30
Aung Myo
ca817197d9 update menu import and export 2018-03-19 18:13:38 +06:30
Yan
0c61a98150 merge with master 2018-03-19 14:41:40 +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
phyusin
7524ab75ad Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-16 18:07:46 +06:30
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
acc5d737fa tax profiles 2018-03-16 10:57:32 +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
San Wai Lwin
808b123a91 Add Date in Cashier's Dashboard and remove no need breadcrumb 2018-03-15 15:27:11 +06:30
Aung Myo
f0e81caad0 update addorder option for set 2018-03-15 14:35:25 +06:30
San Wai Lwin
c62637af10 Remove / from _header 2018-03-15 14:08:30 +06:30
San Wai Lwin
1188f6e8e9 Pull from master 2018-03-15 13:48:52 +06:30
Aung Myo
cf5a85fa5c update migrate for sale audit remark 2018-03-14 13:51:31 +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
San Wai Lwin
694feb9c06 For pull 2018-03-13 14:46:07 +06:30
phyusin
a9afa4e317 action controller 2018-03-13 11:48:55 +06:30
Aung Myo
df781395c8 update oqs and read me 2018-03-13 11:40:05 +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
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
San Wai Lwin
5cc369114b Remove config 2018-03-06 18:31:09 +06:30
San Wai Lwin
6cc2ba5110 To add only Other Payment Name beside SX Resturant 2018-03-06 18:24:19 +06:30
San Wai Lwin
80a0cba537 For Pull from master 2018-03-06 11:19:19 +06:30
Aung Myo
981aef32ba update license check offline 2018-03-05 16:35:50 +06:30
Aung Myo
00271e9e21 update license 2018-03-05 14:35:04 +06:30
Aung Myo
2d62750caa update delete license 2018-03-05 14:04:38 +06:30
Aung Myo
c1b112636c update license 2018-03-05 13:54:52 +06:30
Aung Myo
2c1f599990 update license 2018-03-05 13:53:25 +06:30
phyusin
adefd8c034 remove conflict data 2018-02-27 14:35:21 +06:30
Yan
4d556cff43 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-02-27 11:44:11 +06:30
Yan
ac470c5747 license and local move to base action and update other base 2018-02-27 11:41:24 +06:30
phyusin
a44c6c097c conflict remove 2018-02-26 18:47:03 +06:30
Yan
13b7b1f800 add action base and update base ctrls 2018-02-26 17:42:54 +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
ac47501e01 update conflic for pull master 2018-02-23 14:58:35 +06:30
phyusin
7c171057d1 product sale 2018-02-23 14:03:25 +06:30
phyusin
7cbb67fd30 add link for oqs in origami 2018-02-22 18:51:57 +06:30
phyusin
eafbb80f51 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-22 09:44:14 +06:30
phyusin
e2903075b2 change split bill equal person flow 2018-02-21 18:24:04 +06:30