Commit Graph

3888 Commits

Author SHA1 Message Date
phyusin
e2fdf994d7 check JunctionPay 2018-06-11 17:20:47 +06:30
phyusin
425e72afe7 add payment type in order reservation 2018-06-11 16:19:59 +06:30
phyusin
859794e291 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-11 14:42:37 +06:30
phyusin
fd125834ad Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-11 14:42:19 +06:30
phyusin
5d49d07cf5 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-11 14:39:29 +06:30
phyusin
1e76c434ef Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-11 14:37:42 +06:30
phyusin
5b8b471b30 change seed 2018-06-11 14:37:04 +06:30
phyusin
27655cfe31 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-11 13:50:10 +06:30
phyusin
df2c7d5cf3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-11 13:49:43 +06:30
phyusin
13c2c00263 add tax cal for Edit 2018-06-11 13:49:21 +06:30
San Wai Lwin
97f4a9df11 Pull from master 2018-06-11 13:18:18 +06:30
Aung Myo
83dd8dd803 Merge branch 'adminbsb_material_ui' 2018-06-11 12:02:57 +06:30
Aung Myo
8c5fce8516 update bill js 2018-06-11 12:02:06 +06:30
phyusin
fe4ac6a8f3 add set item price 2018-06-11 11:29:49 +06:30
San Wai Lwin
019db9f5d1 Edit Survey 2018-06-11 11:02:40 +06:30
phyusin
507865c14e Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-08 16:50:57 +06:30
phyusin
c8642548e5 check order reservation update and payment route fixed 2018-06-08 16:50:06 +06:30
San Wai Lwin
a04bb14477 Edit first bill button 2018-06-08 16:48:52 +06:30
phyusin
630e82a306 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-08 11:37:00 +06:30
San Wai Lwin
9bae3445d3 Edit reprint 2018-06-08 11:28:01 +06:30
San Wai Lwin
ce3ab0b0eb Pull from master 2018-06-08 10:31:02 +06:30
San Wai Lwin
b3e85ff25e Edit Reprint in QS and change void button color 2018-06-08 10:29:45 +06:30
phyusin
b053c2ae24 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-07 16:23:15 +06:30
phyusin
3252db7203 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-07 16:22:13 +06:30
Aung Myo
cec87e023b Merge branch 'adminbsb_material_ui' 2018-06-07 16:17:53 +06:30
Aung Myo
58cb957078 update promotion for nil item 2018-06-07 16:13:10 +06:30
San Wai Lwin
13e11bf777 Cloud mode in reprint 2018-06-07 16:11:34 +06:30
San Wai Lwin
af5b4cc9c8 Add action_controller 2018-06-07 15:35:14 +06:30
phyusin
bc7363aa29 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-07 15:21:06 +06:30
phyusin
af977f2134 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-07 15:18:45 +06:30
phyusin
0bbf664e6b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-07 15:18:19 +06:30
phyusin
126b371f8f add global override Chart YAxis 2018-06-07 15:17:58 +06:30
Aung Myo
e0dc47490d Merge branch 'adminbsb_material_ui' 2018-06-07 14:28:01 +06:30
Aung Myo
c3f7191f17 update move table only order 2018-06-07 14:27:11 +06:30
phyusin
61b187f01a action controller 2018-06-07 13:09:11 +06:30
phyusin
5b5facd2bf Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-07 13:08:43 +06:30
San Wai Lwin
3a6535bdf0 Add Local field validation 2018-06-07 12:00:41 +06:30
Aung Myo
256b76be63 Merge branch 'adminbsb_material_ui' 2018-06-07 11:31:53 +06:30
Aung Myo
cdc736778b added action cable in move table 2018-06-07 11:30:52 +06:30
phyusin
5bdf194aec Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-07 11:12:45 +06:30
phyusin
d9a3a8e59f check set menu item price 2018-06-07 11:12:01 +06:30
San Wai Lwin
a5c59640d6 Pull from master 2018-06-07 11:05:19 +06:30
San Wai Lwin
fb0e832ea6 Modified in Close Cashier,Other Charges and Survey minus sugn 2018-06-07 11:02:23 +06:30
Aung Myo
2445f43994 Merge branch 'adminbsb_material_ui' 2018-06-06 15:54:40 +06:30
Aung Myo
1014e2226c update valid time menu 2018-06-06 15:53:45 +06:30
phyusin
db26ec6d3f add void for quick service completed 2018-06-06 15:12:36 +06:30
phyusin
2cc52bd888 change saleitem query and js for order reservation 2018-06-06 11:47:21 +06:30
Aung Myo
73a7e95611 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2018-06-06 11:35:34 +06:30
phyusin
4b7881b14e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-06 09:31:24 +06:30
phyusin
77f251a181 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-05 17:06:34 +06:30