Aung Myo
|
187caa5253
|
update customre
|
2017-06-22 11:58:16 +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
|
58bc13e8b6
|
add auto_print field to migration
|
2017-06-16 11:14:47 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Yan
|
b395e2e6f1
|
updated seed for customer
|
2017-06-07 19:10:57 +06:30 |
|
Yan
|
f746c18238
|
(important)migrateion files changed
|
2017-06-07 18:47:50 +06:30 |
|
Yan
|
a601cf6d75
|
editing migration
|
2017-06-07 18:08:44 +06:30 |
|
Nweni
|
4323da6589
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-07 14:45:22 +06:30 |
|
Nweni
|
810a6d8afc
|
update sale_payment database
|
2017-06-07 14:45:03 +06:30 |
|
PhyoTheingi
|
52cc294696
|
merge with master
|
2017-06-07 10:33:30 +06:30 |
|
PhyoTheingi
|
59434e2c3a
|
Menu item with Accout
|
2017-06-06 17:29:34 +06:30 |
|
Yan
|
f1877408be
|
fixed for pm key changed
|
2017-06-05 18:52:19 +06:30 |
|
Yan
|
f004db9b19
|
updated migration code
|
2017-06-05 15:06:34 +06:30 |
|