From 0aac38f2ff835b2eb5d1125be4b42d8525eea6c8 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Thu, 17 Nov 2016 12:56:35 +0100
Subject: [PATCH] Entidades Client y Address, customer renombrado a client

---
 .../account/server/datasources.json           |  2 -
 .../{customer => client}/.editorconfig        |  0
 .../{customer => client}/.eslintignore        |  0
 .../{customer => client}/.eslintrc            |  0
 .../{customer => client}/.gitignore           |  1 +
 .../{customer => client}/.yo-rc.json          |  0
 .../client/common/models/Address.json         | 32 ++++++++
 .../client/common/models/Client.json          | 74 +++++++++++++++++++
 .../{customer => client}/package.json         |  0
 .../server/boot/authentication.js             |  0
 .../{customer => client}/server/boot/root.js  |  0
 .../server/component-config.json              |  0
 .../{customer => client}/server/config.json   |  0
 .../client/server/datasources.json            |  7 ++
 .../server/middleware.development.json        |  0
 .../server/middleware.json                    |  0
 .../server/middleware/cors.js                 |  0
 .../server/middleware/datetime.js             |  0
 .../server/model-config.json                  | 13 ++--
 .../{customer => client}/server/server.js     |  0
 @salix-services/customer/client/index.ejs     | 14 ----
 .../customer/common/models/AccessTokenIp.json | 15 ----
 .../customer/common/models/UserIp.json        | 18 -----
 .../customer/common/models/customer.json      | 30 --------
 .../customer/common/models/message.js         |  8 --
 .../customer/common/models/message.json       | 29 --------
 .../customer/common/models/user-a.js          |  5 --
 .../customer/common/models/user-a.json        | 13 ----
 .../customer/server/datasources.json          |  6 --
 @salix/nginx.conf                             |  2 +-
 forever.json                                  |  5 +-
 31 files changed, 124 insertions(+), 150 deletions(-)
 rename @salix-services/{customer => client}/.editorconfig (100%)
 rename @salix-services/{customer => client}/.eslintignore (100%)
 rename @salix-services/{customer => client}/.eslintrc (100%)
 rename @salix-services/{customer => client}/.gitignore (94%)
 rename @salix-services/{customer => client}/.yo-rc.json (100%)
 create mode 100644 @salix-services/client/common/models/Address.json
 create mode 100644 @salix-services/client/common/models/Client.json
 rename @salix-services/{customer => client}/package.json (100%)
 rename @salix-services/{customer => client}/server/boot/authentication.js (100%)
 rename @salix-services/{customer => client}/server/boot/root.js (100%)
 rename @salix-services/{customer => client}/server/component-config.json (100%)
 rename @salix-services/{customer => client}/server/config.json (100%)
 create mode 100644 @salix-services/client/server/datasources.json
 rename @salix-services/{customer => client}/server/middleware.development.json (100%)
 rename @salix-services/{customer => client}/server/middleware.json (100%)
 rename @salix-services/{customer => client}/server/middleware/cors.js (100%)
 rename @salix-services/{customer => client}/server/middleware/datetime.js (100%)
 rename @salix-services/{customer => client}/server/model-config.json (89%)
 rename @salix-services/{customer => client}/server/server.js (100%)
 delete mode 100644 @salix-services/customer/client/index.ejs
 delete mode 100644 @salix-services/customer/common/models/AccessTokenIp.json
 delete mode 100644 @salix-services/customer/common/models/UserIp.json
 delete mode 100644 @salix-services/customer/common/models/customer.json
 delete mode 100644 @salix-services/customer/common/models/message.js
 delete mode 100644 @salix-services/customer/common/models/message.json
 delete mode 100644 @salix-services/customer/common/models/user-a.js
 delete mode 100644 @salix-services/customer/common/models/user-a.json
 delete mode 100644 @salix-services/customer/server/datasources.json

diff --git a/@salix-services/account/server/datasources.json b/@salix-services/account/server/datasources.json
index 335e997b2..c998a58a7 100644
--- a/@salix-services/account/server/datasources.json
+++ b/@salix-services/account/server/datasources.json
@@ -1,9 +1,7 @@
 {
-
 "db": {
     "name": "db",
     "connector": "memory",
     "file": "db.json"
   }
-
 }
