Commit Graph

  • 137267514b bundle gemlock Min Zeya Phyo 2017-06-12 07:21:09 +06:30
  • 0943808ac8 finished order and sales in setting Aung Myo 2017-06-12 00:45:59 +06:30
  • f834911587 to do req_bill_format and status changed after pay Yan 2017-06-12 00:45:26 +06:30
  • eb001275c7 fixed conflict Aung Myo 2017-06-11 18:09:00 +06:30
  • d65882ac5b crm update Aung Myo 2017-06-11 18:00:34 +06:30
  • 6d4ef8e2ad Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-11 17:49:17 +06:30
  • fc3893f048 payment Nweni 2017-06-11 17:49:06 +06:30
  • 7ac89829d1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Moe Su 2017-06-11 17:40:53 +06:30
  • 7341657477 redeem process Moe Su 2017-06-11 17:40:44 +06:30
  • f6d14de461 fixed conflict Nweni 2017-06-11 16:58:18 +06:30
  • 05286ce7a6 payment Nweni 2017-06-11 16:57:31 +06:30
  • 60b1819220 Generating seed Moe Su 2017-06-11 16:47:22 +06:30
  • fe2a07bf5f Redeem process Moe Su 2017-06-11 16:17:50 +06:30
  • ee197dba05 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty Moe Su 2017-06-11 16:12:23 +06:30
  • 29cdcfb28d For Pull Moe Su 2017-06-11 16:11:44 +06:30
  • a809818324 other payment Nweni 2017-06-11 16:10:50 +06:30
  • 31cc75462b fixed conflict Nweni 2017-06-11 15:52:13 +06:30
  • b7bd68a461 payment keypad Nweni 2017-06-11 15:51:22 +06:30
  • 0e7ed4bc1a edit membership setting , otherpayment page Moe Su 2017-06-11 15:50:31 +06:30
  • 33cc576f1e edit membership setting , otherpayment page Moe Su 2017-06-11 15:48:53 +06:30
  • 596c16d274 edit redeem Moe Su 2017-06-11 14:09:19 +06:30
  • 1d24099abc For Pull Moe Su 2017-06-11 13:58:34 +06:30
  • d49dc3f8c8 change route Moe Su 2017-06-11 13:55:14 +06:30
  • 7ab9874b80 remove migration files Nweni 2017-06-11 13:20:26 +06:30
  • aa8068ad10 Update Nweni 2017-06-11 13:02:03 +06:30
  • 9f9c83ab7f pay par payment Moe Su 2017-06-11 13:01:03 +06:30
  • 518e15f5d1 update crm Yan 2017-06-09 13:54:39 +06:30
  • 82de95ca22 update Nweni 2017-06-09 13:52:36 +06:30
  • 4c29aad299 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-09 13:47:19 +06:30
  • a100d742e6 add crm order printer in seed Yan 2017-06-09 13:47:00 +06:30
  • 0b04e2d4ef add base report controller Yan 2017-06-09 13:35:41 +06:30
  • d2373f2f24 origami updating Yan 2017-06-09 13:35:15 +06:30
  • 8b99f4844e bill api return updated Nweni 2017-06-09 13:33:12 +06:30
  • 9c228dce5c update view crm Aung Myo 2017-06-09 13:26:47 +06:30
  • 5d89713bb6 crm print update Aung Myo 2017-06-09 13:24:20 +06:30
  • 9dd96c7187 fixed conflict Nweni 2017-06-09 13:13:54 +06:30
  • 56ffd1f063 update sale order talble Nweni 2017-06-09 13:13:20 +06:30
  • 18a6b7f297 add base report controller Yan 2017-06-09 12:31:05 +06:30
  • 406172c6ff fixed conflict Aung Myo 2017-06-09 12:04:36 +06:30
  • ba9ebe12de update customer Aung Myo 2017-06-09 12:00:46 +06:30
  • e7a1687b85 update top menu bar for report Yan 2017-06-09 11:59:08 +06:30
  • e969249e48 Merge branch 'report' Yan 2017-06-09 11:57:15 +06:30
  • 367a8694b1 update payment Yan 2017-06-09 11:57:05 +06:30
  • e2e8045d0f update crm layout Aung Myo 2017-06-09 11:55:50 +06:30
  • fe60ac818f update assets Yan 2017-06-09 11:33:21 +06:30
  • 6171b00dc7 cash payment complete Nweni 2017-06-09 11:25:30 +06:30
  • 9771ed2019 add report in menu Yan 2017-06-09 11:03:14 +06:30
  • 35553217f5 fixed conflict Nweni 2017-06-09 10:58:40 +06:30
  • 56a6d84abe Update Nweni 2017-06-09 10:57:16 +06:30
  • 54ef701482 updated miss origami css and js filename Yan 2017-06-09 10:36:07 +06:30
  • 39c20b221e updated miss origami css and js filename Yan 2017-06-09 10:35:19 +06:30
  • 1d472aa2e1 add req bill seed Yan 2017-06-09 10:26:06 +06:30
  • 015222b575 changed orgirami to origami Yan 2017-06-09 10:22:55 +06:30
  • ba4ec71ec9 updated origami js Yan 2017-06-09 10:21:30 +06:30
  • 35277ac000 queue and crm view updated Aung Myo 2017-06-09 09:29:25 +06:30
  • 5f5e6470c7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty Moe Su 2017-06-09 02:40:48 +06:30
  • c23f726cb3 redeem process Moe Su 2017-06-09 02:40:35 +06:30
  • 7702c50675 Add membership action Moe Su 2017-06-09 02:23:16 +06:30
  • 75c8936eff updated default who changed oqs in queue job Yan 2017-06-08 19:26:47 +06:30
  • 43e89cefda re-add account migration Yan 2017-06-08 19:12:11 +06:30
  • 42a29296c7 update gem Yan 2017-06-08 19:07:20 +06:30
  • c11b4b7fe0 Merge branch 'loyalty' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-08 19:05:46 +06:30
  • 43debf4b7e merged with crm Yan 2017-06-08 19:04:48 +06:30
  • 1cbbe9d672 Merge branch 'discount' Yan 2017-06-08 18:58:28 +06:30
  • 71e09ef452 comment for cable and add print seed Yan 2017-06-08 18:57:53 +06:30
  • 451804366c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty Moe Su 2017-06-08 18:22:27 +06:30
  • 54e14e02f4 Add payment method Moe Su 2017-06-08 18:22:19 +06:30
  • 5c5c0dba33 update gem Yan 2017-06-08 18:08:34 +06:30
  • 568c5fbf68 Merge branch 'loyalty' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-08 18:03:59 +06:30
  • 907764b3e4 update discount Yan 2017-06-08 18:02:40 +06:30
  • 0bcd612bc2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty Moe Su 2017-06-08 17:57:43 +06:30
  • 74b0550c30 payment_setting Moe Su 2017-06-08 17:57:29 +06:30
  • ea4f50e779 update print Aung Myo 2017-06-08 16:52:50 +06:30
  • 395250fd47 delete duplicate account migration Yan 2017-06-08 15:48:22 +06:30
  • e0e512b76b editing discount Yan 2017-06-08 15:40:59 +06:30
  • 5203a9f4a5 merge crm Yan 2017-06-08 15:29:37 +06:30
  • fbc00bc3e4 merged loyalty Yan 2017-06-08 15:28:09 +06:30
  • e516e653d2 update menu_items migrate Yan 2017-06-08 15:24:59 +06:30
  • 9866acf198 editing discout Yan 2017-06-08 15:21:53 +06:30
  • b57e24c076 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty Moe Su 2017-06-08 15:17:45 +06:30
  • 664fe2f6e1 Adding Redeem at payment Moe Su 2017-06-08 15:17:26 +06:30
  • 26598e2731 for origami view file Aung Myo 2017-06-08 14:57:01 +06:30
  • 8388192a81 delete view origami file Aung Myo 2017-06-08 14:46:35 +06:30
  • 387650656f commit gemlock Aung Myo 2017-06-08 13:57:56 +06:30
  • e3dea08306 commit checkout Aung Myo 2017-06-08 13:54:05 +06:30
  • 5768a0db6f fixed conflict file Aung Myo 2017-06-08 13:49:30 +06:30
  • 8a5fcadb69 finished customer to sale assign in crm Aung Myo 2017-06-08 13:41:11 +06:30
  • c7aac7c2b8 update gem Yan 2017-06-08 10:51:30 +06:30
  • 612f037fe8 index ui for discount Yan 2017-06-08 10:40:06 +06:30
  • d6a455b135 fixed conflict Nweni 2017-06-08 09:57:33 +06:30
  • 3cf00faab8 Update Nweni 2017-06-08 09:56:13 +06:30
  • 26f2dce142 For Pull Moe Su 2017-06-08 09:53:04 +06:30
  • 06ccdac0c2 Merge branch 'discount' Yan 2017-06-08 09:49:58 +06:30
  • 4d4c40cc17 a little change for setup Yan 2017-06-08 09:48:24 +06:30
  • 30552eec17 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant Min Zeya Phyo 2017-06-08 01:32:59 +06:30
  • 7f8d3381b2 fixed conflict order Aung Myo 2017-06-07 22:31:49 +06:30
  • 44382d284f fixed conflict Aung Myo 2017-06-07 22:29:43 +06:30
  • f9c8dbc03e fixed conflict route and request bill Aung Myo 2017-06-07 22:21:42 +06:30
  • 234ef9bc15 change crm booking Aung Myo 2017-06-07 22:17:12 +06:30
  • b395e2e6f1 updated seed for customer Yan 2017-06-07 19:10:57 +06:30