Commit Graph

1235 Commits

Author SHA1 Message Date
phyusin
c5c6fdd6ac Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-09 10:12:33 +06:30
phyusin
a258a77c46 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-04-09 10:09:52 +06:30
phyusin
ee65189b05 change sale.rb file 2018-04-09 10:09:35 +06:30
phyusin
0901add832 change time format in query 2018-04-09 10:07:03 +06:30
phyusin
b3e17f6936 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-09 09:48:35 +06:30
phyusin
2e19d34ced add dinga payment and new payment type in report 2018-04-09 09:40:08 +06:30
Aung Myo
a9b9342f42 Merge branch 'adminbsb_material_ui' 2018-04-07 16:45:45 +06:30
Aung Myo
14b33a6f8d add kitchen role for oqs 2018-04-07 15:53:24 +06:30
phyusin
edaef54b0e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-04-06 17:54:03 +06:30
Aung Myo
2c7ef1e73b Merge branch 'adminbsb_material_ui' 2018-04-06 16:56:08 +06:30
San Wai Lwin
3c1be9a185 Edit From_time & To_time filter in dashboard 2018-04-06 15:19:08 +06:30
Aung Myo
38a5ec2bd4 update self.print for cloud 2018-04-06 14:07:43 +06:30
San Wai Lwin
ee3121b7c2 Pull From Master 2018-04-06 13:42:11 +06:30
San Wai Lwin
769698e09e Add MoveTablePdf and FOC update error 2018-04-05 18:23:29 +06:30
phyusin
fe01948dd3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-06 15:36:21 +06:30
phyusin
dac1a58b64 print settings 2018-04-06 10:45:14 +06:30
San Wai Lwin
39e887c7a5 Pull from master 2018-04-05 14:30:43 +06:30
Jueli Moon Aung
866746db70 license.rb edited by Julian (Enabled Rest API for SymmetricDS) 2018-04-05 07:01:40 +00:00
San Wai Lwin
fc8b2d3b73 Pull from master 2018-04-05 11:49:42 +06:30
Aung Myo
00c23b38df update merge with admibbsb-materi for multiple set item and report 2018-04-04 17:55:27 +06:30
phyusin
2e81de1ea7 bill channel for request bill and creditnote payment duoble amt 2018-04-04 16:37:10 +06:30
Aung Myo
8c9b0f756d update sale item report 2018-04-04 14:09:35 +06:30
Aung Myo
17562f6fcf update license and login dashboard 2018-04-04 09:43:02 +06:30
phyusin
5c21d914ae Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-03 18:06:30 +06:30
phyusin
8e07cd5f4e check FOC payment issue 2018-04-03 18:06:18 +06:30
Aung Myo
2cb6427aa1 update license check 2018-04-03 10:54:06 +06:30
Yan
c1aa8467d6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-02 16:13:46 +06:30
Yan
c176b41e79 menu import and exp update 2018-04-02 15:59:36 +06:30
phyusin
fc8d8eea4a add paymal payment 2018-03-30 16:53:38 +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
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
phyusin
4c9f451e73 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-29 19:38:56 +06:30
San Wai Lwin
3ced0f2590 Pull from master 2018-03-29 18:17:10 +06:30
Aung Myo
d279c548a1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-03-29 16:16:33 +06:30
Aung Myo
386c5291a1 update waste and spoile 2018-03-29 16:16:19 +06:30
phyusin
850c134ed2 check product sale 2018-03-29 11:17:35 +06:30
phyusin
1c13b04697 product sale checked 2018-03-29 10:47:29 +06:30
San Wai Lwin
2bf08827e7 Second Display Image finished 2018-03-29 10:03:21 +06:30
San Wai Lwin
bc922a68c8 Add Moved By in MoveTablePdf 2018-03-28 16:17:41 +06:30
phyusin
1873633ab2 check inventory 2018-03-28 11:07:48 +06:30
San Wai Lwin
c602988f42 Add Room and Table Moving 2018-03-26 18:05:09 +06:30
phyusin
f21a75e73e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-26 16:42:32 +06:30
phyusin
4b78de3f9a add filter in dashboard and Transaction/Sale 2018-03-26 16:42:17 +06:30
Aung Myo
d064b7a552 Merge branch 'adminbsb_material_ui' 2018-03-26 15:55:13 +06:30
Aung Myo
ac0ee37136 add foc , void and discount item in sale item report 2018-03-26 15:54:24 +06:30
San Wai Lwin
186353acb0 Multiple image upload finished 2018-03-26 11:40:04 +06:30