Commit Graph

3216 Commits

Author SHA1 Message Date
phyusin
7de85c4e0b check integer in all pdf 2018-04-09 10:20:22 +06:30
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
ed6f2b6385 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-09 10:10:45 +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
Yan
f933c9615a merged 2018-04-09 10:09:24 +06:30
phyusin
3b8e66de08 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-04-09 10:08:30 +06:30
phyusin
0901add832 change time format in query 2018-04-09 10:07:03 +06:30
Yan
cb3f9c4cd7 remove skip auth from api and check user modified 2018-04-09 09:58:22 +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
bd78144eb7 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2018-04-07 16:44:36 +06:30
Aung Myo
14b33a6f8d add kitchen role for oqs 2018-04-07 15:53:24 +06:30
Aung Myo
7b28d56738 update addorder js after git issuse fixed 2018-04-07 14:23:11 +06:30
Aung Myo
37694fd47d -ဓ

2018-04-07 12:43:29 +06:30
San Wai Lwin
74aa6caaab For pull 2018-04-06 18:19:47 +06:30
San Wai Lwin
460ed991af Edit Addorder.js and Shop name 2018-04-06 18:16:20 +06:30
phyusin
edaef54b0e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-04-06 17:54:03 +06:30
San Wai Lwin
30da4f37b3 Add Shop Name in Login Page 2018-04-06 17:51:00 +06:30
phyusin
785fbe20ed Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-06 17:03:50 +06:30
phyusin
eaf33fc7bf add amount in order reservation 2018-04-06 17:03:38 +06:30
Aung Myo
2c7ef1e73b Merge branch 'adminbsb_material_ui' 2018-04-06 16:56:08 +06:30
phyusin
5acc063f80 table for doemal 2018-04-06 16:44:13 +06:30
phyusin
4ddb83b035 add order and reservation table 2018-04-06 15:51:12 +06:30
San Wai Lwin
3c1be9a185 Edit From_time & To_time filter in dashboard 2018-04-06 15:19:08 +06:30
phyusin
973482bdab new tables 2018-04-06 15:14:29 +06:30
Yan
1811e53dd1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-06 14:19:36 +06:30
Aung Myo
38a5ec2bd4 update self.print for cloud 2018-04-06 14:07:43 +06:30
San Wai Lwin
57ff3e8a65 Edit Print_setting 2018-04-06 13:47:59 +06:30
San Wai Lwin
ee3121b7c2 Pull From Master 2018-04-06 13:42:11 +06:30
phyusin
818f441529 check mobile 2018-04-06 13:15:32 +06:30
phyusin
0b869ccb89 cehck mobile 2018-04-06 12:00:45 +06:30
phyusin
8217b7c2f2 check mobile user 2018-04-05 19:22:52 +06:30
phyusin
6c172eae8e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-05 19:00:30 +06:30
phyusin
a44e86ed21 check orgami js 2018-04-05 19:00:13 +06:30
San Wai Lwin
769698e09e Add MoveTablePdf and FOC update error 2018-04-05 18:23:29 +06:30
Aung Myo
3bbb55b919 Merge branch 'adminbsb_material_ui' 2018-04-05 17:53:22 +06:30
Aung Myo
85b92fd3a7 addorder js for product 2018-04-05 17:52:33 +06:30
phyusin
2acbade789 remove conflict in secret 2018-04-05 17:50:13 +06:30
Yan
4bea58805a merge edit for master 2018-04-05 17:18:02 +06:30
Yan
76da718a78 merge master 2018-04-05 16:10:59 +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
a2e4863c9d check user agent and token when webview is loaded 2018-04-06 15:36:08 +06:30
phyusin
dac1a58b64 print settings 2018-04-06 10:45:14 +06:30
phyusin
55e2a06422 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-06 09:40:49 +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
Yan
09594f83f2 print setting for jade print 2018-04-05 16:08:20 +06:30
phyusin
686a980a9e Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-05 15:24:17 +06:30