Commit Graph

  • 3db3b8c7e7 add auth_token Moe Su 2017-06-13 19:01:14 +06:30
  • 9ae4c13f87 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-13 18:55:31 +06:30
  • c6ee0e9d25 update seed Nweni 2017-06-13 18:55:20 +06:30
  • 77a41eb9dc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2017-06-13 18:47:56 +06:30
  • 8a6c0bf059 update rebate amount in payment Aung Myo 2017-06-13 18:46:43 +06:30
  • 39e9c5419a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-13 18:37:24 +06:30
  • 0d5767b022 Update Nweni 2017-06-13 18:37:14 +06:30
  • a600c233d5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-13 18:28:40 +06:30
  • 7f7d579d2f add auth token: exit Aung Myo 2017-06-13 18:28:22 +06:30
  • 974ed6a908 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Moe Su 2017-06-13 17:42:05 +06:30
  • 19160a9630 Change redeem name Moe Su 2017-06-13 17:41:50 +06:30
  • 8a7c1f0d88 Payment Vs Tax Phyo 2017-06-13 16:05:20 +06:30
  • b133129389 merge with crm Yan 2017-06-13 15:19:01 +06:30
  • e5c29f6074 merge with report Aung Myo 2017-06-13 15:07:29 +06:30
  • 7194f0e971 update sale search Aung Myo 2017-06-13 15:04:51 +06:30
  • d54fd19d1c report ui format Yan 2017-06-13 14:59:00 +06:30
  • 7c37d9ada3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-13 14:37:35 +06:30
  • 1ef88c4e70 update Nweni 2017-06-13 14:37:23 +06:30
  • 03b839fc07 update customer detail Aung Myo 2017-06-13 14:12:35 +06:30
  • 562db87144 update crm view Aung Myo 2017-06-13 13:39:05 +06:30
  • b513aa22ab datepicker Aung Myo 2017-06-13 12:27:45 +06:30
  • 4f7fda6902 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2017-06-13 12:05:11 +06:30
  • ee54f1cdd3 validate error Aung Myo 2017-06-13 12:04:55 +06:30
  • 99d00f6d2a Redeem amount validation Phyo 2017-06-13 12:04:31 +06:30
  • 9e4c8cef68 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2017-06-13 11:35:49 +06:30
  • 6717becf92 Customer Update Aung Myo 2017-06-13 11:35:30 +06:30
  • 21936fe3b0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Moe Su 2017-06-13 10:46:06 +06:30
  • 59d53816bd Change style and redeem Moe Su 2017-06-13 10:45:56 +06:30
  • f8df5147a4 fixed conflict file Aung Myo 2017-06-13 10:40:49 +06:30
  • c05a64bae7 update customer amount Aung Myo 2017-06-13 10:36:40 +06:30
  • 3e691ca3f7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-13 10:00:47 +06:30
  • 3404c5e0bd ui updating for report Yan 2017-06-13 09:59:56 +06:30
  • 16e163f987 For Pull Moe Su 2017-06-13 09:33:16 +06:30
  • 29acbd9bfa Rebate Redeem amount detect Phyo 2017-06-12 20:32:12 +06:30
  • dfd7eec2e9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-12 20:15:35 +06:30
  • a8a8c2b984 update Nweni 2017-06-12 20:15:26 +06:30
  • 8fc4fa5cf1 order quries update Yan 2017-06-12 20:14:20 +06:30
  • 1d1a913732 bug fix for order completed Yan 2017-06-12 20:11:37 +06:30
  • 90da21993d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-12 19:35:17 +06:30
  • c904451110 update Nweni 2017-06-12 19:35:05 +06:30
  • 4bbf651040 Rebate Bug Fix Phyo 2017-06-12 19:31:01 +06:30
  • 796d511f2e Rebate add Phyo 2017-06-12 19:02:20 +06:30
  • 3bc3419243 fixed conflict Nweni 2017-06-12 18:52:12 +06:30
  • 6945449523 get update Nweni 2017-06-12 18:51:02 +06:30
  • 92f1f80acb Edit Customer Aung Myo 2017-06-12 18:50:06 +06:30
  • 6523bee751 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Moe Su 2017-06-12 18:35:49 +06:30
  • 001d168942 For pull Moe Su 2017-06-12 18:35:38 +06:30
  • 7dcc777668 fixed conflict Aung Myo 2017-06-12 18:34:41 +06:30
  • 562c93dee7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-12 18:33:23 +06:30
  • e1e7064e47 add menu in Transaction Yan 2017-06-12 18:33:09 +06:30
  • 967d035097 change dob Aung Myo 2017-06-12 18:31:42 +06:30
  • a35dad8872 Merge branch 'master' of https://bitbucket.org/code2lab/sxrestaurant Cherry 2017-06-12 18:28:18 +06:30
  • a247c142b8 ReceiptList Report Rough Cherry 2017-06-12 18:26:00 +06:30
  • 1d667c6174 merge with master Yan 2017-06-12 18:24:57 +06:30
  • b14f4d67a5 origamijs Aung Myo 2017-06-12 18:23:12 +06:30
  • 423776cadd print format update Yan 2017-06-12 18:19:30 +06:30
  • 2db2be56d8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Moe Su 2017-06-12 18:18:32 +06:30
  • b47c983886 Edit Redim Moe Su 2017-06-12 18:18:24 +06:30
  • 7a3957181c update Nweni 2017-06-12 18:15:19 +06:30
  • ddf85905ef fixed conflict Nweni 2017-06-12 17:32:38 +06:30
  • d1ae734f50 update Nweni 2017-06-12 17:30:49 +06:30
  • e6647dd494 Seed Edit Aung Myo 2017-06-12 16:48:20 +06:30
  • 8eee364710 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2017-06-12 16:36:01 +06:30
  • 779df44da0 Merge branch 'crm' Aung Myo 2017-06-12 16:34:39 +06:30
  • 6d34f92506 update crm api Aung Myo 2017-06-12 16:33:18 +06:30
  • 870dc22249 add merchant uid Moe Su 2017-06-12 16:26:50 +06:30
  • 0f055fe546 Add Seed Moe Su 2017-06-12 16:24:56 +06:30
  • 3b93f6b22e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Moe Su 2017-06-12 16:20:25 +06:30
  • 4af0c4fc13 add seed Moe Su 2017-06-12 16:20:16 +06:30
  • 90e583b212 Merge branch 'crm' Aung Myo 2017-06-12 15:47:29 +06:30
  • 622aa4f121 update origami js and index Aung Myo 2017-06-12 15:39:38 +06:30
  • 10418c1204 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2017-06-12 15:03:02 +06:30
  • dc51beae43 fixed conflictfile Aung Myo 2017-06-12 15:01:19 +06:30
  • 59520bf7ec table status update Nweni 2017-06-12 14:35:59 +06:30
  • 105581a7de Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-12 14:23:29 +06:30
  • e90178cfdc finished CRM and customer Aung Myo 2017-06-12 14:23:20 +06:30
  • b12b52d754 update table status Nweni 2017-06-12 14:23:18 +06:30
  • c7ff5140d4 Payment route change Phyo 2017-06-12 14:22:45 +06:30
  • b0eb92b043 Seed Moe Su 2017-06-12 14:19:04 +06:30
  • 3e531f68a9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Moe Su 2017-06-12 14:16:42 +06:30
  • dd5de68bc0 Seed Moe Su 2017-06-12 14:16:31 +06:30
  • 7122fb4c81 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-12 14:15:16 +06:30
  • 4212ad45b3 updated for food and beverage bugs Yan 2017-06-12 14:11:13 +06:30
  • 228ff44e5c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Moe Su 2017-06-12 13:58:24 +06:30
  • a2111f1635 For Pull Moe Su 2017-06-12 13:58:16 +06:30
  • 917ccd0294 booking update Nweni 2017-06-12 13:48:54 +06:30
  • 75e363ed12 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Moe Su 2017-06-12 13:33:21 +06:30
  • c6b72a112b For Pull Moe Su 2017-06-12 13:31:01 +06:30
  • a96444518a fixed conflict Nweni 2017-06-12 13:28:16 +06:30
  • d2caba3f03 fixed conflict Nweni 2017-06-12 13:27:33 +06:30
  • ee208a5dcd Update Nweni 2017-06-12 13:26:09 +06:30
  • ca2dc181d6 add receipt no report and bug fixing Yan 2017-06-12 12:04:12 +06:30
  • b6bba9ecd4 merge conflict Yan 2017-06-12 10:55:04 +06:30
  • e1481eb591 update route after merge with crm Yan 2017-06-12 10:27:53 +06:30
  • c5e9d7afd5 merge with crm Yan 2017-06-12 10:25:07 +06:30
  • 121fb92b9b update orgami js Yan 2017-06-12 10:12:55 +06:30
  • 09f9a29cde merge with master Yan 2017-06-12 10:01:36 +06:30
  • 5ee3ae257a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-12 09:20:50 +06:30
  • 3f3d37756d update Nweni 2017-06-12 09:20:38 +06:30
  • 7eaea8f08d fixed jsonb to json to support both mysql and postgres Min Zeya Phyo 2017-06-12 07:40:40 +06:30