Commit Graph

2231 Commits

Author SHA1 Message Date
San Wai Lwin
39264db517 Edit Waste and Spoil report showing by menu category,sorting by menu category, product name Qty and UI change 2018-05-04 09:52:52 +06:30
Aung Myo
5099ec6b8f Merge branch 'adminbsb_material_ui' 2018-05-03 18:09:28 +06:30
Aung Myo
69eeede474 update access code 2018-05-03 18:08:27 +06:30
phyusin
9e54aa1a27 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-03 17:43:57 +06:30
phyusin
16cb755f11 remove conflict 2018-05-03 17:43:12 +06:30
phyusin
70c2d0a05d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-03 17:23:11 +06:30
phyusin
9ff3018323 add alert for new,send_to_kitchen and ready_to_delivery 2018-05-03 17:22:59 +06:30
Aung Myo
a7721fb706 update comflix 2018-05-03 09:55:36 +06:30
Aung Myo
28dc5faada update complete tab and other issuse 2018-05-03 09:52:53 +06:30
San Wai Lwin
45531453c7 Pull from master 2018-05-03 09:31:36 +06:30
San Wai Lwin
caa0180e8c Edit UI design and table in OQS 2018-05-02 17:55:53 +06:30
phyusin
965962e49d change some func: 2018-05-02 16:33:04 +06:30
San Wai Lwin
e3b2fee46e Change table view in OQS 2018-05-02 15:10:58 +06:30
phyusin
faa8b82295 Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-05-02 13:49:17 +06:30
phyusin
6d6b6c6791 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-02 11:59:58 +06:30
phyusin
7c6d842a31 change UI and add expected waiting time 2018-05-02 11:59:35 +06:30
Aung Myo
bf00eceba0 Merge branch 'adminbsb_material_ui' 2018-04-30 15:37:43 +06:30
Aung Myo
ff4cdfa158 update member discount and tax 2018-04-30 15:16:07 +06:30
phyusin
929919ba0f change order reservation 2018-04-30 09:45:37 +06:30
phyusin
11473c7fcd change order reservation 2018-04-27 13:47:54 +06:30
Aung Myo
36f097d4cf Merge branch 'adminbsb_material_ui' 2018-04-27 10:40:17 +06:30
Aung Myo
eb61e94909 update addorder get menu and sub menu 2018-04-27 10:39:29 +06:30
San Wai Lwin
8e7fd2d747 Edit in Reference No in CB 2018-04-26 17:23:01 +06:30
Aung Myo
390c9b2dca Merge branch 'adminbsb_material_ui' 2018-04-26 13:35:41 +06:30
Aung Myo
3a85481dcd update dinga and paymal 2018-04-26 13:07:31 +06:30
phyusin
314058282e puma deleted by sqa-1804-001 2018-04-25 15:14:40 +06:30
phyusin
b41c85132d add order and reservation, quick service in lookups and add date and order by in order reservation 2018-04-25 15:07:43 +06:30
Nweni
285f5d4cd0 fixed conflict 2018-04-23 18:21:47 +06:30
Aung Myo
39c7cec32b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-22 16:42:52 +06:30
Aung Myo
8806027793 update bugs for demo 2018-04-22 16:38:52 +06:30
Aung Myo
5f95bf5f4d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-22 14:12:33 +06:30
Aung Myo
1fe48b57d0 update action cable for order resservation 2018-04-22 14:11:04 +06:30
Aung Myo
e1cf95ea60 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-20 17:04:18 +06:30
Aung Myo
cc4fdf2384 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-20 17:03:34 +06:30
Aung Myo
97ec370a8f update order and reserve and receipt rake 2018-04-20 17:03:18 +06:30
Yan
0aa080573c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-20 13:53:56 +06:30
Yan
223404a3b0 fix childplay code and qr code 2018-04-20 11:51:33 +06:30
Aung Myo
ed958b622d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-20 10:37:24 +06:30
Aung Myo
8720ffd195 update discuount view 2018-04-20 10:36:34 +06:30
Aung Myo
e640f4b0a0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-19 16:56:30 +06:30
Aung Myo
ed025800c4 update addor for set instance api for addorder and paymal paymant 2018-04-19 16:55:49 +06:30
Aung Myo
8d3946fede update dinga and paymal view for tabcap 2018-04-19 15:49:38 +06:30
Aung Myo
f638837f81 update dinga and paymal view for tabcap 2018-04-19 15:48:39 +06:30
Yan
f8a247c61a print pdf btn ui change 2018-04-19 15:41:22 +06:30
Yan
46f572e2ae merge with ui ux and add public menus in gitignore 2018-04-19 15:26:57 +06:30
Aung Myo
1913ada8e5 update 2018-04-19 15:23:08 +06:30
Yan
527cafc772 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-19 15:18:11 +06:30
Yan
3db2db093b menu export import update and print setting update 2018-04-19 15:17:59 +06:30
San Wai Lwin
0241d209ac Pull from master 2018-04-19 10:49:25 +06:30
Aung Myo
4837d27964 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-19 10:17:29 +06:30