Aung Myo
|
40d55ae546
|
Merge branch 'adminbsb_material_ui'
|
2018-03-13 10:31:03 +06:30 |
|
Aung Myo
|
5b99a8cf65
|
update reload second display
|
2018-03-13 10:26:18 +06:30 |
|
phyusin
|
f051022ab4
|
check reload issue
|
2018-03-12 17:50:51 +06:30 |
|
phyusin
|
92401ab4f9
|
merge with old_town_aston req
|
2018-03-12 12:10:52 +06:30 |
|
Aung Myo
|
6e9ecd342b
|
update second display
|
2018-03-12 10:42:29 +06:30 |
|
Aung Myo
|
04b053d2b7
|
fixed conflix payment page
|
2018-03-11 16:37:33 +06:30 |
|
Aung Myo
|
4ea2337fae
|
update second display
|
2018-03-11 16:14:44 +06:30 |
|
phyusin
|
9a96f066e9
|
change print popup function
|
2018-03-09 14:17:40 +06:30 |
|
phyusin
|
9c89bce25d
|
change take away customer for quick service
|
2018-03-09 14:05:18 +06:30 |
|
phyusin
|
21d39349d3
|
check shift update data
|
2018-03-09 11:54:35 +06:30 |
|
phyusin
|
7dd0f71894
|
check and fixed SQA feedback
|
2018-03-09 09:49:19 +06:30 |
|
phyusin
|
fcc076a19e
|
change route in other payment
|
2018-03-08 15:16:39 +06:30 |
|
phyusin
|
23be4771fd
|
add function for member card and qr code in payment
|
2018-03-08 14:57:45 +06:30 |
|
phyusin
|
d9a7e341fa
|
cadd print pdf in payment page
|
2018-03-08 10:01:54 +06:30 |
|
phyusin
|
5d8ba3c416
|
remove comment in action controller
|
2018-03-07 15:55:55 +06:30 |
|
phyusin
|
aedd79376f
|
receipt no and print pdf
|
2018-03-07 15:36:05 +06:30 |
|
San Wai Lwin
|
6cc2ba5110
|
To add only Other Payment Name beside SX Resturant
|
2018-03-06 18:24:19 +06:30 |
|
phyusin
|
bd06e80b37
|
remove conflict data
|
2018-03-05 16:24:45 +06:30 |
|
Aung Myo
|
87b51dbf82
|
Merge branch 'quick_service'
|
2018-03-05 13:56:23 +06:30 |
|
Aung Myo
|
01d217fd0f
|
update conflix split pull
|
2018-02-28 17:04:35 +06:30 |
|
San Wai Lwin
|
07c3bcd7a7
|
Change Dashboard, Account in login, Shop name, Reference no for other charges
|
2018-02-28 15:31:55 +06:30 |
|
Aung Myo
|
1d70a9f178
|
update fixed issues for quickservice from sqa
|
2018-02-28 14:20:22 +06:30 |
|
phyusin
|
32340c52e6
|
check discount calculation
|
2018-02-28 13:55:24 +06:30 |
|
Aung Myo
|
0acd533bfe
|
update add oredr
|
2018-02-28 10:14:18 +06:30 |
|
phyusin
|
5886389827
|
check discount
|
2018-02-28 10:01:42 +06:30 |
|
phyusin
|
adefd8c034
|
remove conflict data
|
2018-02-27 14:35:21 +06:30 |
|
phyusin
|
3e0943275f
|
check bacck btn
|
2018-02-27 11:35:26 +06:30 |
|
phyusin
|
fc3cd1e72d
|
check order item
|
2018-02-27 11:33:51 +06:30 |
|
phyusin
|
28a8b863aa
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-27 11:09:40 +06:30 |
|
phyusin
|
d8243afaab
|
check = split btn
|
2018-02-27 11:09:28 +06:30 |
|
phyusin
|
a44c6c097c
|
conflict remove
|
2018-02-26 18:47:03 +06:30 |
|
Aung Myo
|
ce8581f892
|
fixed conflic when pull master item remark
|
2018-02-26 17:02:46 +06:30 |
|
Aung Myo
|
b38e98a22a
|
update edit with remark
|
2018-02-26 16:56:57 +06:30 |
|
phyusin
|
5523ff6fc1
|
check product sale report
|
2018-02-26 11:24:47 +06:30 |
|
phyusin
|
a76d0ddbcd
|
change assigned order item id to order item id in Origami/Room
|
2018-02-26 10:09:33 +06:30 |
|
phyusin
|
da7dad05e4
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-26 10:01:49 +06:30 |
|
phyusin
|
8b064a4428
|
change assigned item id to order item id
|
2018-02-26 10:01:35 +06:30 |
|
Aung Myo
|
a0b34e8084
|
update scroll for order
|
2018-02-26 09:33:38 +06:30 |
|
phyusin
|
d287ab267d
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-26 09:21:46 +06:30 |
|
phyusin
|
7043eccb73
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-02-26 09:21:08 +06:30 |
|
Aung Myo
|
f4f5915532
|
update waiter view add order
|
2018-02-26 09:19:14 +06:30 |
|
San Wai Lwin
|
36511c258f
|
Add Key Pad in login_dashboard.html.erb
|
2018-02-23 17:07:25 +06:30 |
|
phyusin
|
3bb6649d39
|
add edit for rooms and check inventory link
|
2018-02-23 15:45:59 +06:30 |
|
phyusin
|
f73f7cd965
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-23 15:29:36 +06:30 |
|
Aung Myo
|
ac47501e01
|
update conflic for pull master
|
2018-02-23 14:58:35 +06:30 |
|
Aung Myo
|
77a66d726b
|
update foc and void overall add remark
|
2018-02-23 14:53:08 +06:30 |
|
phyusin
|
970814be94
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-23 14:06:47 +06:30 |
|
phyusin
|
3f9d491cc4
|
check role for = split
|
2018-02-23 14:06:35 +06:30 |
|
Aung Myo
|
8069ac15ca
|
Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-23 11:13:30 +06:30 |
|
Aung Myo
|
31c7048075
|
update oqs js
|
2018-02-23 11:12:58 +06:30 |
|