From e217bc4c076d7c549294e736339eff1929f96cae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=ABl=20Mugnier?= <noel.mugnier@outlook.com>
Date: Tue, 24 Nov 2020 16:31:47 +0100
Subject: [PATCH] =?UTF-8?q?Update=20-=20Possibilit=C3=A9=20de=20renseigner?=
 =?UTF-8?q?=20un=20nom=20commercial?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routes/account/EditProducer.svelte       | 18 +++++-
 src/routes/account/EditStore.svelte          | 14 ++++-
 src/routes/account/mutations.js              | 17 +++---
 src/routes/register/RegisterOwner.svelte     |  1 +
 src/routes/register/owner/FormCompany.svelte | 59 ++++++++++++--------
 5 files changed, 73 insertions(+), 36 deletions(-)

diff --git a/src/routes/account/EditProducer.svelte b/src/routes/account/EditProducer.svelte
index 64001e35..2ac9f238 100644
--- a/src/routes/account/EditProducer.svelte
+++ b/src/routes/account/EditProducer.svelte
@@ -2,7 +2,7 @@
 	import { UPDATE_PRODUCER } from "./mutations.js";
 	import { GET_PRODUCER_DETAILS } from "./queries.js";
 	import { form, bindClass } from '../../../vendors/svelte-forms/src/index';
-  import CitySearch from "./../../components/search/CitySearch.svelte";
+  	import CitySearch from "./../../components/search/CitySearch.svelte";
 	import ErrorContainer from "./../../components/ErrorContainer.svelte";
 	import Toggle from "./../../components/controls/Toggle.svelte";
 	import ProfileForm from "./ProfileForm.svelte";
