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 |
|
phyusin
|
3ae604b4ce
|
check user role
|
2018-02-23 10:57:50 +06:30 |
|
phyusin
|
ffbfd71330
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-22 18:52:55 +06:30 |
|
phyusin
|
7cbb67fd30
|
add link for oqs in origami
|
2018-02-22 18:51:57 +06:30 |
|
Aung Myo
|
c7b77aebfa
|
update taday list and addorder
|
2018-02-22 18:48:59 +06:30 |
|
San Wai Lwin
|
fb35d83bbe
|
change text 'Total Sale => Sale Revenue', 'Grand Total => Total Sale', 'Total Card => Other Payment' for dashboard 'Sale' box
|
2018-02-22 17:21:07 +06:30 |
|
San Wai Lwin
|
ce644e304c
|
Validate required for reference no: in other payment amount
|
2018-02-22 16:43:53 +06:30 |
|
phyusin
|
eafbb80f51
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-02-22 09:44:14 +06:30 |
|
phyusin
|
8d03fab703
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-22 09:43:13 +06:30 |
|
phyusin
|
38bedf6129
|
change split bill btn
|
2018-02-22 09:42:55 +06:30 |
|
Aung Myo
|
0e70f3b763
|
Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-22 09:39:54 +06:30 |
|
Aung Myo
|
7d144b0307
|
update edit sale for qs
|
2018-02-22 09:37:14 +06:30 |
|
phyusin
|
950f479da6
|
check qty update in edit
|
2018-02-21 18:42:00 +06:30 |
|
phyusin
|
e2903075b2
|
change split bill equal person flow
|
2018-02-21 18:24:04 +06:30 |
|
phyusin
|
d991a9f0ee
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-21 17:23:29 +06:30 |
|
phyusin
|
ac2b1d76c7
|
change split bill btn
|
2018-02-21 17:23:15 +06:30 |
|
Aung Myo
|
e3c54f6841
|
Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-21 17:16:14 +06:30 |
|