Commit Graph

1145 Commits

Author SHA1 Message Date
San Wai Lwin
1188f6e8e9 Pull from master 2018-03-15 13:48:52 +06:30
San Wai Lwin
a0c6c363fd Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-03-13 14:53:07 +06:30
San Wai Lwin
9228168ebc route changes 2018-03-13 14:51:07 +06:30
San Wai Lwin
694feb9c06 For pull 2018-03-13 14:46:07 +06:30
Aung Myo
900223ca21 Merge branch 'adminbsb_material_ui' 2018-03-13 11:46:05 +06:30
Aung Myo
df781395c8 update oqs and read me 2018-03-13 11:40:05 +06:30
phyusin
30bfb060df check payment and ability for split bill 2018-03-13 10:58:06 +06:30
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
21d39349d3 check shift update data 2018-03-09 11:54:35 +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
phyusin
7dd0f71894 check and fixed SQA feedback 2018-03-09 09:49:19 +06:30
Aung Myo
798bf8d4a8 Merge branch 'adminbsb_material_ui' 2018-03-08 18:09:14 +06:30
Aung Myo
3de5c173b5 update remove sidekiq 2018-03-08 18:08:36 +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
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
80a0cba537 For Pull from master 2018-03-06 11:19:19 +06:30
Aung Myo
d8256a93f6 Merge branch 'adminbsb_material_ui' 2018-03-05 17:02:09 +06:30
Aung Myo
981aef32ba update license check offline 2018-03-05 16:35:50 +06:30
phyusin
311bef4411 merge with Old Town Req 2018-03-05 15:10:36 +06:30
phyusin
e252c0acc3 check product account 2018-03-05 15:00:18 +06:30
phyusin
dfb80de435 change product account 2018-03-05 14:49:01 +06:30
phyusin
5eec1ad377 check product sale query 2018-03-05 14:12:30 +06:30
Aung Myo
87b51dbf82 Merge branch 'quick_service' 2018-03-05 13:56:23 +06:30
Aung Myo
01d217fd0f update conflix split pull 2018-02-28 17:04:35 +06:30
Aung Myo
d9afdc7df5 update product for account id 3 2018-02-28 16:44:32 +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
b073ebbeeb change ReceiptBillPdf 2018-02-28 10:20:50 +06:30
Aung Myo
0acd533bfe update add oredr 2018-02-28 10:14:18 +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
90b7a7f201 change stock check for dashboard query 2018-02-27 10:04:48 +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
Aung Myo
ce8581f892 fixed conflic when pull master item remark 2018-02-26 17:02:46 +06:30