Commit Graph

603 Commits

Author SHA1 Message Date
San Wai Lwin
fc8b2d3b73 Pull from master 2018-04-05 11:49:42 +06:30
San Wai Lwin
650eb53f51 Pull from master 2018-04-02 18:10:47 +06:30
San Wai Lwin
c53276f21c Add survey's fieldset 2018-04-02 18:09:36 +06:30
phyusin
ac5987fbb5 Merge branch 'topup_payment' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-30 16:38:00 +06:30
phyusin
c2063b06a0 add route for display image 2018-03-30 16:37:48 +06:30
phyusin
298fc9a3f0 merge with second display 2018-03-30 15:48:55 +06:30
phyusin
40175d64cd remove puma backup 2018-03-30 15:38:48 +06:30
phyusin
8e14d93c4c merge with master 2018-03-30 15:36:41 +06:30
phyusin
df93563e6f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-03-30 15:29:26 +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
San Wai Lwin
3ced0f2590 Pull from master 2018-03-29 18:17:10 +06:30
Aung Myo
386c5291a1 update waste and spoile 2018-03-29 16:16:19 +06:30
phyusin
6bb833aff3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-23 19:41:38 +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
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
phyusin
7063d937e3 latest Aston req from OPT team 2018-03-21 17:45:55 +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
9db3ec07cc update menu import/export ui 2018-03-21 10:30:28 +06:30
phyusin
26765111fa add edit order item api and second display route 2018-03-20 17:04:52 +06:30
phyusin
25b6458450 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-19 18:41:50 +06:30
San Wai Lwin
110dc80f0c Add multiple photo upload 2018-03-19 18:35:59 +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
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