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 |
|
phyusin
|
f559aa0f14
|
product sale query
|
2018-02-26 09:20:57 +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 |
|
Yan
|
07e208a457
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-02-23 15:49:55 +06:30 |
|
Yan
|
a6abfb2f49
|
update token mismatch
|
2018-02-23 15:49:29 +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 |
|
phyusin
|
2dda29c5cc
|
add shop detail info in inventory
|
2018-02-23 15:29:22 +06:30 |
|
phyusin
|
970a9bb430
|
sale
|
2018-02-23 15:26:24 +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 |
|
Yan
|
25a212bb70
|
update base controllers
|
2018-02-23 14:45:53 +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 |
|
phyusin
|
7c171057d1
|
product sale
|
2018-02-23 14:03:25 +06:30 |
|
phyusin
|
23548dffa6
|
check report error precision
|
2018-02-23 11:34:53 +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
|
ce217e1e0b
|
check waiter role
|
2018-02-23 10:53:12 +06:30 |
|
phyusin
|
a1906ed555
|
check table type in oqs
|
2018-02-23 10:42:12 +06:30 |
|
phyusin
|
ed12897986
|
oqs js
|
2018-02-23 10:15:55 +06:30 |
|
phyusin
|
06abf1c744
|
check oqs edit in origami
|
2018-02-22 19:18:24 +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
|
5dac521605
|
Correct Redeem in close_cashier_pdf.rb
|
2018-02-22 18:26:46 +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
|
2cb13f9a62
|
change dashboard query
|
2018-02-22 10:10:20 +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 |
|
Aung Myo
|
a07d46facc
|
update addorder details
|
2018-02-21 17:15:29 +06:30 |
|
phyusin
|
1385c2c842
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-21 17:09:32 +06:30 |
|
phyusin
|
bc1007f193
|
check booking order delete for order
|
2018-02-21 17:09:18 +06:30 |
|
Yan
|
643a9d71be
|
remove skip before action in home controller
|
2018-02-21 17:04:45 +06:30 |
|
Yan
|
4552a4a9ac
|
license update, base controllers extends app controller
|
2018-02-21 16:42:19 +06:30 |
|
Yan
|
3d6da8fc66
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-02-21 16:30:37 +06:30 |
|
Yan
|
3d2d304654
|
license update for token
|
2018-02-21 16:30:14 +06:30 |
|