Commit Graph

104 Commits

Author SHA1 Message Date
Yan
41572d5360 add sale reason in seed 2017-06-15 11:12:50 +06:30
Nweni
a1a6adbdd6 update 2017-06-15 01:49:51 +06:30
Nweni
401bba7aed add set up menu 2017-06-15 01:19:50 +06:30
Nweni
7b2d2731c1 auth 2017-06-14 11:05:15 +06:30
Moe Su
27971f406b Seed 2017-06-13 20:22:28 +06:30
Nweni
2e316f46fe seed updated 2017-06-13 19:58:15 +06:30
Nweni
c6ee0e9d25 update seed 2017-06-13 18:55:20 +06:30
Nweni
39e9c5419a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 18:37:24 +06:30
Nweni
0d5767b022 Update 2017-06-13 18:37:14 +06:30
Aung Myo
a600c233d5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-13 18:28:40 +06:30
Aung Myo
7f7d579d2f add auth token:
exit
2017-06-13 18:28:22 +06:30
Moe Su
19160a9630 Change redeem name 2017-06-13 17:41:50 +06:30
Moe Su
59d53816bd Change style and redeem 2017-06-13 10:45:56 +06:30
Nweni
c904451110 update 2017-06-12 19:35:05 +06:30
Nweni
ddf85905ef fixed conflict 2017-06-12 17:32:38 +06:30
Nweni
d1ae734f50 update 2017-06-12 17:30:49 +06:30
Aung Myo
e6647dd494 Seed Edit 2017-06-12 16:48:20 +06:30
Moe Su
0f055fe546 Add Seed 2017-06-12 16:24:56 +06:30
Moe Su
3b93f6b22e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 16:20:25 +06:30
Moe Su
4af0c4fc13 add seed 2017-06-12 16:20:16 +06:30
Aung Myo
dc51beae43 fixed conflictfile 2017-06-12 15:01:19 +06:30
Aung Myo
e90178cfdc finished CRM and customer 2017-06-12 14:23:20 +06:30
Moe Su
b0eb92b043 Seed 2017-06-12 14:19:04 +06:30
Moe Su
dd5de68bc0 Seed 2017-06-12 14:16:31 +06:30
Yan
09f9a29cde merge with master 2017-06-12 10:01:36 +06:30
Min Zeya Phyo
7eaea8f08d fixed jsonb to json to support both mysql and postgres 2017-06-12 07:40:40 +06:30
Aung Myo
0943808ac8 finished order and sales in setting 2017-06-12 00:45:59 +06:30
Yan
f834911587 to do req_bill_format and status changed after pay 2017-06-12 00:45:26 +06:30
Aung Myo
eb001275c7 fixed conflict 2017-06-11 18:09:00 +06:30
Moe Su
7341657477 redeem process 2017-06-11 17:40:44 +06:30
Moe Su
60b1819220 Generating seed 2017-06-11 16:47:22 +06:30
Moe Su
33cc576f1e edit membership setting , otherpayment page 2017-06-11 15:48:53 +06:30
Yan
4c29aad299 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-09 13:47:19 +06:30
Yan
a100d742e6 add crm order printer in seed 2017-06-09 13:47:00 +06:30
Nweni
56ffd1f063 update sale order talble 2017-06-09 13:13:20 +06:30
Aung Myo
406172c6ff fixed conflict 2017-06-09 12:04:36 +06:30
Yan
1d472aa2e1 add req bill seed 2017-06-09 10:26:06 +06:30
Aung Myo
35277ac000 queue and crm view updated 2017-06-09 09:29:25 +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
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
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
Yan
395250fd47 delete duplicate account migration 2017-06-08 15:48:22 +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
Nweni
d6a455b135 fixed conflict 2017-06-08 09:57:33 +06:30
Nweni
3cf00faab8 Update 2017-06-08 09:56:13 +06:30
Moe Su
26f2dce142 For Pull 2017-06-08 09:53:04 +06:30