Commit Graph

1555 Commits

Author SHA1 Message Date
phyusin
92401ab4f9 merge with old_town_aston req 2018-03-12 12:10:52 +06:30
Aung Myo
04b053d2b7 fixed conflix payment page 2018-03-11 16:37:33 +06:30
Aung Myo
4ea2337fae update second display 2018-03-11 16:14:44 +06:30
phyusin
b0c35baf50 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-09 14:19:13 +06:30
phyusin
9c89bce25d change take away customer for quick service 2018-03-09 14:05:18 +06:30
Aung Myo
8ce14f8c99 update queui chang 2018-03-09 14:04:26 +06:30
phyusin
21d39349d3 check shift update data 2018-03-09 11:54:35 +06:30
phyusin
7dd0f71894 check and fixed SQA feedback 2018-03-09 09:49:19 +06:30
phyusin
23be4771fd add function for member card and qr code in payment 2018-03-08 14:57:45 +06:30
phyusin
d9a7e341fa cadd print pdf in payment page 2018-03-08 10:01:54 +06:30
San Wai Lwin
9ec8c4d18c Photo Field in Customer,Employee and Commissionor 2018-03-07 17:50:23 +06:30
phyusin
aedd79376f receipt no and print pdf 2018-03-07 15:36:05 +06:30
San Wai Lwin
9f29bbef5a To add image field in shop 2018-03-07 12:41:49 +06:30
San Wai Lwin
6cc2ba5110 To add only Other Payment Name beside SX Resturant 2018-03-06 18:24:19 +06:30
phyusin
ebf01a5d95 change action 2018-03-05 16:28:34 +06:30
phyusin
779ef9a4ba remove conflict data 2018-03-05 16:26:19 +06:30
phyusin
bd06e80b37 remove conflict data 2018-03-05 16:24:45 +06:30
Aung Myo
4b26c7617c update remove byebyg 2018-03-05 14:10:38 +06:30
Aung Myo
87b51dbf82 Merge branch 'quick_service' 2018-03-05 13:56:23 +06:30
Aung Myo
2c1f599990 update license 2018-03-05 13:53:25 +06:30
Aung Myo
01d217fd0f update conflix split pull 2018-02-28 17:04:35 +06:30
San Wai Lwin
07c3bcd7a7 Change Dashboard, Account in login, Shop name, Reference no for other charges 2018-02-28 15:31:55 +06:30
Aung Myo
1d70a9f178 update fixed issues for quickservice from sqa 2018-02-28 14:20:22 +06:30
Aung Myo
0acd533bfe update add oredr 2018-02-28 10:14:18 +06:30
phyusin
a17a240a2e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-28 10:07:17 +06:30
phyusin
674632fc9f check shop detail 2018-02-27 17:24:56 +06:30
Yan
908b590ed1 nothing change 2018-02-27 15:34:58 +06:30
phyusin
adefd8c034 remove conflict data 2018-02-27 14:35:21 +06:30
Yan
4d556cff43 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-02-27 11:44:11 +06:30
Yan
ac470c5747 license and local move to base action and update other base 2018-02-27 11:41:24 +06:30
phyusin
fc3cd1e72d check order item 2018-02-27 11:33:51 +06:30
phyusin
28a8b863aa Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-27 11:09:40 +06:30
phyusin
1e95105247 change product sale process 2018-02-27 10:34:30 +06:30
phyusin
700ff91127 product sale 2018-02-27 10:27:52 +06:30
phyusin
1b1206d735 add Old Town req: 2018-02-27 10:02:14 +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
Yan
13b7b1f800 add action base and update base ctrls 2018-02-26 17:42:54 +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
0f36e44d1c check route in product sale 2018-02-26 11:33:51 +06:30
phyusin
5523ff6fc1 check product sale report 2018-02-26 11:24:47 +06:30
phyusin
a76d0ddbcd change assigned order item id to order item id in Origami/Room 2018-02-26 10:09:33 +06:30
phyusin
8b064a4428 change assigned item id to order item id 2018-02-26 10:01:35 +06:30
phyusin
d287ab267d Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-26 09:21:46 +06:30
phyusin
7043eccb73 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-26 09:21:08 +06:30