git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 5f95bf5f4d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 Aung Myo 2018-04-22 14:12:33 +06:30
  • 1fe48b57d0 update action cable for order resservation Aung Myo 2018-04-22 14:11:04 +06:30
  • cc89a35ece update rake receipt Aung Myo 2018-04-22 10:45:29 +06:30
  • 268cae09f5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-04-20 20:27:31 +06:30
  • 835231bd61 edit api cntr Yan 2018-04-20 20:27:08 +06:30
  • 276c776cfb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 Aung Myo 2018-04-20 18:23:38 +06:30
  • 0dea849d46 update ability account and suvisor and manager Aung Myo 2018-04-20 18:22:36 +06:30
  • ba1b7a1d9c update receipt rake Aung Myo 2018-04-20 18:11:32 +06:30
  • e1cf95ea60 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 Aung Myo 2018-04-20 17:04:18 +06:30
  • cc4fdf2384 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-04-20 17:03:34 +06:30
  • 97ec370a8f update order and reserve and receipt rake Aung Myo 2018-04-20 17:03:18 +06:30
  • 0aa080573c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-04-20 13:53:56 +06:30
  • 983baa88c9 update discount member message Aung Myo 2018-04-20 13:00:48 +06:30
  • 223404a3b0 fix childplay code and qr code Yan 2018-04-20 11:51:33 +06:30
  • ed958b622d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 Aung Myo 2018-04-20 10:37:24 +06:30
  • 8720ffd195 update discuount view Aung Myo 2018-04-20 10:36:34 +06:30
  • dac69f18e1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 Aung Myo 2018-04-20 09:34:07 +06:30
  • 85bee857a4 merge with adminbsb_ma_ui Aung Myo 2018-04-20 09:32:27 +06:30
  • e9bc846865 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 Aung Myo 2018-04-20 09:30:19 +06:30
  • 6a63390da6 update receipt migrate Aung Myo 2018-04-20 09:29:39 +06:30
  • 7509362d45 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 Aung Myo 2018-04-20 09:25:22 +06:30
  • f8687b5010 update cloud mode off for order and queue Aung Myo 2018-04-20 09:23:11 +06:30
  • 830dc1b4d2 udpate order Aung Myo 2018-04-19 19:02:21 +06:30
  • e75a276326 udpate order Aung Myo 2018-04-19 18:57:03 +06:30
  • 86e3b8ee34 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 Aung Myo 2018-04-19 18:39:07 +06:30
  • 82d2e73912 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-04-19 18:38:19 +06:30
  • c957ef7423 update order for cloud process order Aung Myo 2018-04-19 18:38:08 +06:30
  • d0293a762a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-04-19 17:26:30 +06:30
  • 7d5d070e0d fix action contorller Yan 2018-04-19 17:25:58 +06:30
  • e640f4b0a0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 Aung Myo 2018-04-19 16:56:30 +06:30
  • 095a62f143 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-04-19 16:55:58 +06:30
  • ed025800c4 update addor for set instance api for addorder and paymal paymant Aung Myo 2018-04-19 16:55:49 +06:30
  • 1187ddba37 move check license to action controler Yan 2018-04-19 16:40:59 +06:30
  • 8d3946fede update dinga and paymal view for tabcap Aung Myo 2018-04-19 15:49:38 +06:30
  • f638837f81 update dinga and paymal view for tabcap Aung Myo 2018-04-19 15:48:39 +06:30
  • f8a247c61a print pdf btn ui change Yan 2018-04-19 15:41:22 +06:30
  • 46f572e2ae merge with ui ux and add public menus in gitignore Yan 2018-04-19 15:26:57 +06:30
  • 6540e93cfc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 Aung Myo 2018-04-19 15:23:46 +06:30
  • 1913ada8e5 update Aung Myo 2018-04-19 15:23:08 +06:30
  • 527cafc772 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-04-19 15:18:11 +06:30
  • 3db2db093b menu export import update and print setting update Yan 2018-04-19 15:17:59 +06:30
  • 652251f243 update rake file Aung Myo 2018-04-19 15:00:48 +06:30
  • 635db2e011 update rake receipt file Aung Myo 2018-04-19 13:59:50 +06:30
  • 924edd823a update shift_sale migration file and secret yml Aung Myo 2018-04-19 10:49:58 +06:30
  • 0241d209ac Pull from master San Wai Lwin 2018-04-19 10:49:25 +06:30
  • 4ea6474dc1 Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 Aung Myo 2018-04-19 10:43:59 +06:30
  • e468bc65af update shift_sale migration file and secret yml Aung Myo 2018-04-19 10:32:59 +06:30
  • 99e000e000 update shift_sale migration file Aung Myo 2018-04-19 10:31:02 +06:30
  • 61e8d6e2b5 update shift_sale migration file Aung Myo 2018-04-19 10:28:31 +06:30
  • 0b97d2a457 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 Aung Myo 2018-04-19 10:18:45 +06:30
  • 4837d27964 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-04-19 10:17:29 +06:30
  • ed8e9836fe check and update qrcode payment Aung Myo 2018-04-19 10:16:38 +06:30
  • 458da62c66 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-04-18 18:12:16 +06:30
  • 28a79fe60f pdf viewer add and menu export testing Yan 2018-04-18 18:12:01 +06:30
  • a5cb5a67f4 update order reservation Aung Myo 2018-04-18 17:55:32 +06:30
  • 70ec80a1d5 Manager level can not edit Administrator's password and id San Wai Lwin 2018-04-18 16:57:02 +06:30
  • 2a26abff9a finished dinga and paymal payment Aung Myo 2018-04-18 16:47:38 +06:30
  • f8164e483c update puma production and remove develop Aung Myo 2018-04-18 14:50:16 +06:30
  • a009f359fa update puma production San Wai Lwin 2018-04-18 14:44:25 +06:30
  • 5816a48d32 update dinga and paymal Aung Myo 2018-04-18 14:40:53 +06:30
  • fc523ca390 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-04-18 14:17:52 +06:30
  • c22fc3e86e add pdf viewer and test doemal Yan 2018-04-18 14:17:37 +06:30
  • 4d95ceed75 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-04-12 16:25:36 +06:30
  • de5bbb27f7 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-04-12 16:19:27 +06:30
  • bf38beb066 change status phyusin 2018-04-12 16:18:32 +06:30
  • 859080d4a1 Edit MoveTablePdf for cloud San Wai Lwin 2018-04-12 15:28:10 +06:30
  • b12d4b8bf8 token checked for doemal phyusin 2018-04-12 14:30:25 +06:30
  • 4137026c16 order reservation updated phyusin 2018-04-12 14:28:44 +06:30
  • d800a5d28d license phyusin 2018-04-12 11:11:51 +06:30
  • b4ccd02fc2 change order reservation phyusin 2018-04-12 11:05:10 +06:30
  • 49ebc6c0dc order reservation phyusin 2018-04-12 11:01:13 +06:30
  • 926ce2f259 Edit in Printer San Wai Lwin 2018-04-12 10:42:43 +06:30
  • 4a0995c7ba Pull from master San Wai Lwin 2018-04-12 10:04:28 +06:30
  • 36eab44f8b edit Total Customer in survey San Wai Lwin 2018-04-12 09:59:34 +06:30
  • c1a6ff7230 Merge branch 'doemal_ordering' Aung Myo 2018-04-11 18:06:55 +06:30
  • 4d92d71b5c update doemal ordering Aung Myo 2018-04-11 18:05:49 +06:30
  • dab00151ef Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-04-11 18:02:23 +06:30
  • 2ac629f6e0 conflict phyusin 2018-04-11 18:01:46 +06:30
  • ba06be7822 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-04-11 17:59:48 +06:30
  • a0fca242d4 add sale id in order reservations phyusin 2018-04-11 17:59:37 +06:30
  • b11480a90c Add Total Customer San Wai Lwin 2018-04-11 17:53:57 +06:30
  • 6889c879ec Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-04-11 17:20:29 +06:30
  • b730c78afe doemal or other api token added Yan 2018-04-11 17:20:17 +06:30
  • 0413d56a83 add paymal and dinga with account no phyusin 2018-04-11 16:18:42 +06:30
  • f159673c60 Remove Discount button in cashier of waiter role San Wai Lwin 2018-04-11 14:47:50 +06:30
  • 8261a3453a remove # in action controller phyusin 2018-04-11 14:40:28 +06:30
  • 98bd0073c1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-04-11 14:38:29 +06:30
  • 9b2312d3ba change ordr reservation api phyusin 2018-04-11 14:38:16 +06:30
  • 53388248e9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-04-11 13:15:09 +06:30
  • 5801a48f4b cannot add action_cntr in ignore Yan 2018-04-11 11:49:36 +06:30
  • 5e2d8a6d3a add action_cntr in ignore Yan 2018-04-11 11:37:43 +06:30
  • fc91fe51af add action_cntr in ignore Yan 2018-04-11 11:36:34 +06:30
  • b2d302b846 add action_cntr in ignore Yan 2018-04-11 11:36:26 +06:30
  • ace2853cf4 add config/initializer/* in ignore Yan 2018-04-11 11:30:34 +06:30
  • 04ae741462 cloud for api and doemal Yan 2018-04-11 11:27:05 +06:30
  • 8b2f36fbc5 Docker Setup Julian 2018-04-11 11:24:34 +06:30
  • 27e70f1a86 modify api and change rounding adj phyusin 2018-04-11 10:28:33 +06:30
  • 590ee16aa4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-04-11 09:34:23 +06:30
  • 5b0e1ce040 add qr codeဓ phyusin 2018-04-11 09:34:08 +06:30
  • 41d897d5c2 Edit Move Table Pdf San Wai Lwin 2018-04-10 18:18:08 +06:30