phyusin
|
776479a74e
|
remove conflict data
|
2018-05-29 14:32:37 +06:30 |
|
phyusin
|
930e8d29d5
|
add new payment for aston request
|
2018-05-29 14:29:38 +06:30 |
|
Aung Myo
|
3527ef17d9
|
Merge branch 'adminbsb_material_ui'
|
2018-05-29 10:44:49 +06:30 |
|
Aung Myo
|
a062c5574a
|
update sale receipt no repoet
|
2018-05-29 10:39:09 +06:30 |
|
phyusin
|
bf9bb1c58a
|
transactions for order reservation and api for tax profile
|
2018-05-28 18:08:30 +06:30 |
|
phyusin
|
0ff21a88cd
|
remove conflict
|
2018-05-28 10:52:51 +06:30 |
|
phyusin
|
c4cefb05ae
|
conflict data
|
2018-05-28 10:46:04 +06:30 |
|
EikhantMon
|
7ddbd7d78a
|
conflit modified changes
|
2018-05-25 17:44:36 +06:30 |
|
San Wai Lwin
|
3c8e3c5326
|
Add Order Set Pdf
|
2018-05-25 17:06:45 +06:30 |
|
EikhantMon
|
1ae55f1af2
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering
|
2018-05-25 16:23:42 +06:30 |
|
EikhantMon
|
6c26dc4d5a
|
item_slim_customise_pdf
|
2018-05-25 16:23:24 +06:30 |
|
San Wai Lwin
|
578c14ccc3
|
Pull from master
|
2018-05-25 16:22:30 +06:30 |
|
San Wai Lwin
|
f906134fbf
|
Remove lookup settings in Order Pdf
|
2018-05-25 16:06:10 +06:30 |
|
phyusin
|
5d63d38e4e
|
add inclc in receipt bill
|
2018-05-25 15:25:39 +06:30 |
|
phyusin
|
590b67abdf
|
show incl exec in receipt bill
|
2018-05-25 14:46:40 +06:30 |
|
phyusin
|
5feea91584
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-05-25 13:27:18 +06:30 |
|
phyusin
|
49453a22c0
|
change tax profile overide
|
2018-05-25 13:26:55 +06:30 |
|
Aung Myo
|
b7c6614537
|
upadte api order create process order
|
2018-05-25 13:14:57 +06:30 |
|
San Wai Lwin
|
d910c4078b
|
Add Order item & summary customise font pdf
|
2018-05-24 17:02:54 +06:30 |
|
Aung Myo
|
6d6d90050f
|
update commission && report
|
2018-05-24 14:03:49 +06:30 |
|
Aung Myo
|
cf5c5bb4fa
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-23 17:59:30 +06:30 |
|
phyusin
|
85b997ddbe
|
change receipt no report ui and add sale taxes for dining charges
|
2018-05-23 16:57:41 +06:30 |
|
Aung Myo
|
6236e06558
|
update commitssion
|
2018-05-23 16:33:20 +06:30 |
|
phyusin
|
ead01f3d97
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2018-05-22 11:15:17 +06:30 |
|
phyusin
|
aa3da073bd
|
back btn for pending
|
2018-05-22 10:59:56 +06:30 |
|
Aung Myo
|
1b5f657d0c
|
update commission
|
2018-05-22 10:53:06 +06:30 |
|
Aung Myo
|
b68169b244
|
update promotion with tax
|
2018-05-21 17:26:48 +06:30 |
|
Aung Myo
|
f5ad727c08
|
update menu cateogry and myanmar font in xls
|
2018-05-21 15:30:15 +06:30 |
|
Aung Myo
|
38e89674e9
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-05-21 13:05:09 +06:30 |
|
Aung Myo
|
5a9dae725e
|
update conflict js
|
2018-05-21 13:04:00 +06:30 |
|
Aung Myo
|
7e8b69aa7c
|
update action cable and other bugs
|
2018-05-21 13:00:55 +06:30 |
|
phyusin
|
ea01290a19
|
remove back btn
|
2018-05-21 12:39:34 +06:30 |
|
San Wai Lwin
|
cfc672dc31
|
Pull from master
|
2018-05-21 11:12:12 +06:30 |
|
San Wai Lwin
|
85625b7090
|
Edit in A5pdf
|
2018-05-21 11:08:08 +06:30 |
|
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 |
|