Commit Graph

4233 Commits

Author SHA1 Message Date
phyusin
7eb138cdda Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-08 18:02:25 +06:30
phyusin
a6d98093d6 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-08-08 18:01:19 +06:30
San Wai Lwin
f15eea1e5c Edit time 2018-08-08 17:59:15 +06:30
phyusin
9b909ef545 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-08 17:51:03 +06:30
phyusin
cd0184e3c9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-08-08 17:48:47 +06:30
phyusin
83617962c6 add table in receipt detail report 2018-08-08 17:48:22 +06:30
Aung Myo
de20436e8b update order in quick service without dinign 2018-08-08 17:46:01 +06:30
Aung Myo
1c73ee0ed7 update payment controller for print current user with terminal 2018-08-08 16:54:22 +06:30
Aung Myo
9f8aee2251 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-08-08 16:17:22 +06:30
Aung Myo
5e08797b41 print for current cashier 2018-08-08 16:17:04 +06:30
phyusin
78cbbbb956 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-08 14:29:44 +06:30
phyusin
a96ed5ed09 check tax amount > 0 in receipt report 2018-08-08 14:28:36 +06:30
Aung Myo
53ee88f005 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-08-08 14:19:07 +06:30
Aung Myo
6b7cee2924 update open cashier multiple 2018-08-08 14:18:47 +06:30
phyusin
a0f81af75b check req bil 2018-08-08 09:48:21 +06:30
phyusin
5b1374b3ee Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-08-07 16:31:16 +06:30
Aung Myo
8cdb2d53b4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-08-07 16:27:54 +06:30
Aung Myo
0e7db08bfc update process payment for current user 2018-08-07 16:27:32 +06:30
San Wai Lwin
144f27d64c Edit in check_in_process_controller 2018-08-07 16:26:34 +06:30
phyusin
577790bc4f Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-07 15:05:13 +06:30
phyusin
602755cbc3 cehck bank 2018-08-07 15:03:20 +06:30
Aung Myo
76e626a0d9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-08-07 14:53:49 +06:30
Aung Myo
f41b150629 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-08-07 14:51:35 +06:30
phyusin
c11b8666d5 check bank trans & report 2018-08-07 14:51:27 +06:30
Aung Myo
6cbdca4ce6 update shift and multiple 2018-08-07 14:51:17 +06:30
phyusin
f78cf533a2 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-08-07 14:42:24 +06:30
San Wai Lwin
e9b26f1684 Edit in bill and request bill controller 2018-08-07 14:41:18 +06:30
phyusin
57de2cf2f4 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-07 14:13:32 +06:30
phyusin
de5448b7a0 check function for order and bank 2018-08-07 14:13:00 +06:30
San Wai Lwin
e0d330ef49 Remove common function 2018-08-07 13:50:18 +06:30
phyusin
181701be06 remove conflict 2018-08-07 11:11:03 +06:30
phyusin
2c608920e1 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-08-07 10:44:21 +06:30
phyusin
456bb61f61 add fun: 2018-08-07 10:43:40 +06:30
Aung Myo
81a387e522 update multiple zone with terminal 2018-08-07 09:33:26 +06:30
San Wai Lwin
e99e907bc4 Pull from master 2018-08-06 17:52:03 +06:30
Aung Myo
b933f959f6 update bill for multiple zone 2018-08-06 17:46:27 +06:30
San Wai Lwin
35ac07b0a6 Edit 2018-08-06 16:37:52 +06:30
San Wai Lwin
436392550d Edit Report 2018-08-06 15:59:14 +06:30
San Wai Lwin
0f14a02f2d Edit Report 2018-08-06 15:14:28 +06:30
San Wai Lwin
7b74de9b3a Edit in report 2018-08-06 14:44:26 +06:30
San Wai Lwin
10d93a658c Edit filter 2018-08-06 13:52:47 +06:30
San Wai Lwin
af6aae5cb6 Add CB settlement report and transaction 2018-08-06 13:27:11 +06:30
Aung Myo
f0f19edcd6 update bill request for employee 2018-08-06 12:52:47 +06:30
Aung Myo
6e13aa73a3 update for bill api with order source 2018-08-06 10:56:33 +06:30
phyusin
963172eec0 remove null false for product_alt_name in slae_items migration 2018-08-03 16:36:58 +06:30
San Wai Lwin
41dc66c704 Edit im config/initializer 2018-08-03 16:03:17 +06:30
San Wai Lwin
0abad2b305 Add CB payment in transactions and reports 2018-08-03 16:01:22 +06:30
phyusin
27271c429e change format 2018-08-03 15:46:59 +06:30
phyusin
b1d0bf8daa check shift 2018-08-03 09:48:35 +06:30
phyusin
a5efbe9af7 change query for credit with order source 2018-08-02 18:00:22 +06:30