Commit Graph

  • 464e72012b waiter and cashier in api/bill_controller Yan 2017-06-27 15:26:02 +06:30
  • 945963362a update queue migration Aung Myo 2017-06-27 15:25:13 +06:30
  • ff2844124e update utc Aung Myo 2017-06-27 15:10:42 +06:30
  • f762664912 update bill Aung Myo 2017-06-27 14:16:48 +06:30
  • bce4380d70 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Zin Lin Phyo 2017-06-27 14:04:41 +06:30
  • 1c65a38b70 fix conflit Zin Lin Phyo 2017-06-27 14:04:29 +06:30
  • c6f482da83 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-27 14:02:54 +06:30
  • df722de0e7 billed Nweni 2017-06-27 14:02:44 +06:30
  • 873f847a67 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-27 12:11:17 +06:30
  • e85f22fb79 update for bill superuser 2017-06-27 12:11:07 +06:30
  • def8ce34c2 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-27 12:07:35 +06:30
  • 697bacf200 rake task Phyo 2017-06-27 12:06:39 +06:30
  • 7810fc693b Pending Payment Phyo 2017-06-27 12:06:18 +06:30
  • f8062cec64 Credit payment Phyo 2017-06-27 12:05:45 +06:30
  • 9f44ac0031 update page height bill pdf Yan 2017-06-27 12:03:17 +06:30
  • 4f78c63b63 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-27 11:53:46 +06:30
  • e38886790c not show price 0 fixed Yan 2017-06-27 11:52:51 +06:30
  • 8d8f7b9093 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Zin Lin Phyo 2017-06-27 11:35:48 +06:30
  • bcd44db9a2 multiple invoice void Zin Lin Phyo 2017-06-27 11:35:36 +06:30
  • b5518c2ddb rake task fix Phyo 2017-06-27 11:35:10 +06:30
  • 2f8c6e25a1 Shop View Phyo 2017-06-27 11:33:03 +06:30
  • 37da55610f Shop View Phyo 2017-06-27 11:32:10 +06:30
  • 463e8e5875 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-27 10:28:58 +06:30
  • 535a5825fb get update Nweni 2017-06-27 10:28:47 +06:30
  • 08e98409a5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-27 10:16:28 +06:30
  • e09dbb095c not to show price 0 and 10 Yan 2017-06-27 10:15:22 +06:30
  • c1646b812e route update Min Zeya Phyo 2017-06-27 01:15:40 +06:30
  • 4c13be257b update authroize Aung Myo 2017-06-26 22:45:34 +06:30
  • 1ea9125f80 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant Min Zeya Phyo 2017-06-26 21:57:55 +06:30
  • b607154037 New Login form Min Zeya Phyo 2017-06-26 21:56:13 +06:30
  • c743fac296 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-26 20:59:45 +06:30
  • 1023f4348a Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-26 20:58:32 +06:30
  • a236c94910 mobile bill updated Yan 2017-06-26 20:58:12 +06:30
  • 25967b82d3 update home link Aung Myo 2017-06-26 20:44:15 +06:30
  • c6906ba293 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-26 20:31:55 +06:30
  • 9a5656c5e6 update crm customer Aung Myo 2017-06-26 20:13:56 +06:30
  • 9fa6ad920e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-26 20:02:39 +06:30
  • 0726af072e update cancan Aung Myo 2017-06-26 19:49:02 +06:30
  • 75dd4db10f update seed Aung Myo 2017-06-26 19:33:29 +06:30
  • 6f741e0a0c Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-26 19:28:21 +06:30
  • 99ac82c888 update seed for shop and oqs Yan 2017-06-26 19:28:02 +06:30
  • 60fe3b9a67 update crmad ability Aung Myo 2017-06-26 19:22:16 +06:30
  • 376af85c64 update credit Aung Myo 2017-06-26 19:02:36 +06:30
  • 6afec4a482 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-26 18:52:25 +06:30
  • 79befa4876 rake task fix Phyo 2017-06-26 18:49:41 +06:30
  • ef8f280d0e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-26 18:46:16 +06:30
  • 034c9932a6 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-26 18:45:55 +06:30
  • cb77c771b8 oqs update Yan 2017-06-26 18:45:20 +06:30
  • f3417a61c0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-26 18:16:03 +06:30
  • 1000968a8f update Aung Myo 2017-06-26 18:14:36 +06:30
  • 9d76e1313a overall void update Zin Lin Phyo 2017-06-26 18:13:43 +06:30
  • 5489da2066 route conflit fix Zin Lin Phyo 2017-06-26 18:02:08 +06:30
  • feb1d66257 overall void Zin Lin Phyo 2017-06-26 18:00:48 +06:30
  • 02e3ebefda update receipt Aung Myo 2017-06-26 17:56:31 +06:30
  • 089848ed4a credit note payment Nweni 2017-06-26 17:49:55 +06:30
  • e878275c1b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-26 17:10:25 +06:30
  • d4983fabf5 item void Nweni 2017-06-26 17:07:17 +06:30
  • adf06cf6f5 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-26 17:02:25 +06:30
  • c81663003f update in discount Yan 2017-06-26 17:01:25 +06:30
  • 6e77a71946 update customer seed shop and receipt bill Aung Myo 2017-06-26 16:50:04 +06:30
  • d3dc2e2dd8 remove pg in gem Yan 2017-06-26 16:39:55 +06:30
  • 4e5ca54eee Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-26 16:38:15 +06:30
  • 0c2e299ced Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-26 16:37:02 +06:30
  • 04e44c4859 fixed conflict Nweni 2017-06-26 16:35:24 +06:30
  • 20afabd86d item void Nweni 2017-06-26 16:34:03 +06:30
  • f60b3d554a add table and order no in oqs Yan 2017-06-26 16:23:00 +06:30
  • 1d96eb1d48 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-26 15:38:31 +06:30
  • 813f2ecf2d merge with settings_backend Yan 2017-06-26 14:46:31 +06:30
  • 46ad87314a Add color blue to orders Phyo 2017-06-26 14:39:25 +06:30
  • cc67abcfc1 add time in oqs Yan 2017-06-26 14:35:44 +06:30
  • e1c981e8c2 merge with crm Yan 2017-06-26 14:23:56 +06:30
  • 00c19fdd67 sub total fixed in origami shows Yan 2017-06-26 14:16:22 +06:30
  • f878b2f1d8 Accounts disable Bonus and discount Phyo 2017-06-26 13:53:54 +06:30
  • 3b71cb1d30 uncomment pg @ gem Nweni 2017-06-26 13:52:43 +06:30
  • cb2124c6a6 refresh 10 sec Phyo 2017-06-26 12:57:36 +06:30
  • a05fc0f646 Up to Amount bug fix Phyo 2017-06-26 12:55:44 +06:30
  • 5017549f86 Merge branch 'master' into settings_backend Phyo 2017-06-26 11:13:06 +06:30
  • 6e49f91b89 Multiple Invoices Phase 1 Phyo 2017-06-26 11:10:49 +06:30
  • 12483aba97 update crm customer Aung Myo 2017-06-26 11:10:08 +06:30
  • f426be57ab update crm Aung Myo 2017-06-26 10:21:56 +06:30
  • ecc9ab53ec Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-26 09:59:16 +06:30
  • 560ea343a6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-26 09:55:56 +06:30
  • 69f24101f9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-26 06:28:23 +06:30
  • c65c466399 edit Nweni 2017-06-26 06:28:09 +06:30
  • a91816bb4e qty edit in oqs Yan 2017-06-25 22:41:26 +06:30
  • d9c53e73f8 update customer Aung Myo 2017-06-24 11:12:30 +06:30
  • 7263a65da9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-23 21:45:34 +06:30
  • 4958cb6872 Merge branch 'master' into settings_backend Phyo 2017-06-23 19:22:20 +06:30
  • 30df25d78a Merge branch 'master' into oqs Yan 2017-06-23 19:22:07 +06:30
  • 1f6a0eb1f6 fix with merge Yan 2017-06-23 19:20:00 +06:30
  • 9ed6b510c4 updating oqs Yan 2017-06-23 19:01:33 +06:30
  • e9fb90d8a0 updating oqs Yan 2017-06-23 19:00:49 +06:30
  • ecabed5d5d Account type change Phyo 2017-06-23 18:45:46 +06:30
  • 05b4dbac7c Rebate Redeem add field Phyo 2017-06-23 18:45:15 +06:30
  • 4dbc9b6134 :q Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-23 18:00:18 +06:30
  • 6a6c629da4 update cancan alert message Aung Myo 2017-06-23 17:56:09 +06:30
  • e01ecc6e0f merge origin master Yan 2017-06-23 17:53:53 +06:30
  • a996ccc7ee Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-23 17:51:46 +06:30
  • 27ff8b89e7 merge with crm Yan 2017-06-23 17:51:09 +06:30
  • 81c50f220a edit invoice Nweni 2017-06-23 17:37:08 +06:30