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 |
|
Aung Myo
|
d9afdc7df5
|
update product for account id 3
|
2018-02-28 16:44:32 +06:30 |
|
Aung Myo
|
0acd533bfe
|
update add oredr
|
2018-02-28 10:14:18 +06:30 |
|
phyusin
|
adefd8c034
|
remove conflict data
|
2018-02-27 14:35:21 +06:30 |
|
phyusin
|
4696f65725
|
Merge branch 'r-1802001-01-c1' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-02-26 18:47:17 +06:30 |
|
phyusin
|
a44c6c097c
|
conflict remove
|
2018-02-26 18:47:03 +06:30 |
|
San Wai Lwin
|
72b5701ec9
|
To add the condition for CloseCashierCustmisePdf
|
2018-02-26 18:29:58 +06:30 |
|
phyusin
|
760c204044
|
Merge branch 'r-1802001-01-c1' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-02-26 17:52:25 +06:30 |
|
San Wai Lwin
|
7d8442fd09
|
To add the condition for CloseCashierCustmisePdf
|
2018-02-26 17:49:19 +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
|
e43aaa915b
|
customize close cashier
|
2018-02-26 11:36:13 +06:30 |
|
phyusin
|
5523ff6fc1
|
check product sale report
|
2018-02-26 11:24:47 +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 |
|
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 |
|
phyusin
|
7c171057d1
|
product sale
|
2018-02-23 14:03:25 +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
|
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 |
|
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 |
|
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
|
e2903075b2
|
change split bill equal person flow
|
2018-02-21 18:24:04 +06:30 |
|
Yan
|
3d6da8fc66
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-02-21 16:30:37 +06:30 |
|
Aung Myo
|
0302bb408b
|
update no table oqs print
|
2018-02-21 16:11:05 +06:30 |
|
Aung Myo
|
c3af21d71c
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-21 13:28:43 +06:30 |
|
Aung Myo
|
ebdf838b52
|
update request sale for another role
|
2018-02-21 13:12:41 +06:30 |
|
Aung Myo
|
4455b03e8a
|
update print pay in qs
|
2018-02-21 12:34:03 +06:30 |
|
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
|
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 |
|
San Wai Lwin
|
51a243ea7c
|
To update close cashier
|
2018-02-20 17:35:54 +06:30 |
|
Aung Myo
|
20103a54a5
|
update sale for request
|
2018-02-20 14:33:36 +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
|
817784796a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-19 14:52: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 |
|