Commit Graph

264 Commits

Author SHA1 Message Date
San Wai Lwin
1188f6e8e9 Pull from master 2018-03-15 13:48:52 +06:30
phyusin
92401ab4f9 merge with old_town_aston req 2018-03-12 12:10:52 +06:30
phyusin
d7d5f8afc7 check manager account login error in dashboard 2018-03-09 10:55:28 +06:30
phyusin
b3ec34aa64 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-09 09:49:33 +06:30
Aung Myo
6fd58ebb94 update conflix addorder 2018-03-08 15:38:52 +06:30
Aung Myo
3fcdbfb8df update receipt ranke file 2018-03-08 15:30:18 +06:30
phyusin
23be4771fd add function for member card and qr code in payment 2018-03-08 14:57:45 +06:30
phyusin
aedd79376f receipt no and print pdf 2018-03-07 15:36:05 +06:30
phyusin
311bef4411 merge with Old Town Req 2018-03-05 15:10:36 +06:30
phyusin
5eec1ad377 check product sale query 2018-03-05 14:12:30 +06:30
phyusin
2f7d9523ec check product sale 2018-02-28 16:26:40 +06:30
phyusin
7c8b5def81 check product sale 2018-02-28 15:42:07 +06:30
phyusin
8e4c3864da check query for product sales 2018-02-28 15:27:29 +06:30
phyusin
9daf5c92ef check sale data 2018-02-27 18:07:15 +06:30
phyusin
98795478b1 add product sale data 2018-02-27 17:46:02 +06:30
phyusin
c1865f5356 change sale.rb file 2018-02-27 17:40:48 +06:30
phyusin
adefd8c034 remove conflict data 2018-02-27 14:35:21 +06:30
phyusin
1b1206d735 add Old Town req: 2018-02-27 10:02:14 +06:30
phyusin
a44c6c097c conflict remove 2018-02-26 18:47:03 +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
5523ff6fc1 check product sale report 2018-02-26 11:24:47 +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
phyusin
7c171057d1 product sale 2018-02-23 14:03:25 +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
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
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
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
dc5cd84f5c show cashier dashboard view 2018-02-19 13:46:08 +06:30
phyusin
150ff66446 change slae item query 2018-02-19 10:49:24 +06:30
Aung Myo
2f7f412150 update addorder move + and box 2018-02-16 09:46:55 +06:30
Aung Myo
cf644892c9 update pending and quick service 2018-02-15 15:26:34 +06:30
Aung Myo
0d515d9c93 paending order sale model 2018-02-15 10:27:00 +06:30
Aung Myo
08e372cfb5 udpdate qs 2018-02-14 13:46:22 +06:30
Aung Myo
edade3662b update quickservice 2018-02-09 11:32:29 +06:30
Aung Myo
8e2ec90ee6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-08 11:09:21 +06:30
Aung Myo
38dc13ecf7 update pending order 2018-02-08 11:08:52 +06:30
Aung Myo
313bcd5db9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2018-02-06 17:02:44 +06:30