Yan
|
84b45f03ff
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-02-21 10:12:19 +06:30 |
|
Yan
|
cd95d1d5c9
|
license test
|
2018-02-21 10:12:05 +06:30 |
|
phyusin
|
28252e9e87
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-21 09:17:12 +06:30 |
|
phyusin
|
76ccc36208
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-02-21 09:15:53 +06:30 |
|
phyusin
|
84c0a60c08
|
add filter for dashboard
|
2018-02-21 09:15:41 +06:30 |
|
Aung Myo
|
098ea8e931
|
update edit form
|
2018-02-20 18:15:55 +06:30 |
|
San Wai Lwin
|
51a243ea7c
|
To update close cashier
|
2018-02-20 17:35:54 +06:30 |
|
Aung Myo
|
4ebe353182
|
update conflix for request bill
|
2018-02-20 16:24:06 +06:30 |
|
Aung Myo
|
98c4737a2a
|
fixed minor issuse
|
2018-02-20 16:09:11 +06:30 |
|
Aung Myo
|
b0cc934625
|
update quick service for split bill
|
2018-02-20 15:29:19 +06:30 |
|
Aung Myo
|
20103a54a5
|
update sale for request
|
2018-02-20 14:33:36 +06:30 |
|
Aung Myo
|
a7dbb4442d
|
upsate
|
2018-02-20 14:15:01 +06:30 |
|
Aung Myo
|
9ae1fb1084
|
update requset bill for api
|
2018-02-20 14:00:18 +06:30 |
|
phyusin
|
c4c57680a1
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-20 13:34:48 +06:30 |
|
phyusin
|
5ec255ad33
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-20 13:34:11 +06:30 |
|
phyusin
|
4bfb5842bf
|
split bill process
|
2018-02-20 13:33:59 +06:30 |
|
Aung Myo
|
8f239cbb0b
|
update conflix for request bill
|
2018-02-20 13:32:27 +06:30 |
|
Aung Myo
|
58d78b8674
|
Merge branch 'adminbsb_material_ui'
|
2018-02-20 13:25:00 +06:30 |
|
Aung Myo
|
a5640877a3
|
update request bill
|
2018-02-20 11:59:57 +06:30 |
|
Aung Myo
|
31adc0e993
|
update request bill for another role in request_bill_con and sale.rb
|
2018-02-20 11:13:49 +06:30 |
|
Aung Myo
|
6d7da7f997
|
update request bill controller
|
2018-02-20 11:07:00 +06:30 |
|
Aung Myo
|
24c5b17fd6
|
Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-20 09:38:14 +06:30 |
|
Aung Myo
|
a2d0aee1ab
|
update applicaton contro and request bill
|
2018-02-20 09:37:30 +06:30 |
|
phyusin
|
8ccf45d06f
|
check some function
|
2018-02-19 18:05:30 +06:30 |
|
Aung Myo
|
a15025c8a0
|
update add orderjs and origami js
|
2018-02-19 17:45:30 +06:30 |
|
phyusin
|
ee86b7ed30
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-19 17:40:02 +06:30 |
|
phyusin
|
e4922a2425
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-19 17:24:03 +06:30 |
|
phyusin
|
6ae451f2bc
|
check split bill
|
2018-02-19 17:23:39 +06:30 |
|
Aung Myo
|
eef5432092
|
update add order css
|
2018-02-19 15:57:01 +06:30 |
|
Aung Myo
|
510e76b3c4
|
update add order js & css
|
2018-02-19 15:47:53 +06:30 |
|
phyusin
|
521b4d897b
|
change migration file
|
2018-02-19 15:43:27 +06:30 |
|
Aung Myo
|
817784796a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-19 14:52:46 +06:30 |
|
Aung Myo
|
48c33f68c2
|
fixed for survey for cashier and quick_ser
|
2018-02-19 14:50:38 +06:30 |
|
phyusin
|
9f2bab7187
|
check customer tax profiles in origami
|
2018-02-19 14:49:46 +06:30 |
|
phyusin
|
d134e3f67d
|
add survey for waiter
|
2018-02-19 14:43:34 +06:30 |
|
phyusin
|
50372116ad
|
Merge branch 'sqa-1802-001' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-02-19 14:41:58 +06:30 |
|
Aung Myo
|
c064f9d6f5
|
fixed conflix after pull split bill
|
2018-02-19 14:21:26 +06:30 |
|
Aung Myo
|
476f7425a2
|
update add order for menu and void foc for no table
|
2018-02-19 13:53:36 +06:30 |
|
phyusin
|
dc5cd84f5c
|
show cashier dashboard view
|
2018-02-19 13:46:08 +06:30 |
|
phyusin
|
150ff66446
|
change slae item query
|
2018-02-19 10:49:24 +06:30 |
|
phyusin
|
9594689f1c
|
add survey update function
|
2018-02-19 10:23:15 +06:30 |
|
Aung Myo
|
0504a9505b
|
update menu category
|
2018-02-19 09:12:51 +06:30 |
|
Aung Myo
|
4743ab6558
|
update addorderjs
|
2018-02-16 18:07:33 +06:30 |
|
phyusin
|
032e085b6e
|
change query for origami
|
2018-02-16 17:47:34 +06:30 |
|
Aung Myo
|
4b185f21d3
|
update addorder view
|
2018-02-16 17:41:26 +06:30 |
|
phyusin
|
8b6dd007ad
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-16 17:23:13 +06:30 |
|
Aung Myo
|
8291a0a992
|
update addorder view
|
2018-02-16 17:20:32 +06:30 |
|
phyusin
|
74310797db
|
remove order item count in origami
|
2018-02-16 17:18:49 +06:30 |
|
phyusin
|
80729e686f
|
change survey update function
|
2018-02-16 16:58:55 +06:30 |
|
phyusin
|
d459a6e2a3
|
check order item split process
|
2018-02-16 15:11:16 +06:30 |
|