Commit Graph

301 Commits

Author SHA1 Message Date
Yan
a100d742e6 add crm order printer in seed 2017-06-09 13:47:00 +06:30
Yan
0b04e2d4ef add base report controller 2017-06-09 13:35:41 +06:30
Yan
d2373f2f24 origami updating 2017-06-09 13:35:15 +06:30
Nweni
9dd96c7187 fixed conflict 2017-06-09 13:13:54 +06:30
Nweni
56ffd1f063 update sale order talble 2017-06-09 13:13:20 +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
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
Nweni
35553217f5 fixed conflict 2017-06-09 10:58:40 +06:30
Nweni
56a6d84abe Update 2017-06-09 10:57:16 +06:30
Yan
54ef701482 updated miss origami css and js filename 2017-06-09 10:36:07 +06:30
Yan
39c20b221e updated miss origami css and js filename 2017-06-09 10:35:19 +06:30
Yan
1d472aa2e1 add req bill seed 2017-06-09 10:26:06 +06:30
Yan
015222b575 changed orgirami to origami 2017-06-09 10:22:55 +06:30
Yan
ba4ec71ec9 updated origami js 2017-06-09 10:21:30 +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
75c8936eff updated default who changed oqs in queue job 2017-06-08 19:26:47 +06:30
Yan
43e89cefda re-add account migration 2017-06-08 19:12:11 +06:30
Yan
42a29296c7 update gem 2017-06-08 19:07:20 +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
5c5c0dba33 update gem 2017-06-08 18:08:34 +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
395250fd47 delete duplicate account migration 2017-06-08 15:48:22 +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
e516e653d2 update menu_items migrate 2017-06-08 15:24:59 +06:30
Yan
9866acf198 editing discout 2017-06-08 15:21:53 +06:30
Moe Su
b57e24c076 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-08 15:17:45 +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
387650656f commit gemlock 2017-06-08 13:57:56 +06:30
Aung Myo
e3dea08306 commit checkout 2017-06-08 13:54:05 +06:30
Aung Myo
5768a0db6f fixed conflict file 2017-06-08 13:49:30 +06:30
Aung Myo
8a5fcadb69 finished customer to sale assign in crm 2017-06-08 13:41:11 +06:30