@@ -10,6 +10,7 @@
 	export let errorsHandler, userId;
 
 	let producer = {
+		name: null,
 		firstName: null,
 		lastName: null,
 		email: null,
@@ -25,6 +26,7 @@
 	};
 	
 	const producerForm = form(() => ({
+    name: { value: producer.name, validators: ['required'], enabled: true },
     firstName: { value: producer.firstName, validators: ['required'], enabled: true },
     lastName: { value: producer.lastName, validators: ['required'], enabled: true },
 		email: { value: producer.email, validators: ['required', 'email'], enabled: true },
@@ -41,8 +43,18 @@
 	getQuery={GET_PRODUCER_DETAILS}
 	{errorsHandler}
 	{userId}>
-	<h3 class="font-semibold uppercase mb-0 mt-5">{producer.name || "Votre société"}</h3>
-	<span class="bg-primary h-1 w-20 mt-2 mb-6 block"></span>
+	<h3 class="font-semibold uppercase mb-0 mt-5">Votre entreprise</h3>
+	<span class="bg-primary h-1 w-20 mt-2 mb-6 block"></span>	
+	<div class="form-control">
+		<div class="w-full md:w-2/2">
+			<label for="grid-line2">Nom commercial *</label>
+			<input
+				bind:value={producer.name}
+				id="grid-line"
+				type="text"
+				placeholder="Nom commercial de votre entreprise" />
+		</div>
+	</div>
 	<input hidden required name="city" bind:value={producer.address.city} />
 	<input
 		hidden
diff --git a/src/routes/account/EditStore.svelte b/src/routes/account/EditStore.svelte
index da19f79d..8bee2064 100644
--- a/src/routes/account/EditStore.svelte
+++ b/src/routes/account/EditStore.svelte
@@ -12,6 +12,7 @@
 	export let errorsHandler, userId;
 
 	let store = {
+		name: null,
 		firstName: null,
 		lastName: null,
 		email: null,
@@ -29,6 +30,7 @@
 	};
 	
 	const storeForm = form(() => ({
+    name: { value: producer.name, validators: ['required'], enabled: true },
     firstName: { value: store.firstName, validators: ['required'], enabled: true },
     lastName: { value: store.lastName, validators: ['required'], enabled: true },
     email: { value: store.email, validators: ['required', 'email'], enabled: true },
@@ -46,8 +48,18 @@
 	getQuery={GET_STORE_DETAILS}
 	{errorsHandler}
 	{userId}>
-	<h3 class="font-semibold uppercase mb-0 mt-5">{store.name || "Votre société"}</h3>
+	<h3 class="font-semibold uppercase mb-0 mt-5">Votre magasin</h3>
 	<span class="bg-primary h-1 w-20 mt-2 mb-6 block"></span>
+	<div class="form-control">
+		<div class="w-full md:w-2/2">
+			<label for="grid-line2">Nom commercial *</label>
+			<input
+				bind:value={store.name}
+				id="grid-line"
+				type="text"
+				placeholder="Nom commercial de votre magasin" />
+		</div>
+	</div>
 	<input hidden required name="city" bind:value={store.address.city} />
 	<input
 		hidden
diff --git a/src/routes/account/mutations.js b/src/routes/account/mutations.js
index 73227a04..3b3f2ec9 100644
--- a/src/routes/account/mutations.js
+++ b/src/routes/account/mutations.js
@@ -17,6 +17,14 @@ export const UPDATE_STORE = gql`
 	mutation UpdateStore($input: UpdateStoreInput) {
 		updateStore(input: $input) {
 			id
+			lastName
+			firstName
+			name
+			openForNewBusiness
+			description
+			email
+			phone
+			picture			
 			address {
 				line1
 				line2
@@ -26,14 +34,6 @@ export const UPDATE_STORE = gql`
 				latitude
 				longitude
 			}
-			lastName
-			firstName
-			name
-			openForNewBusiness
-			description
-			email
-			phone
-			picture
 			openingHours {
 				day
 				from
@@ -54,6 +54,7 @@ export const UPDATE_PRODUCER = gql`
 			description
 			email
 			phone
+			picture
 			address {
 				line1
 				line2
diff --git a/src/routes/register/RegisterOwner.svelte b/src/routes/register/RegisterOwner.svelte
index 79640b0a..29e8344a 100644
--- a/src/routes/register/RegisterOwner.svelte
+++ b/src/routes/register/RegisterOwner.svelte
@@ -67,6 +67,7 @@
     picture: authInstance.user.profile.picture || null,
     sponsoringCode: sponsorshipCode || null,
     legals: {
+      name: null,
       vatIdentifier: null,
       siret: null,
       kind: null,
diff --git a/src/routes/register/owner/FormCompany.svelte b/src/routes/register/owner/FormCompany.svelte
index 1e837191..92e2b67f 100644
--- a/src/routes/register/owner/FormCompany.svelte
+++ b/src/routes/register/owner/FormCompany.svelte
@@ -17,6 +17,7 @@
   const companyForm = form(() => ({
     name: { value: company.name, validators: ['required'], enabled: true },
     vat: { value: vat, validators: ['required'], enabled: !company.notSubjectToVat },
+    legalName: { value: company.legals.name, validators: ['required'], enabled: true },
     kind: { value: company.legals.kind, validators: ['required'], enabled: true },
     email: { value: company.legals.email, validators: ['required', 'email'], enabled: true },
     line1: { value: company.legals.address.line1, validators: ['required'], enabled: true },
@@ -77,18 +78,6 @@
         <div class="-my-3 -mx-5 px-5 py-3 mb-4 bg-gray-100 border-b border-gray-400 lg:rounded-t font-semibold flex justify-between items-center">
           <p>Infos générales</p>
         </div>
-        <div class="w-full mb-2 md:mb-0 form-control">
-          <label for="name">
-            Nom {isStore ? 'du magasin' : "de l'entreprise"} *
-          </label>
-          <input
-            id="name"
-            type="text"
-            placeholder="ex : GAEC Fromages du Cantal"
-            use:bindClass={{ form: companyForm, name: "name" }}
-            bind:value={company.name} />
-          <ErrorContainer field={$companyForm.fields.name} />
-        </div>
         <div class="w-full form-control">
           <label for="grid-kind">Forme juridique *</label>
           <div class="w-full text-xs justify-center button-group" use:bindClass={{ form: companyForm, name: "kind" }}>
@@ -112,7 +101,39 @@
             </button>
           </div>
         </div>
-        <ErrorContainer field={$companyForm.fields.kind} />
+        <ErrorContainer field={$companyForm.fields.kind} />  
+        <div class="w-full form-control">
+          <label for="company_legalName">Raison sociale *</label>
+          <input
+            id="company_legalName"
+            type="text"
+            placeholder="ex : G.A.E.C des balmettes"
+            use:bindClass={{ form: companyForm, name: "legalName" }}
+            bind:value={company.legals.name} />
+          <ErrorContainer field={$companyForm.fields.legalName} />
+        </div>
+        <div class="w-full mb-2 md:mb-0 form-control">
+          <label for="name">
+            Nom commercial {isStore ? 'du magasin' : "de l'entreprise"} *
+          </label>
+          <input
+            id="name"
+            type="text"
+            placeholder="ex : La ferme des balmettes"
+            use:bindClass={{ form: companyForm, name: "name" }}
+            bind:value={company.name} />
+          <ErrorContainer field={$companyForm.fields.name} />
+        </div>
+        {#if !isStore}
+          <div class="mt-2 mb-2">
+            <label class="cursor-pointer">
+              <InputCheckbox
+                checked={company.notSubjectToVat}
+                onClick={() => (company.notSubjectToVat = !company.notSubjectToVat)} />
+              Mon entreprise n'est pas assujettie à la TVA
+            </label>
+          </div>
+        {/if}
         {#if !company.notSubjectToVat}
           <div class="w-full form-control">
             <label for="vat">N° de TVA *</label>
@@ -139,7 +160,7 @@
             </div>
             <ErrorContainer field={$companyForm.fields.vat} />
           </div>
-        {/if}
+        {/if}  
         <div class="w-full form-control">
           <label for="company_email">Email de contact *</label>
           <input
@@ -192,16 +213,6 @@
           <label for="country">Pays *</label>
           <CountrySelect bind:selectedValue={company.legals.address.country} formName={companyForm} name="country" {errorsHandler} />
         </div>
-        {#if !isStore}
-          <div class="mt-2">
-            <label class="cursor-pointer">
-              <InputCheckbox
-                checked={company.notSubjectToVat}
-                onClick={() => (company.notSubjectToVat = !company.notSubjectToVat)} />
-              Mon entreprise n'est pas assujettie à la TVA
-            </label>
-          </div>
-        {/if}
       </div> 
     </div>
   </fieldset>