phyusin
|
5ddfad7ef8
|
conflict data remove
|
2018-05-14 15:46:34 +06:30 |
|
phyusin
|
39dce3424e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-14 15:42:35 +06:30 |
|
phyusin
|
1c8ea30efa
|
change popup ui
|
2018-05-14 15:42:11 +06:30 |
|
San Wai Lwin
|
8fda04372d
|
Add total waste and spoil in close cashier and Closing Balance မွာ Character ေတြ ရိုက္လို႕ရေန
|
2018-05-14 15:31:00 +06:30 |
|
Aung Myo
|
e264e7a32b
|
update addorder js and css
|
2018-05-14 15:23:15 +06:30 |
|
Aung Myo
|
57c9cd4d6f
|
updaate loading menu cache
|
2018-05-14 14:49:21 +06:30 |
|
Aung Myo
|
fdf4c6b95e
|
Merge branch 'adminbsb_material_ui'
|
2018-05-14 13:35:20 +06:30 |
|
Aung Myo
|
0b104b021b
|
update add ordr
|
2018-05-14 13:34:14 +06:30 |
|
Yan
|
568a94182a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-14 11:47:31 +06:30 |
|
Yan
|
3c1ed265f5
|
update menu import export
|
2018-05-14 11:47:06 +06:30 |
|
San Wai Lwin
|
49319d80cc
|
Pull from master
|
2018-05-14 11:38:39 +06:30 |
|
phyusin
|
aeba71b646
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-14 11:35:20 +06:30 |
|
phyusin
|
cc0178eb65
|
check code in mp3 file
|
2018-05-14 11:34:33 +06:30 |
|
Aung Myo
|
4baff5918c
|
update addorder sale item xls
|
2018-05-14 10:50:04 +06:30 |
|
Aung Myo
|
34141e1284
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-14 10:24:43 +06:30 |
|
Aung Myo
|
ea914ec860
|
update addorder menu
|
2018-05-14 10:24:30 +06:30 |
|
phyusin
|
9900ea385a
|
change token,action,secrets
|
2018-05-12 16:33:28 +06:30 |
|
phyusin
|
1909a73fe0
|
add docker data
|
2018-05-12 16:19:18 +06:30 |
|
phyusin
|
050d3379c0
|
check api issue
|
2018-05-12 15:20:57 +06:30 |
|
phyusin
|
8457ebc08e
|
add space
|
2018-05-12 13:34:02 +06:30 |
|
phyusin
|
577ceb73cd
|
check shop code
|
2018-05-12 12:28:59 +06:30 |
|
phyusin
|
d77d774a6f
|
check token
|
2018-05-12 12:25:11 +06:30 |
|
phyusin
|
e2a4d456f1
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-12 11:38:59 +06:30 |
|
phyusin
|
c7c32ffff4
|
change order reservation
|
2018-05-12 11:38:43 +06:30 |
|
Aung Myo
|
79625d7f91
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-11 18:25:23 +06:30 |
|
Aung Myo
|
8894bce132
|
update survey min 1
|
2018-05-11 18:25:07 +06:30 |
|
phyusin
|
34e2bdb0d1
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-11 17:53:15 +06:30 |
|
phyusin
|
7d45e6ca81
|
check token for cloud
|
2018-05-11 17:52:52 +06:30 |
|
Aung Myo
|
cb974ef558
|
Merge branch 'adminbsb_material_ui'
|
2018-05-11 17:32:44 +06:30 |
|
Aung Myo
|
6ee5e9f1af
|
update daily sale for totaltax
|
2018-05-11 17:31:57 +06:30 |
|
phyusin
|
c65bf1c163
|
check shop code in order reservation
|
2018-05-11 17:14:42 +06:30 |
|
phyusin
|
e618cd6e6d
|
Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-11 17:04:33 +06:30 |
|
phyusin
|
efbf1fe619
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-11 17:04:15 +06:30 |
|
phyusin
|
0a07b3479d
|
check shop code for new order
|
2018-05-11 17:03:53 +06:30 |
|
San Wai Lwin
|
bcf66d6c30
|
Edit with the photo without shop_code
|
2018-05-11 16:28:40 +06:30 |
|
Aung Myo
|
9c1f29aa19
|
Merge branch 'adminbsb_material_ui'
|
2018-05-11 16:07:16 +06:30 |
|
Aung Myo
|
8dc789e546
|
update void in room tab
|
2018-05-11 16:06:32 +06:30 |
|
phyusin
|
a896617a4d
|
Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-11 15:31:42 +06:30 |
|
San Wai Lwin
|
33e71f63a3
|
Edit Dining Queue in CRM
|
2018-05-11 15:29:06 +06:30 |
|
Aung Myo
|
329af02a0a
|
add cable .yml
|
2018-05-11 14:36:40 +06:30 |
|
Aung Myo
|
800fa41abb
|
Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes
|
2018-05-11 14:09:56 +06:30 |
|
Aung Myo
|
c970a6fb47
|
Merge branch 'adminbsb_material_ui'
|
2018-05-11 14:07:42 +06:30 |
|
Aung Myo
|
d141947eb0
|
update oqs and addorder qty 0
|
2018-05-11 14:06:23 +06:30 |
|
phyusin
|
baac2c33ea
|
move customer func: from doemal
|
2018-05-11 13:45:04 +06:30 |
|
phyusin
|
a76f9068da
|
check nil for cus info
|
2018-05-11 13:39:32 +06:30 |
|
phyusin
|
9daf8235a7
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes
|
2018-05-11 13:06:13 +06:30 |
|
phyusin
|
dcd654a885
|
Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes
|
2018-05-11 13:04:57 +06:30 |
|
phyusin
|
ae5ced251b
|
remove conflict
|
2018-05-11 12:01:27 +06:30 |
|
phyusin
|
760c7685df
|
fixed some issue
|
2018-05-11 11:59:30 +06:30 |
|
Aung Myo
|
87913956f1
|
fixed first bill with discount
|
2018-05-11 11:54:53 +06:30 |
|