Commit Graph

  • ba1ad69181 acable test Yan 2018-05-18 14:58:51 +06:30
  • b1449d8d35 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-05-18 14:38:48 +06:30
  • 0d2f609b07 ac test Yan 2018-05-18 14:38:31 +06:30
  • b2c66f3a92 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 Aung Myo 2018-05-18 13:06:50 +06:30
  • e120a32307 Merge branch 'adminbsb_material_ui' Aung Myo 2018-05-18 12:26:44 +06:30
  • 0b7834ff29 update pay process order Aung Myo 2018-05-18 12:25:47 +06:30
  • 9c26e63110 update menu asc with name Aung Myo 2018-05-18 11:57:20 +06:30
  • 39e7269fc1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-05-18 11:15:52 +06:30
  • 1e38ebcd51 update cable Yan 2018-05-18 11:15:25 +06:30
  • f5604d8c9c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-18 09:49:50 +06:30
  • fa160c8292 Pull from master San Wai Lwin 2018-05-18 09:49:47 +06:30
  • fbb80c3f01 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-05-17 17:53:29 +06:30
  • 679d3f838c Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-17 17:52:49 +06:30
  • e609e33246 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-17 17:52:14 +06:30
  • 6890b3a01e check report and change alert for order reservation phyusin 2018-05-17 17:51:47 +06:30
  • fb5cfc9bd7 Merge branch 'adminbsb_material_ui' Aung Myo 2018-05-17 17:02:04 +06:30
  • a3f7e21120 update touch start in print Aung Myo 2018-05-17 17:01:18 +06:30
  • a276646a03 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-17 16:42:16 +06:30
  • 3838ee29e0 change func: for receipt bill phyusin 2018-05-17 16:39:59 +06:30
  • cf4978fca0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-05-17 14:12:37 +06:30
  • 1c366839db Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-17 14:09:10 +06:30
  • 34fd712f5e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-17 14:08:25 +06:30
  • aede22e976 check rounding adj in all_void phyusin 2018-05-17 14:07:19 +06:30
  • 45d50180a1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-05-17 11:46:37 +06:30
  • 7b97135645 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-17 11:43:38 +06:30
  • 234ab26644 check survey issue phyusin 2018-05-17 11:43:04 +06:30
  • 01a545b9ec Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-05-17 11:23:23 +06:30
  • b44d2845ef Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-17 11:22:38 +06:30
  • b7c65dd0ca Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-17 11:22:01 +06:30
  • 62dec82bd8 change dailysale report and check tax in add to existing phyusin 2018-05-17 11:21:38 +06:30
  • 3dc2863c4f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 Aung Myo 2018-05-17 10:44:37 +06:30
  • 942380afff update discount with junctionpay Aung Myo 2018-05-17 10:40:29 +06:30
  • 9dc6aa289c Edit in Survey form javascript San Wai Lwin 2018-05-17 10:16:04 +06:30
  • e5ea6a90e8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-05-17 09:29:41 +06:30
  • ca360c75d6 update cash in and out for quick service Aung Myo 2018-05-16 18:01:47 +06:30
  • 02ff79a68c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-05-16 17:16:23 +06:30
  • 95e94bd0fd Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-16 17:15:43 +06:30
  • dc23df673f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-16 17:15:17 +06:30
  • fa4c5d075e check menu is_available, survey id and check status with sale items SUM in receipBill phyusin 2018-05-16 17:08:00 +06:30
  • c386fcfa03 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 Aung Myo 2018-05-16 14:23:36 +06:30
  • 29434f2df9 update void paymal search Aung Myo 2018-05-16 14:20:20 +06:30
  • 95faa6fdb4 update edit controller for update qty without assigne items Aung Myo 2018-05-16 13:54:14 +06:30
  • 695461d2c5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-05-16 13:18:04 +06:30
  • 800ea01f23 bugs fixed Aung Myo 2018-05-16 13:17:52 +06:30
  • 40b27e8d8d Pull from master San Wai Lwin 2018-05-16 10:30:29 +06:30
  • 33d5a0ad80 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-05-16 09:57:44 +06:30
  • e679160e41 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-16 09:53:42 +06:30
  • 486694a5e4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-16 09:50:57 +06:30
  • d6a3c949f0 comment remark for order reservation phyusin 2018-05-16 09:49:49 +06:30
  • 7c72d4b9a8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-05-16 09:23:33 +06:30
  • c08c72d0cb update cash in and out for shift Aung Myo 2018-05-16 09:23:10 +06:30
  • 086ddd2ab5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-05-15 18:31:55 +06:30
  • 0a290d47d8 check customer back url phyusin 2018-05-15 18:30:13 +06:30
  • a72ae34a46 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-15 17:36:05 +06:30
  • de05c4423a check unclose shift in filter phyusin 2018-05-15 17:35:10 +06:30
  • 1eb6cd5bcf Merge branch 'adminbsb_material_ui' Aung Myo 2018-05-15 17:29:35 +06:30
  • 0680fa4090 update daily sale and receipt report Aung Myo 2018-05-15 17:28:47 +06:30
  • e09fab1fed update migrate for checksum Aung Myo 2018-05-15 14:41:24 +06:30
  • 9e6ac7811a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-05-15 13:19:52 +06:30
  • 8acfe654eb update menu imp/exp Yan 2018-05-15 13:19:27 +06:30
  • c7a33e5322 update menu imp/exp Yan 2018-05-15 11:53:48 +06:30
  • e2206508a7 open action controller Aung Myo 2018-05-15 11:27:49 +06:30
  • dd5b0a76c5 Merge branch 'adminbsb_material_ui' Aung Myo 2018-05-15 11:26:51 +06:30
  • 835f4aded1 added product sale for sale item report Aung Myo 2018-05-15 11:25:10 +06:30
  • eaa013c10f change status to doemal phyusin 2018-05-15 10:28:05 +06:30
  • 6b3c5e5fcf Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-15 09:58:13 +06:30
  • e6883fbf5f Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-14 18:15:13 +06:30
  • 188976d2bf Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-14 18:14:45 +06:30
  • af9efb5fa0 hide popup modal in order reservation phyusin 2018-05-14 18:14:23 +06:30
  • 3d99082f2a update conflict payment detail Aung Myo 2018-05-14 17:37:48 +06:30
  • 08a7c700d7 Merge branch 'r-1804001-01' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 Aung Myo 2018-05-14 17:34:40 +06:30
  • 7d1498931c update payment detail Aung Myo 2018-05-14 17:30:15 +06:30
  • 32b81bf16f Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 Aung Myo 2018-05-14 17:27:52 +06:30
  • 763991ed93 update payment detail Aung Myo 2018-05-14 17:27:37 +06:30
  • 185ba2eaed Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 phyusin 2018-05-14 17:05:23 +06:30
  • 522ccae378 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-14 16:39:24 +06:30
  • c86696c2c9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-14 16:38:59 +06:30
  • cef2249214 change modal close function phyusin 2018-05-14 16:38:40 +06:30
  • 25d3f335a0 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-14 16:01:09 +06:30
  • 916dbf2cd3 Pull from master San Wai Lwin 2018-05-14 16:00:31 +06:30
  • 6004b894ec Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-14 16:00:27 +06:30
  • 5101d7c103 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-14 15:59:03 +06:30
  • 11bae95ac6 Edit Jcb and master in ShiftSale San Wai Lwin 2018-05-14 15:58:02 +06:30
  • 25a138e27e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-05-14 15:54:32 +06:30
  • d80a17d987 update payment detal for discount Aung Myo 2018-05-14 15:54:22 +06:30
  • 83a068f1a3 change waste to spoile in close cashier phyusin 2018-05-14 15:53:22 +06:30
  • 5ddfad7ef8 conflict data remove phyusin 2018-05-14 15:46:34 +06:30
  • 39dce3424e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-14 15:42:35 +06:30
  • 1c8ea30efa change popup ui phyusin 2018-05-14 15:42:11 +06:30
  • 8fda04372d Add total waste and spoil in close cashier and Closing Balance မွာ Character ေတြ ရိုက္လို႕ရေန San Wai Lwin 2018-05-14 15:31:00 +06:30
  • e264e7a32b update addorder js and css Aung Myo 2018-05-14 15:23:15 +06:30
  • 57c9cd4d6f updaate loading menu cache Aung Myo 2018-05-14 14:49:21 +06:30
  • fdf4c6b95e Merge branch 'adminbsb_material_ui' Aung Myo 2018-05-14 13:35:20 +06:30
  • 0b104b021b update add ordr Aung Myo 2018-05-14 13:34:14 +06:30
  • 568a94182a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2018-05-14 11:47:31 +06:30
  • 3c1ed265f5 update menu import export Yan 2018-05-14 11:47:06 +06:30
  • 49319d80cc Pull from master San Wai Lwin 2018-05-14 11:38:39 +06:30
  • aeba71b646 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-14 11:35:20 +06:30
  • cc0178eb65 check code in mp3 file phyusin 2018-05-14 11:34:33 +06:30
  • 4baff5918c update addorder sale item xls Aung Myo 2018-05-14 10:50:04 +06:30