Commit Graph

679 Commits

Author SHA1 Message Date
Yan
518e15f5d1 update crm 2017-06-09 13:54:39 +06:30
Nweni
82de95ca22 update 2017-06-09 13:52:36 +06:30
Aung Myo
9c228dce5c update view crm 2017-06-09 13:26:47 +06:30
Aung Myo
5d89713bb6 crm print update 2017-06-09 13:24:20 +06:30
Aung Myo
406172c6ff fixed conflict 2017-06-09 12:04:36 +06:30
Aung Myo
ba9ebe12de update customer 2017-06-09 12:00:46 +06:30
Yan
e7a1687b85 update top menu bar for report 2017-06-09 11:59:08 +06:30
Yan
e969249e48 Merge branch 'report' 2017-06-09 11:57:15 +06:30
Yan
367a8694b1 update payment 2017-06-09 11:57:05 +06:30
Aung Myo
e2e8045d0f update crm layout 2017-06-09 11:55:50 +06:30
Yan
fe60ac818f update assets 2017-06-09 11:33:21 +06:30
Nweni
6171b00dc7 cash payment complete 2017-06-09 11:25:30 +06:30
Yan
9771ed2019 add report in menu 2017-06-09 11:03:14 +06:30
Yan
39c20b221e updated miss origami css and js filename 2017-06-09 10:35:19 +06:30
Aung Myo
35277ac000 queue and crm view updated 2017-06-09 09:29:25 +06:30
Moe Su
5f5e6470c7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-09 02:40:48 +06:30
Moe Su
c23f726cb3 redeem process 2017-06-09 02:40:35 +06:30
Moe Su
7702c50675 Add membership action 2017-06-09 02:23:16 +06:30
Yan
c11b4b7fe0 Merge branch 'loyalty' of bitbucket.org:code2lab/sxrestaurant 2017-06-08 19:05:46 +06:30
Yan
43debf4b7e merged with crm 2017-06-08 19:04:48 +06:30
Yan
1cbbe9d672 Merge branch 'discount' 2017-06-08 18:58:28 +06:30
Yan
71e09ef452 comment for cable and add print seed 2017-06-08 18:57:53 +06:30
Moe Su
451804366c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-08 18:22:27 +06:30
Moe Su
54e14e02f4 Add payment method 2017-06-08 18:22:19 +06:30
Yan
568c5fbf68 Merge branch 'loyalty' of bitbucket.org:code2lab/sxrestaurant 2017-06-08 18:03:59 +06:30
Yan
907764b3e4 update discount 2017-06-08 18:02:40 +06:30
Moe Su
0bcd612bc2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-08 17:57:43 +06:30
Moe Su
74b0550c30 payment_setting 2017-06-08 17:57:29 +06:30
Aung Myo
ea4f50e779 update print 2017-06-08 16:52:50 +06:30
Yan
e0e512b76b editing discount 2017-06-08 15:40:59 +06:30
Yan
5203a9f4a5 merge crm 2017-06-08 15:29:37 +06:30
Yan
fbc00bc3e4 merged loyalty 2017-06-08 15:28:09 +06:30
Yan
9866acf198 editing discout 2017-06-08 15:21:53 +06:30
Moe Su
664fe2f6e1 Adding Redeem at payment 2017-06-08 15:17:26 +06:30
Aung Myo
26598e2731 for origami view file 2017-06-08 14:57:01 +06:30
Aung Myo
8388192a81 delete view origami file 2017-06-08 14:46:35 +06:30
Aung Myo
8a5fcadb69 finished customer to sale assign in crm 2017-06-08 13:41:11 +06:30
Yan
612f037fe8 index ui for discount 2017-06-08 10:40:06 +06:30
Moe Su
26f2dce142 For Pull 2017-06-08 09:53:04 +06:30
Aung Myo
44382d284f fixed conflict 2017-06-07 22:29:43 +06:30
Aung Myo
f9c8dbc03e fixed conflict route and request bill 2017-06-07 22:21:42 +06:30
Aung Myo
234ef9bc15 change crm booking 2017-06-07 22:17:12 +06:30
Moe Su
6cc2e29e30 For pull 2017-06-07 18:13:12 +06:30
Moe Su
e2ecfaeaad For pull 2017-06-07 18:11:03 +06:30
Yan
be7d448c30 update gem file 2017-06-07 18:09:56 +06:30
Yan
df138d94ba merged master 2017-06-07 17:45:40 +06:30
Aung Myo
bd345dbc3f fixed conflict 2017-06-07 17:15:51 +06:30
Moe Su
5264f9cf14 Paypar payment 2017-06-07 17:14:22 +06:30
Yan
114c4ee14d all changed for index in origami 2017-06-07 17:13:27 +06:30
Aung Myo
9ad04323f0 fixed conflict request_bill_con and origami index 2017-06-07 16:48:28 +06:30