Merge branch 'integration' into teeradone

.gitignore

@@ -4,4 +4,4 @@ www/tmp/
 www/webroot/img/img/demos/shop/products/shop8/product2.jpg
 www/webroot/img/img/demos/shop/products/shop8/product2.jpg
 www/webroot/img/img/demos/
 www/webroot/img/img/demos/
 www/src/Controller/UsersController.php.bg20180515
 www/src/Controller/UsersController.php.bg20180515
-www/config/app.backup
+www/config/app - Copy.php

www/src/Controller/UserCardsController.php

@@ -317,12 +317,11 @@ class UserCardsController extends AppController
                             ]
                             ]
                         ])->first();
                         ])->first();
                         if(empty($UserEntities)){
                         if(empty($UserEntities)){
-                            // pr('sdsd');die;
                             $UserEntities = $this->UserEntities->newEntity();
                             $UserEntities = $this->UserEntities->newEntity();
                             $UserEntities['entity_code'] = $TempUserCards['organize_id'];
                             $UserEntities['entity_code'] = $TempUserCards['organize_id'];
                             $UserEntities['user_id'] = $this->Auth->user('id');
                             $UserEntities['user_id'] = $this->Auth->user('id');
-                            $UserEntities['created_by'] = $this->Auth->user('id');
-                            $UserEntities['modified_by'] = $this->Auth->user('id');
+                            $UserEntities['create_uid'] = $this->Auth->user('id');
+                            $UserEntities['update_uid'] = $this->Auth->user('id');
                             $this->UserEntities->save($UserEntities);
                             $this->UserEntities->save($UserEntities);
                         }
                         }