Commit Graph

3250 Commits

Author SHA1 Message Date
Julian
8b2f36fbc5 Docker Setup 2018-04-11 11:24:34 +06:30
phyusin
27e70f1a86 modify api and change rounding adj 2018-04-11 10:28:33 +06:30
phyusin
590ee16aa4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-11 09:34:23 +06:30
phyusin
5b0e1ce040 add qr codeဓ 2018-04-11 09:34:08 +06:30
Yan
70cd6576b1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-10 18:10:53 +06:30
Yan
0ff340cac2 shop upate for 20 files 2018-04-10 18:10:40 +06:30
Aung Myo
7a9fe91fa3 open liscen for master 2018-04-10 17:42:07 +06:30
Aung Myo
8e243564ac Merge branch 'doemal_ordering' 2018-04-10 17:30:54 +06:30
Aung Myo
a886cb63ba Merge branch 'adminbsb_material_ui' 2018-04-10 17:29:48 +06:30
Aung Myo
0e5269c66f update request bill msg box error 2018-04-10 17:29:02 +06:30
Yan
4c047550ce Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-10 16:22:00 +06:30
Yan
e8c0899a9d menu import export update 2018-04-10 16:21:43 +06:30
phyusin
c7e5ae8ab0 order reservation api 2018-04-10 15:21:49 +06:30
Aung Myo
77adad2417 update order_reservaiotn ui fishe 2018-04-10 15:19:46 +06:30
Aung Myo
0e39e4577f update request bill check from quick service 2018-04-10 10:51:33 +06:30
Aung Myo
4810628930 udate ui 2018-04-10 09:56:31 +06:30
phyusin
57be26be77 check customer 2018-04-09 16:59:59 +06:30
phyusin
4b19afd948 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-09 16:23:27 +06:30
phyusin
4bc56a31b8 check time 2018-04-09 16:23:16 +06:30
Aung Myo
6f6e6f0405 update order 2018-04-09 16:03:34 +06:30
Yan
9b054d5d79 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-09 15:51:44 +06:30
Yan
c2ea0e2515 remove validate brand name and check jade mobile 2018-04-09 15:51:23 +06:30
Aung Myo
b9d0881913 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-04-09 15:34:20 +06:30
phyusin
b5016edb0d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-09 13:56:11 +06:30
phyusin
f6ba7403c5 add customer api for order reservation 2018-04-09 13:55:54 +06:30
Aung Myo
308ecf9491 update ordersummarysetPdf and slim for print setting to printer_setting 2018-04-09 13:49:42 +06:30
Aung Myo
18292d2cc1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-09 13:20:47 +06:30
Aung Myo
46a20dc006 update order & reservation 2018-04-09 13:19:47 +06:30
Aung Myo
66df760323 update order & reservation 2018-04-09 11:51:39 +06:30
phyusin
85b0378b6b change redeem payment process for dinga 2018-04-09 11:33:36 +06:30
Aung Myo
83aeb2eb90 update api authenticate 2018-04-09 10:53:16 +06:30
phyusin
b194cd6a28 remove waste and spoil in origami 2018-04-09 10:32:34 +06:30
phyusin
0b07c7109c change default value in print settings 2018-04-09 10:22:44 +06:30
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
Aung Myo
dd3544bdff fixed conflix readme 2018-04-09 09:40:58 +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