Commit Graph

  • fcbd240e5e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-04 14:30:28 +06:30
  • 621596690e change UI in order reservation phyusin 2018-05-04 14:30:17 +06:30
  • 0e7c0e7a3e update print)setting for update Aung Myo 2018-05-04 14:26:19 +06:30
  • 4a9f73f006 Merge branch 'adminbsb_material_ui' Aung Myo 2018-05-04 14:19:55 +06:30
  • 727070a1b8 update void access code Aung Myo 2018-05-04 14:19:17 +06:30
  • 0ef0c859b9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-04 14:10:08 +06:30
  • c6f654808c add dine-in cashier settings in lookups phyusin 2018-05-04 14:09:58 +06:30
  • 9abf2d2f5e Merge branch 'adminbsb_material_ui' Aung Myo 2018-05-04 13:46:21 +06:30
  • 6d2146893c udpate access code for supervisor and manager Aung Myo 2018-05-04 13:45:36 +06:30
  • ef81987334 udpate access code for supervisor and manager Aung Myo 2018-05-04 13:16:57 +06:30
  • 79a328aa4a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-05-04 11:53:21 +06:30
  • 162327ac4c receipt bill issue phyusin 2018-05-04 11:51:14 +06:30
  • 8341b8c357 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-05-04 11:20:41 +06:30
  • 62636cc8c9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-04 11:19:11 +06:30
  • 135ccae8a6 change js file phyusin 2018-05-04 11:18:53 +06:30
  • fc69efff16 merged master Yan 2018-05-04 11:16:44 +06:30
  • 44ac3bcd0c no change base origami Yan 2018-05-04 11:14:54 +06:30
  • de82924227 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-05-04 10:43:36 +06:30
  • 8cc81a6bad Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-04 10:37:51 +06:30
  • 8135a2b916 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes phyusin 2018-05-04 10:25:47 +06:30
  • 8d73269c28 Edit row of Date in report San Wai Lwin 2018-05-04 10:24:55 +06:30
  • 084bf7eb1b remove comment data San Wai Lwin 2018-05-04 10:12:28 +06:30
  • 39264db517 Edit Waste and Spoil report showing by menu category,sorting by menu category, product name Qty and UI change San Wai Lwin 2018-05-04 09:52:52 +06:30
  • 5099ec6b8f Merge branch 'adminbsb_material_ui' Aung Myo 2018-05-03 18:09:28 +06:30
  • 69eeede474 update access code Aung Myo 2018-05-03 18:08:27 +06:30
  • 57b9c44349 merge with master Yan 2018-05-03 17:57:49 +06:30
  • b0377afb8f no change Yan 2018-05-03 17:53:34 +06:30
  • ffd3f5f158 check exception in check_user phyusin 2018-05-03 17:53:07 +06:30
  • 9e54aa1a27 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-03 17:43:57 +06:30
  • 16cb755f11 remove conflict phyusin 2018-05-03 17:43:12 +06:30
  • 1303fea51b secrets.yml edited online with Bitbucket Jueli Moon Aung 2018-05-03 11:13:00 +00:00
  • 70c2d0a05d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-03 17:23:11 +06:30
  • 9ff3018323 add alert for new,send_to_kitchen and ready_to_delivery phyusin 2018-05-03 17:22:59 +06:30
  • 66a1d0bdad Edit button color effect San Wai Lwin 2018-05-03 10:27:04 +06:30
  • a7721fb706 update comflix Aung Myo 2018-05-03 09:55:36 +06:30
  • 28dc5faada update complete tab and other issuse Aung Myo 2018-05-03 09:52:53 +06:30
  • 45531453c7 Pull from master San Wai Lwin 2018-05-03 09:31:36 +06:30
  • 02fe2e57cc no changes Yan 2018-05-03 09:29:18 +06:30
  • 0748478bb4 order reservation js phyusin 2018-05-03 09:28:21 +06:30
  • caa0180e8c Edit UI design and table in OQS San Wai Lwin 2018-05-02 17:55:53 +06:30
  • 965962e49d change some func: phyusin 2018-05-02 16:33:04 +06:30
  • bd078fc675 Edit in customer of Tax Profile San Wai Lwin 2018-05-02 16:00:19 +06:30
  • e3b2fee46e Change table view in OQS San Wai Lwin 2018-05-02 15:10:58 +06:30
  • faa8b82295 Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 phyusin 2018-05-02 13:49:17 +06:30
  • bf0dc3fecf Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-05-02 13:48:32 +06:30
  • 0e87ba87f3 add sum item qty in receipt bill phyusin 2018-05-02 13:46:43 +06:30
  • 6d6b6c6791 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-02 11:59:58 +06:30
  • 7c6d842a31 change UI and add expected waiting time phyusin 2018-05-02 11:59:35 +06:30
  • bf00eceba0 Merge branch 'adminbsb_material_ui' Aung Myo 2018-04-30 15:37:43 +06:30
  • ff4cdfa158 update member discount and tax Aung Myo 2018-04-30 15:16:07 +06:30
  • 027550121e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-04-30 09:46:04 +06:30
  • 929919ba0f change order reservation phyusin 2018-04-30 09:45:37 +06:30
  • 57607d0e8b update addorder controller Aung Myo 2018-04-27 16:17:55 +06:30
  • bae2f0ff17 update addorder js and checkout menu import and export Aung Myo 2018-04-27 14:11:05 +06:30
  • 11473c7fcd change order reservation phyusin 2018-04-27 13:47:54 +06:30
  • ec8645d0fc update addorder js Aung Myo 2018-04-27 11:25:20 +06:30
  • e216cf86c2 update addorder js Aung Myo 2018-04-27 10:59:53 +06:30
  • 36f097d4cf Merge branch 'adminbsb_material_ui' Aung Myo 2018-04-27 10:40:17 +06:30
  • eb61e94909 update addorder get menu and sub menu Aung Myo 2018-04-27 10:39:29 +06:30
  • 9aabed8ad5 update screte..yml Aung Myo 2018-04-26 17:36:59 +06:30
  • 8e7fd2d747 Edit in Reference No in CB San Wai Lwin 2018-04-26 17:23:01 +06:30
  • 390c9b2dca Merge branch 'adminbsb_material_ui' Aung Myo 2018-04-26 13:35:41 +06:30
  • 3a85481dcd update dinga and paymal Aung Myo 2018-04-26 13:07:31 +06:30
  • 52a6d13041 Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 phyusin 2018-04-25 15:43:01 +06:30
  • 0ab5a426f6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-04-25 15:42:32 +06:30
  • 172c2136cc add order reservation in clear data phyusin 2018-04-25 15:40:57 +06:30
  • 273401424c Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 phyusin 2018-04-25 15:36:10 +06:30
  • cab632283f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-04-25 15:35:33 +06:30
  • 81407cf95e change query for sale items phyusin 2018-04-25 15:33:54 +06:30
  • 314058282e puma deleted by sqa-1804-001 phyusin 2018-04-25 15:14:40 +06:30
  • 631c94a63a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-04-25 15:11:25 +06:30
  • c14960fc96 remove conflict data phyusin 2018-04-25 15:10:10 +06:30
  • b41c85132d add order and reservation, quick service in lookups and add date and order by in order reservation phyusin 2018-04-25 15:07:43 +06:30
  • 32fb28660e add pool zine in adapter Yan 2018-04-25 14:15:04 +06:30
  • 9b0a564b9a update cable for cloud Aung Myo 2018-04-25 13:18:54 +06:30
  • d0ad95c8d6 change name phyusin 2018-04-23 19:32:32 +06:30
  • 3f13bb6c74 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-04-23 19:21:20 +06:30
  • e62ba4d6c2 change params phyusin 2018-04-23 19:20:03 +06:30
  • 285f5d4cd0 fixed conflict Nweni 2018-04-23 18:21:47 +06:30
  • 86199ab4b4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-04-23 16:23:35 +06:30
  • 403f70480d api cloud update Yan 2018-04-23 16:23:00 +06:30
  • 3d39e398df remove actioncable phyusin 2018-04-23 16:16:41 +06:30
  • 6e3a5300a6 close cable in cloud mode Aung Myo 2018-04-23 15:39:56 +06:30
  • cd508b1f12 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-04-23 15:10:39 +06:30
  • f503d69181 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-04-23 15:09:18 +06:30
  • 2255fcd2d4 add token in lookups phyusin 2018-04-23 15:09:04 +06:30
  • 76531535d0 remove comment for license phyusin 2018-04-23 14:45:31 +06:30
  • 31ee7f05fe Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-04-23 14:43:41 +06:30
  • 5ea950f5aa update addore cable for second display closed Aung Myo 2018-04-23 14:43:27 +06:30
  • bb206a700d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-04-23 14:42:43 +06:30
  • 9b12ed0254 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-04-23 14:41:18 +06:30
  • b92889fb23 change base url settings phyusin 2018-04-23 14:41:07 +06:30
  • 924f8b03cd Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-04-23 14:18:14 +06:30
  • cbb7a14621 update action cable for cloud Aung Myo 2018-04-23 14:17:56 +06:30
  • 6ce1fbf8a9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-04-23 11:49:58 +06:30
  • 509d3a2b18 add mysql config option wait timeout Yan 2018-04-23 11:49:36 +06:30
  • 39c7cec32b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 Aung Myo 2018-04-22 16:42:52 +06:30
  • 8806027793 update bugs for demo Aung Myo 2018-04-22 16:38:52 +06:30
  • b949020153 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 Aung Myo 2018-04-22 15:07:56 +06:30
  • def208bc75 update requestBill Aung Myo 2018-04-22 14:43:32 +06:30