Commit Graph

924 Commits

Author SHA1 Message Date
Yan
f57dd8ba38 license updating 2017-12-08 14:58:35 +06:30
Yan
1ff1ddeacd Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 14:27:28 +06:30
Yan
5310e3e534 license updating 2017-12-08 14:27:10 +06:30
phyusin
d7fa976298 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-08 14:26:34 +06:30
phyusin
41971dae81 change report filter for shift and checkin api 2017-12-08 14:26:13 +06:30
Aung Myo
e8626e78f5 update paymal response record and show double payment 2017-12-08 13:59:05 +06:30
Yan
ffb829fbc3 license updating 2017-12-08 12:06:21 +06:30
Yan
308e007372 license updating 2017-12-08 11:51:38 +06:30
Yan
45fa3f81fc Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 10:41:57 +06:30
phyusin
2faf5ba386 change checkout fun: in UI 2017-12-08 10:40:57 +06:30
Yan
8eb65f6f81 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 10:17:19 +06:30
phyusin
46bbd90df5 add fun: for checkin and checkout 2017-12-08 10:14:28 +06:30
Aung Myo
8a98af32eb update rails logger for paymal response 2017-12-08 10:13:08 +06:30
Yan
daf3554826 table status color 2017-12-07 17:04:55 +06:30
Yan
94c2086152 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-07 16:50:51 +06:30
phyusin
ac54a1032b check booking checkout_at 2017-12-07 16:49:43 +06:30
Yan
31a5678122 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-07 16:38:17 +06:30
Yan
b38b53026f un-comment bookink.checkout_by in sale 2017-12-07 16:37:59 +06:30
phyusin
51ecc653f1 add current login name in checkin process 2017-12-07 16:26:11 +06:30
phyusin
ed75030f57 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-07 15:29:34 +06:30
phyusin
e5e904e989 change orange color func: 2017-12-07 15:29:05 +06:30
Yan
cb0559a1ab rounding adj fix 2017-12-07 15:06:38 +06:30
phyusin
25473f33bf change alert for checkin process 2017-12-07 14:25:39 +06:30
Yan
e4b4a3d986 rounding adj in credit and other 2017-12-07 12:19:07 +06:30
Yan
69b786a91d shift update 2017-12-07 12:07:06 +06:30
Yan
93a735c55e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-05 18:19:57 +06:30
Aung Myo
f4a7e1baa0 update sale item reoprt for item dis and foc 2017-12-05 18:19:18 +06:30
Yan
2cd86890fa checkin get method update 2017-12-05 18:10:01 +06:30
Aung Myo
97bb6ae211 update sale item xls 2017-12-05 16:28:21 +06:30
Yan
82657cdb8f Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-04 14:55:06 +06:30
Yan
9d27418e25 add menu item taxable 2017-12-04 14:54:47 +06:30
Aung Myo
79d7adf170 update sale item qty count update 2017-12-04 14:45:35 +06:30
Aung Myo
7ef75a285a update instanc code unique receipt bill and sale item 2017-12-04 12:18:20 +06:30
Yan
070ab18832 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-01 18:54:32 +06:30
Yan
6493a648f9 oqs fix 2017-12-01 18:54:14 +06:30
Aung Myo
e30d468880 update sale payment report 2017-12-01 17:51:30 +06:30
Yan
43fd5f6cb2 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-01 17:39:22 +06:30
Yan
6e8cc5afb2 Merge branch 'license' 2017-12-01 17:38:19 +06:30
phyusin
6f8f6940e4 remove edit controller for oqs print 2017-12-01 17:37:41 +06:30
Yan
4548813bfd license verify 2017-12-01 17:35:56 +06:30
phyusin
6bbac9d14c check OQS edit process 2017-12-01 16:23:50 +06:30
Yan
4b7cced87c license acti 2017-12-01 15:19:24 +06:30
phyusin
24284b4361 total account discount for close shift sale 2017-12-01 15:15:58 +06:30
Yan
7db4ace7b6 license 2017-12-01 14:15:06 +06:30
Yan
6fc3cdae06 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-01 14:07:38 +06:30
Aung Myo
a687e77efa update ability and report xls 2017-12-01 13:54:58 +06:30
Aung Myo
3133248df0 update daily sale view 2017-12-01 12:07:03 +06:30
phyusin
a52a671e12 remove foc for other payment and show foc payment in shift sale report 2017-12-01 12:03:39 +06:30
Aung Myo
dbd3e3e69b update sale item with other charges 2017-12-01 11:47:17 +06:30
Aung Myo
3846b319af update conflix after pull 2017-12-01 09:23:07 +06:30