Yan
|
dd5936b991
|
license cloud finished
|
2017-12-08 16:26:41 +06:30 |
|
Yan
|
33326931e2
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-08 14:59:49 +06:30 |
|
Yan
|
c8767dae99
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-08 14:59:01 +06:30 |
|
Yan
|
f57dd8ba38
|
license updating
|
2017-12-08 14:58:35 +06:30 |
|
phyusin
|
3dce4ccd10
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-12-08 14:39:31 +06:30 |
|
phyusin
|
5bfe9ef31e
|
change checkin api
|
2017-12-08 14:39:14 +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
|
681b5afebc
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-08 12:06:37 +06:30 |
|
Yan
|
ffb829fbc3
|
license updating
|
2017-12-08 12:06:21 +06:30 |
|
phyusin
|
4e5a99eee2
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-12-08 12:05:47 +06:30 |
|
phyusin
|
495dcf1dcf
|
change login user
|
2017-12-08 12:05:36 +06:30 |
|
Yan
|
0591e4449e
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-08 11:51:53 +06:30 |
|
Yan
|
308e007372
|
license updating
|
2017-12-08 11:51:38 +06:30 |
|
phyusin
|
ede4851257
|
change get_Cashier to current_login_emp in checkin api
|
2017-12-08 11:48:04 +06:30 |
|
phyusin
|
1e7cec4646
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-12-08 11:20:43 +06:30 |
|
phyusin
|
deda2dd0c7
|
add double click event for all payment
|
2017-12-08 11:20:30 +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 |
|
phyusin
|
485eef3782
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-12-08 09:52:33 +06:30 |
|
Yan
|
e4ceabf111
|
oqs edit txt rechange to updated
|
2017-12-07 19:19:24 +06:30 |
|
phyusin
|
5994263ff1
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-12-07 18:18:56 +06:30 |
|
phyusin
|
abecd08ba2
|
control double click event
|
2017-12-07 18:18:32 +06:30 |
|
Yan
|
8ff73b2b21
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-07 17:37:24 +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 |
|
Aung Myo
|
d9fd19265b
|
update from and to date index.html of all report
|
2017-12-07 15:51:40 +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 |
|
Yan
|
a7b2107624
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-07 14:27:33 +06:30 |
|
Yan
|
8da0c04577
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-07 14:27:15 +06:30 |
|
Yan
|
d35ee7ef31
|
add rounding adj in paypar payment
|
2017-12-07 14:27:02 +06:30 |
|
phyusin
|
25473f33bf
|
change alert for checkin process
|
2017-12-07 14:25:39 +06:30 |
|
Aung Myo
|
1645f75fa3
|
update report excel
|
2017-12-07 14:05:39 +06:30 |
|
Yan
|
49f57e0632
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-07 13:40:29 +06:30 |
|
Aung Myo
|
f80971506a
|
update report excel
|
2017-12-07 13:39:45 +06:30 |
|
Yan
|
970b6f857e
|
checkin get update
|
2017-12-07 13:38:41 +06:30 |
|
phyusin
|
1fc18628f9
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-12-07 13:24:20 +06:30 |
|
Aung Myo
|
813bcfc119
|
update sale item index
|
2017-12-07 12:41:10 +06:30 |
|