Commit Graph

3080 Commits

Author SHA1 Message Date
phyusin
6bb833aff3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-23 19:41:38 +06:30
phyusin
f9aa3310fa check ability in booking 2018-03-23 19:37:32 +06:30
phyusin
e0fe0ee8ab dashboard update 2018-03-23 18:06:53 +06:30
Jueli Moon Aung
2412fe8462 .database.yml.swp deleted online with Bitbucket 2018-03-23 07:40:30 +00:00
Jueli Moon Aung
5d3723e48c license.rb edited online with Bitbucket 2018-03-23 07:40:13 +00:00
Jueli Moon Aung
65d33a9ba7 secrets.yml edited online with Bitbucket 2018-03-23 07:39:39 +00:00
Jueli Moon Aung
fe8a923c22 secrets.yml edited online with Bitbucket 2018-03-23 07:39:10 +00:00
Jueli Moon Aung
15d8588e63 sidekiq.yml edited online with Bitbucket 2018-03-23 07:38:39 +00:00
Aung Myo
bfe4271d65 Merge branch 'adminbsb_material_ui' 2018-03-23 13:55:57 +06:30
Aung Myo
dfb998f9e7 update paymemt multiple ui 2018-03-23 13:55:07 +06:30
phyusin
3e8c3f8225 check tax profile and member poup 2018-03-23 13:54:19 +06:30
Aung Myo
3066a0ca1a update payment select 2018-03-23 10:08:33 +06:30
phyusin
7350a24a5d check split bill for item 2018-03-22 15:30:37 +06:30
phyusin
246f9afff5 sqa req: 2018-03-22 15:13:41 +06:30
Aung Myo
75a3576a77 update check user 2018-03-22 12:42:17 +06:30
phyusin
ebadfff25b add tax in charges 2018-03-22 11:09:12 +06:30
Aung Myo
b8a71079f4 update room show for jade print 2018-03-22 10:24:58 +06:30
Aung Myo
fbbe2c0ab9 update order controlelr 2018-03-22 09:45:30 +06:30
Aung Myo
77face5d3a Merge branch 'adminbsb_material_ui' 2018-03-21 18:07:02 +06:30
Aung Myo
25c3a489a6 update first bill for jade print 2018-03-21 18:06:12 +06:30
phyusin
7063d937e3 latest Aston req from OPT team 2018-03-21 17:45:55 +06:30
Aung Myo
0390d15e0a Merge branch 'adminbsb_material_ui' 2018-03-21 17:09:06 +06:30
Aung Myo
28a2ae3852 update remove animated class for ui addorder 2018-03-21 17:04:49 +06:30
Aung Myo
80853fb666 update jade print in pay,void and foc 2018-03-21 15:37:45 +06:30
phyusin
16d60add22 add FOC,VOID remark in Transaction/Sale and new Transaction/Survey 2018-03-21 15:07:57 +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
9c8cf6d748 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-21 11:53:38 +06:30
phyusin
0977363518 check tax profile process 2018-03-21 11:53:27 +06:30
Aung Myo
a0d27bd1d1 update route for print setting and addorder 2018-03-21 11:18:49 +06:30
Aung Myo
f23838325c Merge branch 'adminbsb_material_ui' 2018-03-21 10:35:15 +06:30
Aung Myo
9db3ec07cc update menu import/export ui 2018-03-21 10:30:28 +06:30
phyusin
b77435be48 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-20 18:08:38 +06:30
phyusin
d2da43de75 check print error in payment 2018-03-20 18:08:27 +06:30
Aung Myo
f51d193d47 Merge branch 'adminbsb_material_ui' 2018-03-20 17:55:15 +06:30
Aung Myo
c43cacc85b update second display for option 2018-03-20 17:52:45 +06:30
Aung Myo
eab5dff7d2 Merge branch 'adminbsb_material_ui' 2018-03-20 17:43:27 +06:30
Aung Myo
fd12af244d update menu import and export 2018-03-20 17:42:19 +06:30
phyusin
42ec8fec5e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-20 17:16:41 +06:30
Yan
0a9b3b5407 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-03-20 17:11:34 +06:30
phyusin
26765111fa add edit order item api and second display route 2018-03-20 17:04:52 +06:30
phyusin
f354e32e31 SQA feedback 2018-03-20 15:55:00 +06:30
Yan
510e3aabec check current user session 2018-03-20 14:32:08 +06:30
Yan
e3f9ecbc87 add jade print 2018-03-20 11:38:51 +06:30
phyusin
829c09040d delete receipts 2018-03-20 09:54:15 +06:30
phyusin
27a3026c2a oqs edit 2018-03-19 19:41:32 +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
Aung Myo
8f2aa994b5 update addorder sytle 2018-03-19 18:22:15 +06:30
Aung Myo
9836e3690e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-03-19 18:14:04 +06:30