Commit Graph

146 Commits

Author SHA1 Message Date
Aung Myo
ab7f08b1d6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-28 12:47:18 +06:30
Min Zeya Phyo
ee651763b7 shift close and payment journal 2017-06-28 10:34:42 +06:30
Aung Myo
53ff3989b5 update merge cancan 2017-06-27 16:55:56 +06:30
Aung Myo
945963362a update queue migration 2017-06-27 15:25:13 +06:30
Aung Myo
25967b82d3 update home link 2017-06-26 20:44:15 +06:30
Aung Myo
75dd4db10f update seed 2017-06-26 19:33:29 +06:30
Yan
99ac82c888 update seed for shop and oqs 2017-06-26 19:28:02 +06:30
Yan
adf06cf6f5 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 17:02:25 +06:30
Aung Myo
6e77a71946 update customer seed shop and receipt bill 2017-06-26 16:50:04 +06:30
Phyo
ecabed5d5d Account type change 2017-06-23 18:45:46 +06:30
Yan
27ff8b89e7 merge with crm 2017-06-23 17:51:09 +06:30
Aung Myo
f5f0f9e077 update crm customer and bind customer and queue 2017-06-23 17:03:52 +06:30
Yan
618aed50dc merge with settings_backend 2017-06-22 18:05:23 +06:30
Phyo
4254004423 Redeem Nett Button works 2017-06-22 15:36:36 +06:30
Yan
cb40f06854 fixed for customer 2017-06-22 15:01:13 +06:30
Aung Myo
187caa5253 update customre 2017-06-22 11:58:16 +06:30
Aung Myo
54526230aa update customerbind in origami 2017-06-22 10:25:40 +06:30
Yan
bded56a696 customer seed updated 2017-06-22 10:11:50 +06:30
Yan
3f15e7bc6f Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:51:22 +06:30
Aung Myo
de38a50522 Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-22 09:34:45 +06:30
Yan
2525bfbdd9 discount updated 2017-06-21 20:30:12 +06:30
Aung Myo
7c5456d712 assign table ,membership transaction and queue 2017-06-21 16:22:53 +06:30
Yan
e3b3ff76b2 add account_id to od_item and sale_item table 2017-06-21 14:49:01 +06:30
Aung Myo
0e619f3f2a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-20 17:59:14 +06:30
Aung Myo
33cb8b64a3 finished customer form and update 2017-06-20 17:57:50 +06:30
Yan
e43818fdf5 oqs updated 2017-06-20 13:33:41 +06:30
Yan
7fe36e8ef4 merge with settings 2017-06-19 19:14:58 +06:30
Yan
c95b0130dc edit migrate oqs 2017-06-19 18:56:36 +06:30
Phyo
184dcb53a1 Conflict fix din settings_backend 2017-06-19 15:24:15 +06:30
Phyo
2dbbb17634 Add extra fields to accounts 2017-06-19 12:21:54 +06:30
Yan
0e7042f00f merge with settings_backend 2017-06-18 12:30:06 +06:30
Yan
74c6f3cebc Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-18 12:10:30 +06:30
Aung Myo
b62d5349c6 assign queue and other bug 2017-06-18 00:03:09 +06:30
Phyo
b093a993ba Zone and OQS 2017-06-17 18:00:59 +06:30
Yan
2cf9c6947c print for oqs 2017-06-16 21:06:33 +06:30
Yan
9f3acad10d update order for oqs 2017-06-16 19:26:21 +06:30
Yan
38ae8f8f86 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-16 13:45:23 +06:30
Aung Myo
cd804a3d18 update queue no print 2017-06-16 13:28:28 +06:30
Yan
58bc13e8b6 add auto_print field to migration 2017-06-16 11:14:47 +06:30
Yan
77049176f6 oqs and zone for seed 2017-06-15 16:47:04 +06:30
Nweni
4330bf9553 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 11:52:01 +06:30
Nweni
5636b7a61a Update 2017-06-15 11:51:49 +06:30
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