From bc5610e907bdd272fef2c3b44b5f22bb79635a5e Mon Sep 17 00:00:00 2001
From: jetzable <gjetzable@gmail.com>
Date: Mon, 7 Jan 2019 12:13:14 -0600
Subject: [PATCH] Refactoring

---
 src/components/BranchPicker.vue               |  7 ---
 src/components/CompanyList.vue                |  6 +--
 .../{ListItem.vue => ListCompany.vue}         |  6 +--
 src/components/ListLocation.vue               | 52 -------------------
 src/components/ListStore.vue                  | 14 ++---
 src/components/LocationList.vue               | 25 ---------
 src/components/__tests__/CompanyList.test.js  |  1 -
 src/store.js                                  | 17 +-----
 8 files changed, 12 insertions(+), 116 deletions(-)
 rename src/components/{ListItem.vue => ListCompany.vue} (91%)
 delete mode 100644 src/components/ListLocation.vue
 delete mode 100644 src/components/LocationList.vue

diff --git a/src/components/BranchPicker.vue b/src/components/BranchPicker.vue
index 2ece102..88f3a05 100644
--- a/src/components/BranchPicker.vue
+++ b/src/components/BranchPicker.vue
@@ -1,11 +1,5 @@
 <template>
   <div class="select-branch">
-    <div class="outer-20-b">
-      <a href="#">
-        Cerrar
-        <i class="far fa-times-circle"></i>
-      </a>
-    </div>
     <div class="columns">
       <CompanyList class="column companies is-half"/>
       <StoreList :class="{'is-hidden': showStoreColumn}" class="column branches is-half"/>
@@ -16,7 +10,6 @@
 import { mapGetters } from "vuex";
 import CompanyList from "./CompanyList.vue";
 import StoreList from "./StoreList.vue";
-import LocationList from "./LocationList.vue";
 
 export default {
   name: "BranchPicker",
diff --git a/src/components/CompanyList.vue b/src/components/CompanyList.vue
index f9a4b7a..a501c00 100644
--- a/src/components/CompanyList.vue
+++ b/src/components/CompanyList.vue
@@ -4,13 +4,13 @@
       <div class="icon companies"></div>
       <h4>Empresas</h4>
     </div>
-    <ListItem v-for="company in companiesFromServer" :company="company" :key="company.key"/>
+    <ListCompany v-for="company in companiesFromServer" :company="company" :key="company.emitter.tax_id"/>
   </div>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
-import ListItem from "@/components/ListItem.vue";
+import ListCompany from "@/components/ListCompany.vue";
 
 export default {
   name: "CompanyList",
@@ -21,7 +21,7 @@ export default {
     ...mapGetters(["companiesFromServer"])
   },
   components: {
-    ListItem
+    ListCompany
   }
 };
 </script>
\ No newline at end of file
diff --git a/src/components/ListItem.vue b/src/components/ListCompany.vue
similarity index 91%
rename from src/components/ListItem.vue
rename to src/components/ListCompany.vue
index eb214f7..159a356 100644
--- a/src/components/ListItem.vue
+++ b/src/components/ListCompany.vue
@@ -2,7 +2,7 @@
   <div class="item company">
     <button
       class="select-item"
-      :class="{ active: company.active }"
+      :class="{ 'active': company.active }"
       @click="handleCompanySelect(company.company_id)"
       v-if="company.status"
     >
@@ -30,13 +30,13 @@
           <div class="d-block">RFC: {{ company.emitter.tax_id }}</div>
         </span>
       </div>
-      <a class="fas fa-question-circle" @click="handleRequest(company.emitter.tax_id)"></a>
+      <a class="fas fa-question-circle" @click="(company.emitter.tax_id)"></a>
     </button>
     <!-- <Request
       :class="{'show': showRequest}"
       v-if="company.emitter.tax_id === requestId"
       :company="company"
-    />-->
+    /> -->
   </div>
 </template>
 <script>
diff --git a/src/components/ListLocation.vue b/src/components/ListLocation.vue
deleted file mode 100644
index 47eecaa..0000000
--- a/src/components/ListLocation.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
-	<div class="item">
-		<button class="select-item" v-if="company.active">
-			<div class="info">
-				<p>
-					{{ company.name }}
-					<span class="on"></span>
-					<span>{{ company.address.street }}</span>
-				</p>
-			</div>
-		</button>
-		<button class="select-item" disabled v-if="!company.active">
-			<div class="info">
-				<span>
-					{{company.name}}
-					<div class="popover_wrapper">
-						<i class="fas fa-lock-alt"></i>
-						<div class="push popover_content up">
-							<p class="popover_message">
-								No tienes
-								<strong>permiso</strong> para modificar la información
-							</p>
-						</div>
-					</div>
-					<div class="d-block">{{ company.name}}</div>
-				</span>
-			</div>
-			<a class="fas fa-question-circle" @click="handleRequest(company.branch_id)"></a>
-		</button>
-		<Request :class="{'show': showRequest}" v-if="company.key === requestId" :company="company"/>
-	</div>
-</template>
-<script>
-	import { mapGetters } from "vuex";
-	import Request from "@/components/Request.vue";
-
-	export default {
-		computed: {
-			...mapGetters(["showRequest", "requestId"])
-		},
-		props: {
-			company: {
-				type: Object,
-				required: true
-			}
-		},
-		name: "ListLocation",
-		components: {
-			Request
-		}
-	};
-</script>
diff --git a/src/components/ListStore.vue b/src/components/ListStore.vue
index 24a6904..aa92fb8 100644
--- a/src/components/ListStore.vue
+++ b/src/components/ListStore.vue
@@ -13,15 +13,11 @@
       <div class="info">
         <span>
           {{company.name}}
-          <div class="popover_wrapper">
-            <i class="fas fa-lock-alt"></i>
-            <div class="push popover_content up">
-              <p class="popover_message">
-                No tienes
-                <strong>permiso</strong> para modificar la información
-              </p>
-            </div>
-          </div>
+             <div class="popover_wrapper"><a class="fg-question-square"></a>
+               <div class="push popover_content up">
+                 <p class="popover_message">No tienes <strong>permiso</strong> para acceder a esta ubicación, solicítalo <a class="requestbranch" href="#">aquí</a>.</p>
+               </div>
+             </div>
           <div class="d-block">RFC: {{ company.branch_id}}</div>
         </span>
       </div>
diff --git a/src/components/LocationList.vue b/src/components/LocationList.vue
deleted file mode 100644
index bf77ef6..0000000
--- a/src/components/LocationList.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-	<div class="column" style="border: 2px solid yellow;">
-		<div class="select-title">
-			<div class="icon location"></div>
-			<h4>Ubicación</h4>
-		</div>
-		<div v-for="location in locationList" :key="location.key">
-			<ListLocation :company="location"/>
-		</div>
-	</div>
-</template>
-<script>
-	import ListLocation from "./ListLocation";
-	import { mapGetters } from "vuex";
-
-	export default {
-		name: "StoreLocation",
-		computed: {
-			...mapGetters(["locationList"])
-		},
-		components: {
-			ListLocation
-		}
-	};
-</script>
diff --git a/src/components/__tests__/CompanyList.test.js b/src/components/__tests__/CompanyList.test.js
index e08d01e..5a0d8c1 100644
--- a/src/components/__tests__/CompanyList.test.js
+++ b/src/components/__tests__/CompanyList.test.js
@@ -71,7 +71,6 @@ describe("CompanyList", () => {
         }
       }
     ],
