phyusin
|
75d7999f76
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-18 18:17:36 +06:30 |
|
phyusin
|
4069f61bfc
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-18 18:02:20 +06:30 |
|
phyusin
|
e1bb01c029
|
change dashboard query and report
|
2018-05-18 18:01:44 +06:30 |
|
San Wai Lwin
|
c1525be826
|
Pull from master
|
2018-05-18 16:26:03 +06:30 |
|
Aung Myo
|
b2c66f3a92
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-18 13:06:50 +06:30 |
|
Aung Myo
|
e120a32307
|
Merge branch 'adminbsb_material_ui'
|
2018-05-18 12:26:44 +06:30 |
|
Aung Myo
|
0b7834ff29
|
update pay process order
|
2018-05-18 12:25:47 +06:30 |
|
Aung Myo
|
9c26e63110
|
update menu asc with name
|
2018-05-18 11:57:20 +06:30 |
|
phyusin
|
fbb80c3f01
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-17 17:53:29 +06:30 |
|
phyusin
|
6890b3a01e
|
check report and change alert for order reservation
|
2018-05-17 17:51: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
|
695461d2c5
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-16 13:18:04 +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 |
|
phyusin
|
d6a3c949f0
|
comment remark for order reservation
|
2018-05-16 09:49:49 +06:30 |
|
phyusin
|
086ddd2ab5
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-15 18:31:55 +06:30 |
|
Yan
|
9e6ac7811a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-15 13:19:52 +06:30 |
|
Yan
|
c7a33e5322
|
update menu imp/exp
|
2018-05-15 11:53:48 +06:30 |
|
Aung Myo
|
dd5b0a76c5
|
Merge branch 'adminbsb_material_ui'
|
2018-05-15 11:26:51 +06:30 |
|
Aung Myo
|
835f4aded1
|
added product sale for sale item report
|
2018-05-15 11:25:10 +06:30 |
|
phyusin
|
eaa013c10f
|
change status to doemal
|
2018-05-15 10:28:05 +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 |
|
phyusin
|
5ddfad7ef8
|
conflict data remove
|
2018-05-14 15:46:34 +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 |
|
Yan
|
568a94182a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-14 11:47:31 +06:30 |
|
Yan
|
3c1ed265f5
|
update menu import export
|
2018-05-14 11:47:06 +06:30 |
|
San Wai Lwin
|
49319d80cc
|
Pull from master
|
2018-05-14 11:38:39 +06:30 |
|
phyusin
|
6e5064cf9f
|
remove confilct data
|
2018-05-14 10:17:26 +06:30 |
|
phyusin
|
050d3379c0
|
check api issue
|
2018-05-12 15:20:57 +06:30 |
|
phyusin
|
d77d774a6f
|
check token
|
2018-05-12 12:25:11 +06:30 |
|
phyusin
|
c7c32ffff4
|
change order reservation
|
2018-05-12 11:38:43 +06:30 |
|
phyusin
|
baac2c33ea
|
move customer func: from doemal
|
2018-05-11 13:45:04 +06:30 |
|
phyusin
|
a76f9068da
|
check nil for cus info
|
2018-05-11 13:39:32 +06:30 |
|
Aung Myo
|
cf44fbdf88
|
fixed first bill with discount
|
2018-05-11 13:01:03 +06:30 |
|
Aung Myo
|
87913956f1
|
fixed first bill with discount
|
2018-05-11 11:54:53 +06:30 |
|
Aung Myo
|
5e0bdf1e36
|
update bugs
|
2018-05-11 09:57:26 +06:30 |
|
phyusin
|
abbff492e8
|
add API for order reservation
|
2018-05-10 12:37:17 +06:30 |
|
phyusin
|
d2ae16177b
|
change tax with takeaway
|
2018-05-10 09:17:26 +06:30 |
|
phyusin
|
0127b23e93
|
change order reservation data
|
2018-05-09 19:10:11 +06:30 |
|
phyusin
|
0f1ce09416
|
change customer and sale tax for takeaway
|
2018-05-09 15:40:13 +06:30 |
|
phyusin
|
4faee913f3
|
change order reservation -not finished
|
2018-05-09 11:28:01 +06:30 |
|
phyusin
|
313f1b2909
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-08 17:28:19 +06:30 |
|
phyusin
|
1716d14df3
|
change order reservation
|
2018-05-08 17:28:09 +06:30 |
|
Aung Myo
|
2d73e63e7b
|
update cache menu
|
2018-05-08 15:47:11 +06:30 |
|
phyusin
|
391cc19117
|
check order reservation
|
2018-05-07 13:32:58 +06:30 |
|
phyusin
|
cb3711e84b
|
Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-04 16:52:51 +06:30 |
|
San Wai Lwin
|
2f398bcfeb
|
Pull from master
|
2018-05-04 16:08:45 +06:30 |
|