Aung Myo
|
3dc2863c4f
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-17 10:44:37 +06:30 |
|
Aung Myo
|
e5ea6a90e8
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-17 09:29:41 +06:30 |
|
Aung Myo
|
ca360c75d6
|
update cash in and out for quick service
|
2018-05-16 18:01:47 +06:30 |
|
phyusin
|
02ff79a68c
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-16 17:16:23 +06:30 |
|
phyusin
|
95e94bd0fd
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-16 17:15:43 +06:30 |
|
phyusin
|
fa4c5d075e
|
check menu is_available, survey id and check status with sale items SUM in receipBill
|
2018-05-16 17:08:00 +06:30 |
|
Aung Myo
|
c386fcfa03
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-16 14:23:36 +06:30 |
|
Aung Myo
|
29434f2df9
|
update void paymal search
|
2018-05-16 14:20:20 +06:30 |
|
Aung Myo
|
95faa6fdb4
|
update edit controller for update qty without assigne items
|
2018-05-16 13:54:14 +06:30 |
|
Aung Myo
|
800ea01f23
|
bugs fixed
|
2018-05-16 13:17:52 +06:30 |
|
phyusin
|
33d5a0ad80
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-16 09:57:44 +06:30 |
|
Aung Myo
|
7c72d4b9a8
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-16 09:23:33 +06:30 |
|
Aung Myo
|
c08c72d0cb
|
update cash in and out for shift
|
2018-05-16 09:23:10 +06:30 |
|
phyusin
|
086ddd2ab5
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-15 18:31:55 +06:30 |
|
phyusin
|
a72ae34a46
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-15 17:36:05 +06:30 |
|
phyusin
|
de05c4423a
|
check unclose shift in filter
|
2018-05-15 17:35:10 +06:30 |
|
Yan
|
9e6ac7811a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-15 13:19:52 +06:30 |
|
Yan
|
8acfe654eb
|
update menu imp/exp
|
2018-05-15 13:19:27 +06:30 |
|
Yan
|
c7a33e5322
|
update menu imp/exp
|
2018-05-15 11:53:48 +06:30 |
|
Aung Myo
|
835f4aded1
|
added product sale for sale item report
|
2018-05-15 11:25:10 +06:30 |
|
phyusin
|
185ba2eaed
|
Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01
|
2018-05-14 17:05:23 +06:30 |
|
San Wai Lwin
|
8fda04372d
|
Add total waste and spoil in close cashier and Closing Balance မွာ Character ေတြ ရိုက္လို႕ရေန
|
2018-05-14 15:31:00 +06:30 |
|
San Wai Lwin
|
49319d80cc
|
Pull from master
|
2018-05-14 11:38:39 +06:30 |
|
Aung Myo
|
34141e1284
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-14 10:24:43 +06:30 |
|
Aung Myo
|
ea914ec860
|
update addorder menu
|
2018-05-14 10:24:30 +06:30 |
|
phyusin
|
6e5064cf9f
|
remove confilct data
|
2018-05-14 10:17:26 +06:30 |
|
phyusin
|
9900ea385a
|
change token,action,secrets
|
2018-05-12 16:33:28 +06:30 |
|
phyusin
|
1909a73fe0
|
add docker data
|
2018-05-12 16:19:18 +06:30 |
|
phyusin
|
050d3379c0
|
check api issue
|
2018-05-12 15:20:57 +06:30 |
|
phyusin
|
c7c32ffff4
|
change order reservation
|
2018-05-12 11:38:43 +06:30 |
|
phyusin
|
7d45e6ca81
|
check token for cloud
|
2018-05-11 17:52:52 +06:30 |
|
phyusin
|
0a07b3479d
|
check shop code for new order
|
2018-05-11 17:03:53 +06:30 |
|
Aung Myo
|
800fa41abb
|
Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes
|
2018-05-11 14:09:56 +06:30 |
|
phyusin
|
baac2c33ea
|
move customer func: from doemal
|
2018-05-11 13:45:04 +06:30 |
|
phyusin
|
9daf8235a7
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes
|
2018-05-11 13:06:13 +06:30 |
|
phyusin
|
ae5ced251b
|
remove conflict
|
2018-05-11 12:01:27 +06:30 |
|
phyusin
|
760c7685df
|
fixed some issue
|
2018-05-11 11:59:30 +06:30 |
|
San Wai Lwin
|
12f79ded6d
|
Edit Customer form
|
2018-05-11 11:40:27 +06:30 |
|
Aung Myo
|
5e0bdf1e36
|
update bugs
|
2018-05-11 09:57:26 +06:30 |
|
Aung Myo
|
80f353ba3c
|
update void edit with access code
|
2018-05-10 16:31:39 +06:30 |
|
phyusin
|
70b3e88b0e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-10 14:34:26 +06:30 |
|
Aung Myo
|
6f8cae303e
|
update route conflict for addorder
|
2018-05-10 14:31:24 +06:30 |
|
Aung Myo
|
7b5c04c797
|
update add order cache menu
|
2018-05-10 14:28:28 +06:30 |
|
phyusin
|
d7d3765875
|
add sale_status for waste and spoile
|
2018-05-10 14:22:37 +06:30 |
|
phyusin
|
a2e7ef0e5a
|
change print settings for cloud
|
2018-05-10 13:59:19 +06:30 |
|
phyusin
|
abbff492e8
|
add API for order reservation
|
2018-05-10 12:37:17 +06:30 |
|
phyusin
|
4d2e872c7d
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-10 09:13:29 +06:30 |
|
phyusin
|
0127b23e93
|
change order reservation data
|
2018-05-09 19:10:11 +06:30 |
|
Aung Myo
|
1a56109d66
|
update conflict with addorderjs
|
2018-05-09 19:01:38 +06:30 |
|
phyusin
|
0f1ce09416
|
change customer and sale tax for takeaway
|
2018-05-09 15:40:13 +06:30 |
|