-    showRequest: () => false,
     branchList: () => branches,
     showStoreColumn: () => true
   };
diff --git a/src/store.js b/src/store.js
index bf59c18..3ccabb8 100644
--- a/src/store.js
+++ b/src/store.js
@@ -11,15 +11,9 @@ export const mutations = {
   setBranchList: (state, payload) => {
     state.branchList = payload;
   },
-  setLocationList: (state, payload) => {
-    state.locationList = payload;
-  },
   setShowStoreColumn: (state, payload) => {
     state.showStoreColumn = payload;
   },
-  setshowLocationColumn: (state, payload) => {
-    state.showLocationColumn = payload;
-  },
   setRequestId: (state, payload) => {
     state.requestId = payload;
   },
@@ -69,16 +63,11 @@ export const actions = {
       return {
         ...store,
         ...{
-          status: store.branch_id === payload
+          active: store.branch_id === payload
         }
       }
     });
     commit("setBranchList", stores);
-    const locations = state.branchList.filter(location => {
-      return location.branch_id === payload
-    });
-    commit('setLocationList', locations);
-    commit('setshowLocationColumn', !state.showLocationColumn);
   },
   getCompaniesFromServer: ({
     commit
@@ -107,9 +96,7 @@ export const actions = {
 export const state = {
   companiesFromServer: [],
   branchList: [],
-  locationList: [],
   showStoreColumn: true,
-  showLocationColumn: true,
   showRequest: false,
   requestId: "",
 };
@@ -117,9 +104,7 @@ export const state = {
 export const getters = {
   companiesFromServer: state => state.companiesFromServer,
   branchList: state => state.branchList,
-  locationList: state => state.locationList,
   showStoreColumn: state => state.showStoreColumn,
-  showLocationColumn: state => state.showLocationColumn,
   requestId: state => state.requestId,
   showRequest: state => state.showRequest
 };