diff --git a/@salix-services/customer/.editorconfig b/@salix-services/client/.editorconfig
similarity index 100%
rename from @salix-services/customer/.editorconfig
rename to @salix-services/client/.editorconfig
diff --git a/@salix-services/customer/.eslintignore b/@salix-services/client/.eslintignore
similarity index 100%
rename from @salix-services/customer/.eslintignore
rename to @salix-services/client/.eslintignore
diff --git a/@salix-services/customer/.eslintrc b/@salix-services/client/.eslintrc
similarity index 100%
rename from @salix-services/customer/.eslintrc
rename to @salix-services/client/.eslintrc
diff --git a/@salix-services/customer/.gitignore b/@salix-services/client/.gitignore
similarity index 94%
rename from @salix-services/customer/.gitignore
rename to @salix-services/client/.gitignore
index aff1045b4..ebbd90ea9 100644
--- a/@salix-services/customer/.gitignore
+++ b/@salix-services/client/.gitignore
@@ -17,3 +17,4 @@
 coverage
 node_modules
 npm-debug.log
+db.json
diff --git a/@salix-services/customer/.yo-rc.json b/@salix-services/client/.yo-rc.json
similarity index 100%
rename from @salix-services/customer/.yo-rc.json
rename to @salix-services/client/.yo-rc.json
diff --git a/@salix-services/client/common/models/Address.json b/@salix-services/client/common/models/Address.json
new file mode 100644
index 000000000..a819747b5
--- /dev/null
+++ b/@salix-services/client/common/models/Address.json
@@ -0,0 +1,32 @@
+{
+  "name": "Address",
+  "base": "PersistedModel",
+  "properties": {
+    "id": {
+      "type": "Number",
+      "id": true,
+      "description": "Identifier"
+    },
+    "street": {
+      "type": "string",
+      "required": "true"
+    },
+    "city": {
+      "type": "string",
+      "required": "true"
+    },
+    "postcode": {
+      "type": "string"
+    },
+    "province": {
+      "type": "string"
+    },
+    "country": {
+      "type": "string",
+      "required": "true"
+    },
+    "phone": {
+      "type": "string"
+    }
+  }
+}
diff --git a/@salix-services/client/common/models/Client.json b/@salix-services/client/common/models/Client.json
new file mode 100644
index 000000000..afdb9cd7c
--- /dev/null
+++ b/@salix-services/client/common/models/Client.json
@@ -0,0 +1,74 @@
+{
+  "name": "Client",
+  "base": "PersistedModel",
+  "properties": {
+    "id": {
+      "type": "Number",
+      "id": true,
+      "description": "Identifier"
+    },
+    "name": {
+      "type": "string",
+      "required": "true"
+    },
+    "salesPerson": {
+      "type": "Number",
+      "required": "true"
+    },
+    "fi": {
+      "type": "string",
+      "description": "Fiscal indetifier"
+    },
+    "alias": {
+      "type": "string"
+    },
+    "socialName": {
+      "type": "string"
+    },
+    "dischargeDate": {
+      "type": "string"
+    },
+    "contact": {
+      "type": "string"
+    },
+    "email": {
+      "type": "string"
+    },
+    "phone": {
+      "type": "string"
+    },
+    "fax": {
+      "type": "string"
+    },
+    "quality": {
+      "type": "string"
+    },
+    "active": {
+      "type": "boolean"
+    },
+    "credit": {
+      "type": "Number"
+    },
+    "creditAndCaution": {
+      "type": "Number"
+    },
+    "iban": {
+      "type": "string"
+    },
+    "payMethod": {
+      "type": "string"
+    },
+    "surcharge": {
+      "type": "boolean",
+      "description": "The client has equivalence surcharge"
+    },
+    "hasToInvoice": {
+      "type": "boolean",
+      "description": "Global invoicing enabled for the client"
+    },
+    "invoiceByEmail": {
+      "type": "boolean",
+      "description": "Send invoices by email"
+    }
+  }
+}
diff --git a/@salix-services/customer/package.json b/@salix-services/client/package.json
similarity index 100%
rename from @salix-services/customer/package.json
rename to @salix-services/client/package.json
diff --git a/@salix-services/customer/server/boot/authentication.js b/@salix-services/client/server/boot/authentication.js
similarity index 100%
rename from @salix-services/customer/server/boot/authentication.js
rename to @salix-services/client/server/boot/authentication.js
diff --git a/@salix-services/customer/server/boot/root.js b/@salix-services/client/server/boot/root.js
similarity index 100%
rename from @salix-services/customer/server/boot/root.js
rename to @salix-services/client/server/boot/root.js
diff --git a/@salix-services/customer/server/component-config.json b/@salix-services/client/server/component-config.json
similarity index 100%
rename from @salix-services/customer/server/component-config.json
rename to @salix-services/client/server/component-config.json
diff --git a/@salix-services/customer/server/config.json b/@salix-services/client/server/config.json
similarity index 100%
rename from @salix-services/customer/server/config.json
rename to @salix-services/client/server/config.json
diff --git a/@salix-services/client/server/datasources.json b/@salix-services/client/server/datasources.json
new file mode 100644
index 000000000..8adff1558
--- /dev/null
+++ b/@salix-services/client/server/datasources.json
@@ -0,0 +1,7 @@
+{
+  "db": {
+    "name": "db",
+    "connector": "memory",
+    "file": "db.json"
+  }
+}
diff --git a/@salix-services/customer/server/middleware.development.json b/@salix-services/client/server/middleware.development.json
similarity index 100%
rename from @salix-services/customer/server/middleware.development.json
rename to @salix-services/client/server/middleware.development.json
diff --git a/@salix-services/customer/server/middleware.json b/@salix-services/client/server/middleware.json
similarity index 100%
rename from @salix-services/customer/server/middleware.json
rename to @salix-services/client/server/middleware.json
diff --git a/@salix-services/customer/server/middleware/cors.js b/@salix-services/client/server/middleware/cors.js
similarity index 100%
rename from @salix-services/customer/server/middleware/cors.js
rename to @salix-services/client/server/middleware/cors.js
diff --git a/@salix-services/customer/server/middleware/datetime.js b/@salix-services/client/server/middleware/datetime.js
similarity index 100%
rename from @salix-services/customer/server/middleware/datetime.js
rename to @salix-services/client/server/middleware/datetime.js
diff --git a/@salix-services/customer/server/model-config.json b/@salix-services/client/server/model-config.json
similarity index 89%
rename from @salix-services/customer/server/model-config.json
rename to @salix-services/client/server/model-config.json
index 7cf58375a..54776dba3 100644
--- a/@salix-services/customer/server/model-config.json
+++ b/@salix-services/client/server/model-config.json
@@ -16,10 +16,6 @@
   "User": {
     "dataSource": "db"
   },
