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

Commit Graph

  • f746c18238 (important)migrateion files changed Yan 2017-06-07 18:47:50 +06:30
  • 6cc2e29e30 For pull Moe Su 2017-06-07 18:13:12 +06:30
  • e2ecfaeaad For pull Moe Su 2017-06-07 18:11:03 +06:30
  • be7d448c30 update gem file Yan 2017-06-07 18:09:56 +06:30
  • a601cf6d75 editing migration Yan 2017-06-07 18:08:44 +06:30
  • df138d94ba merged master Yan 2017-06-07 17:45:40 +06:30
  • bd345dbc3f fixed conflict Aung Myo 2017-06-07 17:15:51 +06:30
  • 5264f9cf14 Paypar payment Moe Su 2017-06-07 17:14:22 +06:30
  • fd1c53432c account model updated Aung Myo 2017-06-07 17:13:27 +06:30
  • 114c4ee14d all changed for index in origami Yan 2017-06-07 17:13:27 +06:30
  • 9ad04323f0 fixed conflict request_bill_con and origami index Aung Myo 2017-06-07 16:48:28 +06:30
  • 387ffa996b finished customer and join membership in crm Aung Myo 2017-06-07 16:38:24 +06:30
  • 4323da6589 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-07 14:45:22 +06:30
  • 810a6d8afc update sale_payment database Nweni 2017-06-07 14:45:03 +06:30
  • 9a23716c23 others payment Nweni 2017-06-07 13:02:12 +06:30
  • ad5d41768d Fix conflict PhyoTheingi 2017-06-07 11:02:53 +06:30
  • 608cd5bb21 update seed PhyoTheingi 2017-06-07 10:53:15 +06:30
  • 52cc294696 merge with master PhyoTheingi 2017-06-07 10:33:30 +06:30
  • c18b57eca8 payment Nweni 2017-06-07 10:29:00 +06:30
  • 4afb630b95 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant Min Zeya Phyo 2017-06-06 21:39:13 +06:30
  • 9e3eaaf214 finished Customer save and return data from membership in crm Aung Myo 2017-06-06 18:07:38 +06:30
  • 59434e2c3a Menu item with Accout PhyoTheingi 2017-06-06 17:29:34 +06:30
  • ed45c2dc1e merged for payment Yan 2017-06-06 17:03:47 +06:30
  • fbf312f71c change show to print method in req bills controller Yan 2017-06-06 17:01:15 +06:30
  • 50185bc376 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty Moe Su 2017-06-06 16:53:12 +06:30
  • 1c5c5e194c added sale order Nweni 2017-06-06 16:47:43 +06:30
  • c482318b1a req bill bugs fixing Yan 2017-06-06 16:37:42 +06:30
  • 12cdf65a06 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty Moe Su 2017-06-06 16:19:55 +06:30
  • 2318d83adf update Nweni 2017-06-06 16:19:14 +06:30
  • 3c756949d1 payment Nweni 2017-06-06 15:32:24 +06:30
  • 8fd23bfd87 conflict file Aung Myo 2017-06-06 14:49:25 +06:30
  • e76296bb77 checkout crm Aung Myo 2017-06-06 14:44:25 +06:30
  • d28449a9c9 updated for bill print Yan 2017-06-06 14:34:24 +06:30
  • 2abc2e5f3d Assign Order Item Bug ix PhyoTheingi 2017-06-06 14:33:14 +06:30
  • d2ce74f648 bootstrap datepicker and customer save Aung Myo 2017-06-06 14:16:40 +06:30
  • 802ff02fb4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty Moe Su 2017-06-06 14:05:37 +06:30
  • b847cde62c sale query updated Nweni 2017-06-06 14:03:21 +06:30
  • 48d1c60703 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant Min Zeya Phyo 2017-06-06 12:05:06 +06:30
  • 8c47371fa7 seed generator Min Zeya Phyo 2017-06-06 12:04:56 +06:30
  • c2952c4600 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-06 11:08:51 +06:30
  • c461cb94f2 fixed Nweni 2017-06-06 11:08:43 +06:30
  • 0a62b46253 For Pull Moe Su 2017-06-06 10:56:28 +06:30
  • 231eec6a01 Payment delete bug fix PhyoTheingi 2017-06-06 10:50:51 +06:30
  • 7ccc50b7ed For Pull Moe Su 2017-06-06 10:34:13 +06:30
  • dcb8217824 updated order.rb for order_items_id Yan 2017-06-06 10:32:38 +06:30
  • e66dd33c1a updated order.rb Yan 2017-06-06 10:27:59 +06:30
  • bb68063f33 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-06 10:26:56 +06:30
  • 187a050c19 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-06 10:26:01 +06:30
  • 038a3c1696 oqs print query update Yan 2017-06-06 10:25:14 +06:30
  • 820b1d5e96 update query in order queue printer Yan 2017-06-06 10:19:15 +06:30
  • 324f1e3b24 update query in order model for origami Aung Myo 2017-06-06 10:10:47 +06:30
  • fa0b434888 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2017-06-06 10:01:36 +06:30
  • 792001a5f3 fixed conflict gem and gemfile lock Aung Myo 2017-06-06 10:01:21 +06:30
  • eaec6a39b4 fixed conflict Nweni 2017-06-06 09:47:33 +06:30
  • 6ecf791673 update coutomer controller Aung Myo 2017-06-06 09:47:24 +06:30
  • 0cc378f318 fixed conflict Nweni 2017-06-06 09:43:16 +06:30
  • 64f5dd65bd merged settings_backend Yan 2017-06-06 09:42:53 +06:30
  • b24e667e9e merged crm Yan 2017-06-06 09:41:06 +06:30
  • b54a19cfff update query data for origami Aung Myo 2017-06-06 09:18:01 +06:30
  • d9f7b391ec del puts line in oqs Yan 2017-06-05 18:54:17 +06:30
  • f1877408be fixed for pm key changed Yan 2017-06-05 18:52:19 +06:30
  • 7b457400b2 Delete Fix for parent child process in Menu PhyoTheingi 2017-06-05 18:31:56 +06:30
  • faca7295f7 added new image upload file Nweni 2017-06-05 17:14:07 +06:30
  • 68e51c98c3 update origamitable,room query Aung Myo 2017-06-05 15:07:44 +06:30
  • f004db9b19 updated migration code Yan 2017-06-05 15:06:34 +06:30
  • b332d6a525 postfix length 16 to 12 for limit 16 Yan 2017-06-05 13:37:07 +06:30
  • b528da3d9b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs Yan 2017-06-05 13:29:01 +06:30
  • 1dbe133b79 update for db changed Yan 2017-06-05 13:28:40 +06:30
  • c4e6f917f4 modified in order model Yan 2017-06-05 10:22:12 +06:30
  • 42ba2d9ae4 comment the conflict in creating menu item instances with account and item attribute validate PhyoTheingi 2017-06-05 10:00:32 +06:30
  • 9b90e3bd7e pulled master at 4 Yan 2017-06-04 18:29:58 +06:30
  • 8d4086d5e9 oqs printing Yan 2017-06-04 18:25:09 +06:30
  • e309b35669 fixed conflictsale item order order item Aung Myo 2017-06-04 16:51:38 +06:30
  • d058b1b1b8 fixed conflict gem Aung Myo 2017-06-04 16:42:18 +06:30
  • eb74eb2a2d Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant Min Zeya Phyo 2017-06-04 16:37:13 +06:30
  • ad44d9d0e3 move login_from from model folder to form folder Min Zeya Phyo 2017-06-04 16:28:29 +06:30
  • 4fc511d531 custom primary key for transaction Min Zeya Phyo 2017-06-04 16:27:14 +06:30
  • af02a63263 fixed conflict request_bill and order model Aung Myo 2017-06-04 16:25:25 +06:30
  • 3679fe10b8 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-04 16:15:02 +06:30
  • 9b334a20fa fixed receipt bill print view Aung Myo 2017-06-04 16:13:15 +06:30
  • e3f9d62bce Sale Save Cherry 2017-06-04 16:02:55 +06:30
  • db904739ac setting update Nweni 2017-06-04 15:55:06 +06:30
  • 743b978c44 update Nweni 2017-06-04 15:52:29 +06:30
  • 9624d4df3e update Nweni 2017-06-04 15:47:03 +06:30
  • 9bb7eb7f17 fixed Nweni 2017-06-04 15:36:38 +06:30
  • dd2b0dc8b3 updated Nweni 2017-06-04 15:35:46 +06:30
  • 17c687b6f8 gemfile Nweni 2017-06-04 15:33:35 +06:30
  • 69d188d4c1 .. Nweni 2017-06-04 15:28:48 +06:30
  • b1691eb9f8 fixed conflict Nweni 2017-06-04 14:51:31 +06:30
  • 46f9bef246 fixed conflict Nweni 2017-06-04 14:50:50 +06:30
  • f5b6445a21 update Nweni 2017-06-04 14:46:00 +06:30
  • aa295c3a12 fixed conflict Nweni 2017-06-04 13:12:02 +06:30
  • 869c574107 comment pg in gem Yan 2017-06-04 11:34:59 +06:30
  • 89cbb59e7c fixed conflcit Nweni 2017-06-04 10:33:24 +06:30
  • fa34d1db8f fixed conflict Nweni 2017-06-04 10:23:38 +06:30
  • 3161c87a95 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant into settings_backend Nweni 2017-06-04 10:21:54 +06:30
  • e5e14aaa62 fixed conflict Nweni 2017-06-04 10:19:35 +06:30
  • 3ab3fa71a8 fixed conflict Nweni 2017-06-04 10:16:23 +06:30
  • e3e41bd64e Update Nweni 2017-06-04 10:12:33 +06:30
  • 394d2ed938 change transactional primary key to custom ID for better portability Min Zeya Phyo 2017-06-03 19:12:35 +06:30