Commit Graph

4876 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
Yan
57b9c44349 merge with master 2018-05-03 17:57:49 +06:30
Yan
b0377afb8f no change 2018-05-03 17:53:34 +06:30
phyusin
ffd3f5f158 check exception in check_user 2018-05-03 17:53:07 +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
Jueli Moon Aung
1303fea51b secrets.yml edited online with Bitbucket 2018-05-03 11:13:00 +00:00
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
San Wai Lwin
66a1d0bdad Edit button color effect 2018-05-03 10:27:04 +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
Yan
02fe2e57cc no changes 2018-05-03 09:29:18 +06:30
phyusin
0748478bb4 order reservation js 2018-05-03 09:28:21 +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
bd078fc675 Edit in customer of Tax Profile 2018-05-02 16:00:19 +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
bf0dc3fecf Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-02 13:48:32 +06:30
phyusin
0e87ba87f3 add sum item qty in receipt bill 2018-05-02 13:46:43 +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
027550121e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-30 09:46:04 +06:30
phyusin
929919ba0f change order reservation 2018-04-30 09:45:37 +06:30
Aung Myo
57607d0e8b update addorder controller 2018-04-27 16:17:55 +06:30
Aung Myo
bae2f0ff17 update addorder js and checkout menu import and export 2018-04-27 14:11:05 +06:30
phyusin
11473c7fcd change order reservation 2018-04-27 13:47:54 +06:30
Aung Myo
ec8645d0fc update addorder js 2018-04-27 11:25:20 +06:30
Aung Myo
e216cf86c2 update addorder js 2018-04-27 10:59:53 +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
Aung Myo
9aabed8ad5 update screte..yml 2018-04-26 17:36:59 +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
52a6d13041 Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-25 15:43:01 +06:30
phyusin
0ab5a426f6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-04-25 15:42:32 +06:30
phyusin
172c2136cc add order reservation in clear data 2018-04-25 15:40:57 +06:30
phyusin
273401424c Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-25 15:36:10 +06:30
phyusin
cab632283f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-04-25 15:35:33 +06:30
phyusin
81407cf95e change query for sale items 2018-04-25 15:33:54 +06:30
phyusin
314058282e puma deleted by sqa-1804-001 2018-04-25 15:14:40 +06:30
phyusin
631c94a63a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-04-25 15:11:25 +06:30
phyusin
c14960fc96 remove conflict data 2018-04-25 15:10:10 +06:30