-  "Customer": {
-    "dataSource": "db",
-    "public": true
-  },
   "AccessToken": {
     "dataSource": "db",
     "public": false
@@ -36,7 +32,12 @@
     "dataSource": "db",
     "public": false
   },
-  "Message": {
-    "dataSource": null
+  "Client": {
+    "dataSource": "db",
+    "public": true
+  },
+  "Address": {
+    "dataSource": "db",
+    "public": true
   }
 }
diff --git a/@salix-services/customer/server/server.js b/@salix-services/client/server/server.js
similarity index 100%
rename from @salix-services/customer/server/server.js
rename to @salix-services/client/server/server.js
diff --git a/@salix-services/customer/client/index.ejs b/@salix-services/customer/client/index.ejs
deleted file mode 100644
index 3f258702d..000000000
--- a/@salix-services/customer/client/index.ejs
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-<head>
-	<meta charset="UTF-8">
-    <title>Salix</title>    
-</head>
-<body ng-app="login">
-	<vn-login></vn-login>
-	<script
-		type="text/javascript"
-		src="/salix.customer.js">
-	</script>
-</body>
-</html>
diff --git a/@salix-services/customer/common/models/AccessTokenIp.json b/@salix-services/customer/common/models/AccessTokenIp.json
deleted file mode 100644
index a2ed91c89..000000000
--- a/@salix-services/customer/common/models/AccessTokenIp.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "AccessTokenIp",
-  "base": "AccessToken",
-  "idInjection": false,
-  "properties": {
-    "ip": {
-      "type": "string",
-      "default": "1.1.1.1"
-    }
-  },
-  "validations": [],
-  "relations": {},
-  "acls": [],
-  "methods": {}
-}
diff --git a/@salix-services/customer/common/models/UserIp.json b/@salix-services/customer/common/models/UserIp.json
deleted file mode 100644
index f25c2b0e9..000000000
--- a/@salix-services/customer/common/models/UserIp.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "UserIp",
-  "base": "User",
-  "properties": {},
-  "validations": [],
-  "relations": {
-    "accessTokens": {
-      "type": "hasMany",
-      "model": "AccessTokenIp",
-      "foreignKey": "userId",
-      "options": {
-        "disableInclude": true
-      }
-    }
-  },
-  "acls": [],
-  "methods": {}
-}
diff --git a/@salix-services/customer/common/models/customer.json b/@salix-services/customer/common/models/customer.json
deleted file mode 100644
index ca90e88c2..000000000
--- a/@salix-services/customer/common/models/customer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "Customer",
-  "properties": {
-    "name": {
-      "type": "String",
-      "required": "true"
-    },
-    "id": {
-      "type": "Number",
-      "id": true,
-      "description": "Customer ID"
-    }
-  },
-  "validations": [],
-  "relations": {},
-  "acls": [
-    {
-      "principalType": "ROLE",
-      "principalId": "$unauthenticated",
-      "permission": "DENY"
-    },
-    {
-      "principalType": "ROLE",
-      "principalId": "$everyone",
-      "permission": "ALLOW",
-      "property": "create"
-    }
-  ],
-  "methods": {}
-}
diff --git a/@salix-services/customer/common/models/message.js b/@salix-services/customer/common/models/message.js
deleted file mode 100644
index fc94c5a3b..000000000
--- a/@salix-services/customer/common/models/message.js
+++ /dev/null
@@ -1,8 +0,0 @@
-module.exports = function(Message) {
-  Message.greet = function(msg, cb) {
-    process.nextTick(function() {
-      msg = msg || 'hello';
-      cb(null, 'Sender says ' + msg + ' to receiver');
-    });
-  };
-};
diff --git a/@salix-services/customer/common/models/message.json b/@salix-services/customer/common/models/message.json
deleted file mode 100644
index ebd6606f8..000000000
--- a/@salix-services/customer/common/models/message.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "Message",
-  "base": "Model",
-  "properties": {},
-  "validations": [],
-  "relations": {},
-  "acls": [],
-  "methods": {
-    "greet": {
-      "isStatic": true,
-      "accepts": [
-        {
-          "arg": "msg",
-          "type": "string",
-          "http": {
-            "source": "query"
-          }
-        }
-      ],
-      "returns": {
-        "arg": "greeting",
-        "type": "string"
-      },
-      "http": {
-        "verb": "get"
-      }
-    }
-  }
-}
diff --git a/@salix-services/customer/common/models/user-a.js b/@salix-services/customer/common/models/user-a.js
deleted file mode 100644
index 38b9de5bc..000000000
--- a/@salix-services/customer/common/models/user-a.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = function(Usera) {
-
-};
diff --git a/@salix-services/customer/common/models/user-a.json b/@salix-services/customer/common/models/user-a.json
deleted file mode 100644
index 15ab14096..000000000
--- a/@salix-services/customer/common/models/user-a.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "UserA",
-  "base": "PersistedModel",
-  "idInjection": true,
-  "options": {
-    "validateUpsert": true
-  },
-  "properties": {},
-  "validations": [],
-  "relations": {},
-  "acls": [],
-  "methods": {}
-}
diff --git a/@salix-services/customer/server/datasources.json b/@salix-services/customer/server/datasources.json
deleted file mode 100644
index d6caf56d4..000000000
--- a/@salix-services/customer/server/datasources.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "db": {
-    "name": "db",
-    "connector": "memory"
-  }
-}
diff --git a/@salix/nginx.conf b/@salix/nginx.conf
index 91a6bf415..6c4dc8c1e 100644
--- a/@salix/nginx.conf
+++ b/@salix/nginx.conf
@@ -38,7 +38,7 @@ http {
 			proxy_pass http://127.0.0.1:3001/$1$is_args$args;
 		}
 
-		location ~ ^/customer(?:/(.*))?$ {
+		location ~ ^/client(?:/(.*))?$ {
 			proxy_pass http://127.0.0.1:3002/$1$is_args$args;
 		}
 	}
diff --git a/forever.json b/forever.json
index 27250bb05..e41bce424 100644
--- a/forever.json
+++ b/forever.json
@@ -16,12 +16,11 @@
     "workingDir": "."
   },
   {
-    "uid": "customer",
+    "uid": "client",
     "append": true,
     "watch": true,
     "script": "server.js",
-    "sourceDir": "./@salix-services/customer/server",
+    "sourceDir": "./@salix-services/client/server",
     "workingDir": "."
   }
-  
 ]
\ No newline at end of file