phyusin
|
faa8b82295
|
Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01
|
2018-05-02 13:49:17 +06:30 |
|
phyusin
|
bf0dc3fecf
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-02 13:48:32 +06:30 |
|
phyusin
|
0e87ba87f3
|
add sum item qty in receipt bill
|
2018-05-02 13:46:43 +06:30 |
|
phyusin
|
6d6b6c6791
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-02 11:59:58 +06:30 |
|
phyusin
|
7c6d842a31
|
change UI and add expected waiting time
|
2018-05-02 11:59:35 +06:30 |
|
Aung Myo
|
bf00eceba0
|
Merge branch 'adminbsb_material_ui'
|
2018-04-30 15:37:43 +06:30 |
|
Aung Myo
|
ff4cdfa158
|
update member discount and tax
|
2018-04-30 15:16:07 +06:30 |
|
phyusin
|
027550121e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-04-30 09:46:04 +06:30 |
|
phyusin
|
929919ba0f
|
change order reservation
|
2018-04-30 09:45:37 +06:30 |
|
Aung Myo
|
57607d0e8b
|
update addorder controller
|
2018-04-27 16:17:55 +06:30 |
|
Aung Myo
|
bae2f0ff17
|
update addorder js and checkout menu import and export
|
2018-04-27 14:11:05 +06:30 |
|
phyusin
|
11473c7fcd
|
change order reservation
|
2018-04-27 13:47:54 +06:30 |
|
Aung Myo
|
ec8645d0fc
|
update addorder js
|
2018-04-27 11:25:20 +06:30 |
|
Aung Myo
|
e216cf86c2
|
update addorder js
|
2018-04-27 10:59:53 +06:30 |
|
Aung Myo
|
36f097d4cf
|
Merge branch 'adminbsb_material_ui'
|
2018-04-27 10:40:17 +06:30 |
|
Aung Myo
|
eb61e94909
|
update addorder get menu and sub menu
|
2018-04-27 10:39:29 +06:30 |
|
Aung Myo
|
9aabed8ad5
|
update screte..yml
|
2018-04-26 17:36:59 +06:30 |
|
Aung Myo
|
390c9b2dca
|
Merge branch 'adminbsb_material_ui'
|
2018-04-26 13:35:41 +06:30 |
|
Aung Myo
|
3a85481dcd
|
update dinga and paymal
|
2018-04-26 13:07:31 +06:30 |
|
phyusin
|
52a6d13041
|
Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01
|
2018-04-25 15:43:01 +06:30 |
|
phyusin
|
0ab5a426f6
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-04-25 15:42:32 +06:30 |
|
phyusin
|
172c2136cc
|
add order reservation in clear data
|
2018-04-25 15:40:57 +06:30 |
|
phyusin
|
273401424c
|
Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01
|
2018-04-25 15:36:10 +06:30 |
|
phyusin
|
cab632283f
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-04-25 15:35:33 +06:30 |
|
phyusin
|
81407cf95e
|
change query for sale items
|
2018-04-25 15:33:54 +06:30 |
|
phyusin
|
314058282e
|
puma deleted by sqa-1804-001
|
2018-04-25 15:14:40 +06:30 |
|
phyusin
|
631c94a63a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-04-25 15:11:25 +06:30 |
|
phyusin
|
c14960fc96
|
remove conflict data
|
2018-04-25 15:10:10 +06:30 |
|
phyusin
|
b41c85132d
|
add order and reservation, quick service in lookups and add date and order by in order reservation
|
2018-04-25 15:07:43 +06:30 |
|
Yan
|
32fb28660e
|
add pool zine in adapter
|
2018-04-25 14:15:04 +06:30 |
|
Aung Myo
|
9b0a564b9a
|
update cable for cloud
|
2018-04-25 13:18:54 +06:30 |
|
phyusin
|
d0ad95c8d6
|
change name
|
2018-04-23 19:32:32 +06:30 |
|
phyusin
|
3f13bb6c74
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-04-23 19:21:20 +06:30 |
|
phyusin
|
e62ba4d6c2
|
change params
|
2018-04-23 19:20:03 +06:30 |
|
Nweni
|
285f5d4cd0
|
fixed conflict
|
2018-04-23 18:21:47 +06:30 |
|
Yan
|
86199ab4b4
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-04-23 16:23:35 +06:30 |
|
Yan
|
403f70480d
|
api cloud update
|
2018-04-23 16:23:00 +06:30 |
|
phyusin
|
3d39e398df
|
remove actioncable
|
2018-04-23 16:16:41 +06:30 |
|
Aung Myo
|
6e3a5300a6
|
close cable in cloud mode
|
2018-04-23 15:39:56 +06:30 |
|
phyusin
|
cd508b1f12
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-04-23 15:10:39 +06:30 |
|
phyusin
|
f503d69181
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-04-23 15:09:18 +06:30 |
|
phyusin
|
2255fcd2d4
|
add token in lookups
|
2018-04-23 15:09:04 +06:30 |
|
phyusin
|
76531535d0
|
remove comment for license
|
2018-04-23 14:45:31 +06:30 |
|
Aung Myo
|
31ee7f05fe
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-04-23 14:43:41 +06:30 |
|
Aung Myo
|
5ea950f5aa
|
update addore cable for second display closed
|
2018-04-23 14:43:27 +06:30 |
|
phyusin
|
bb206a700d
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-04-23 14:42:43 +06:30 |
|
phyusin
|
9b12ed0254
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-04-23 14:41:18 +06:30 |
|
phyusin
|
b92889fb23
|
change base url settings
|
2018-04-23 14:41:07 +06:30 |
|
Aung Myo
|
924f8b03cd
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-04-23 14:18:14 +06:30 |
|
Aung Myo
|
cbb7a14621
|
update action cable for cloud
|
2018-04-23 14:17:56 +06:30 |
|