Commit Graph

541 Commits

Author SHA1 Message Date
phyusin
d9a7e341fa cadd print pdf in payment page 2018-03-08 10:01:54 +06:30
phyusin
5d8ba3c416 remove comment in action controller 2018-03-07 15:55:55 +06:30
phyusin
aedd79376f receipt no and print pdf 2018-03-07 15:36:05 +06:30
Aung Myo
981aef32ba update license check offline 2018-03-05 16:35:50 +06:30
Aung Myo
00271e9e21 update license 2018-03-05 14:35:04 +06:30
Aung Myo
2d62750caa update delete license 2018-03-05 14:04:38 +06:30
Aung Myo
c1b112636c update license 2018-03-05 13:54:52 +06:30
Aung Myo
2c1f599990 update license 2018-03-05 13:53:25 +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
a44c6c097c conflict remove 2018-02-26 18:47:03 +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
Aung Myo
ac47501e01 update conflic for pull master 2018-02-23 14:58:35 +06:30
phyusin
7c171057d1 product sale 2018-02-23 14:03:25 +06:30
phyusin
7cbb67fd30 add link for oqs in origami 2018-02-22 18:51:57 +06:30
phyusin
eafbb80f51 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-22 09:44:14 +06:30
phyusin
e2903075b2 change split bill equal person flow 2018-02-21 18:24:04 +06:30
Yan
cd95d1d5c9 license test 2018-02-21 10:12:05 +06:30
phyusin
4bfb5842bf split bill process 2018-02-20 13:33:59 +06:30
phyusin
50372116ad Merge branch 'sqa-1802-001' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-19 14:41:58 +06:30
Aung Myo
c064f9d6f5 fixed conflix after pull split bill 2018-02-19 14:21:26 +06:30
phyusin
dc5cd84f5c show cashier dashboard view 2018-02-19 13:46:08 +06:30
Aung Myo
0504a9505b update menu category 2018-02-19 09:12:51 +06:30
phyusin
80729e686f change survey update function 2018-02-16 16:58:55 +06:30
phyusin
0ddaee7444 equal split and order split in order tab' 2018-02-16 12:13:35 +06:30
Jueli Moon Aung
cf7da9f25c secrets.yml edited online by julian 2018-02-16 03:05:10 +00:00
Jueli Moon Aung
5b354299bb puma.rb.production edited by julian 2018-02-16 03:04:30 +00:00
Aung Myo
cf644892c9 update pending and quick service 2018-02-15 15:26:34 +06:30
Aung Myo
9757c34a09 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-14 15:01:57 +06:30
phyusin
75cadc7ed3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-14 14:46:44 +06:30
Aung Myo
22a9e75efa update license and sym_master 2018-02-13 15:12:09 +06:30
Aung Myo
aeafbb4fae update pull split bill 2018-02-09 14:31:34 +06:30
Aung Myo
54cb5b0c87 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-09 11:32:49 +06:30
Aung Myo
edade3662b update quickservice 2018-02-09 11:32:29 +06:30
phyusin
8f96249c21 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-08 18:11:50 +06:30
phyusin
d42fc485ae change ui for left sidebar 2018-02-08 18:10:11 +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
phyusin
41aa840eb2 conflict data 2018-02-06 18:12:59 +06:30
phyusin
7a055470e8 add split bill for order item in room 2018-02-06 17:46:58 +06:30
Aung Myo
85020d91bf update table box 2018-02-06 09:52:27 +06:30
Aung Myo
76a094972e update payment 2018-02-05 15:10:35 +06:30
phyusin
991bc48505 order item split bill process 2018-02-06 09:46:30 +06:30
Aung Myo
1d9164aaf0 update quick service for payment 2018-02-02 18:03:43 +06:30
phyusin
d1fd92bfd3 split bill ui 2018-02-02 13:41:38 +06:30
phyusin
48ce8e4809 split bill 2018-02-01 18:12:59 +06:30
Aung Myo
9efd54e68b update remove job from cable and cup control in print 2018-02-01 15:30:30 +06:30