Commit Graph

317 Commits

Author SHA1 Message Date
Nweni
285f5d4cd0 fixed conflict 2018-04-23 18:21:47 +06:30
Aung Myo
8720ffd195 update discuount view 2018-04-20 10:36:34 +06:30
phyusin
2ac629f6e0 conflict 2018-04-11 18:01:46 +06:30
San Wai Lwin
f159673c60 Remove Discount button in cashier of waiter role 2018-04-11 14:47:50 +06:30
Yan
9b054d5d79 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-09 15:51:44 +06:30
Yan
c2ea0e2515 remove validate brand name and check jade mobile 2018-04-09 15:51:23 +06:30
phyusin
b194cd6a28 remove waste and spoil in origami 2018-04-09 10:32:34 +06:30
phyusin
818f441529 check mobile 2018-04-06 13:15:32 +06:30
phyusin
a2e4863c9d check user agent and token when webview is loaded 2018-04-06 15:36:08 +06:30
phyusin
d1bd0764d8 check click event when add invoice 2018-04-05 17:44:07 +06:30
phyusin
7c15dac2aa webview 2018-04-05 17:30:44 +06:30
Aung Myo
f5be9661c4 Merge branch 'adminbsb_material_ui' 2018-04-02 14:36:14 +06:30
Aung Myo
d59ff8c6eb update show table for instance set 2018-04-02 12:50:02 +06:30
Aung Myo
d1a62948e9 Merge branch 'adminbsb_material_ui' 2018-03-30 17:47:46 +06:30
Aung Myo
2dec217bcc update waste and spoile 2018-03-30 17:23:59 +06:30
phyusin
8e14d93c4c merge with master 2018-03-30 15:36:41 +06:30
Aung Myo
5588f40753 update waste and spoilage 2018-03-30 14:20:47 +06:30
Aung Myo
386c5291a1 update waste and spoile 2018-03-29 16:16:19 +06:30
Aung Myo
f126d2faf6 update print file.substring for jade 2018-03-28 09:29:54 +06:30
Aung Myo
dfb998f9e7 update paymemt multiple ui 2018-03-23 13:55:07 +06:30
Aung Myo
3066a0ca1a update payment select 2018-03-23 10:08:33 +06:30
Aung Myo
25c3a489a6 update first bill for jade print 2018-03-21 18:06:12 +06:30
Aung Myo
80853fb666 update jade print in pay,void and foc 2018-03-21 15:37:45 +06:30
Aung Myo
a30abfb30c Merge branch 'adminbsb_material_ui' 2018-03-21 13:10:59 +06:30
Aung Myo
e6719462d1 update route 2018-03-21 13:10:12 +06:30
phyusin
0977363518 check tax profile process 2018-03-21 11:53:27 +06:30
Yan
0a9b3b5407 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-03-20 17:11:34 +06:30
Yan
e3f9ecbc87 add jade print 2018-03-20 11:38:51 +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
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
6ccf315242 remove JSON parse in set item options 2018-03-15 16:14:15 +06:30
phyusin
dcac662c8e change set menu item format in api and origami 2018-03-15 15:51:12 +06:30
Aung Myo
6ec03e3454 update today issue 2018-03-14 17:52:23 +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
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
aedd79376f receipt no and print pdf 2018-03-07 15:36:05 +06:30
phyusin
adefd8c034 remove conflict data 2018-02-27 14:35:21 +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
phyusin
3bb6649d39 add edit for rooms and check inventory link 2018-02-23 15:45:59 +06:30