From 753dc3871367ebde35c06101b9f20db8f585d314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Grosjean?= <public@zencocoon.com>
Date: Thu, 29 Mar 2018 11:07:38 +0200
Subject: [PATCH 1/2] Fix FontAwesome upgrade and rental template

---
 app/views/bookingsync_portal/admin/help/index.html.erb      | 2 +-
 .../admin/rentals/_connected_rental.html.erb                | 4 ++--
 .../admin/rentals/_new_remote_account.html.erb              | 2 +-
 .../bookingsync_portal/admin/rentals/_rentals.html.erb      | 6 +++---
 app/views/bookingsync_portal/admin/rentals/index.html.erb   | 4 ++--
 app/views/layouts/bookingsync_portal/_menu.html.erb         | 2 +-
 lib/generators/templates/models/rental.rb                   | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/bookingsync_portal/admin/help/index.html.erb b/app/views/bookingsync_portal/admin/help/index.html.erb
index d94680e2..d0fcd165 100644
--- a/app/views/bookingsync_portal/admin/help/index.html.erb
+++ b/app/views/bookingsync_portal/admin/help/index.html.erb
@@ -1,6 +1,6 @@
 <article>
   <header>
-    <%= link_to icon("times", t('.close')), admin_root_path, class: "pull-right" %>
+    <%= link_to icon("far", "times", t('.close')), admin_root_path, class: "pull-right" %>
     <h1><%=t '.title' %></h1>
   </header>
   <%= render 'help' %>
diff --git a/app/views/bookingsync_portal/admin/rentals/_connected_rental.html.erb b/app/views/bookingsync_portal/admin/rentals/_connected_rental.html.erb
index e189d67d..48e344b9 100644
--- a/app/views/bookingsync_portal/admin/rentals/_connected_rental.html.erb
+++ b/app/views/bookingsync_portal/admin/rentals/_connected_rental.html.erb
@@ -17,9 +17,9 @@
           class: ["btn", "btn-xs", "remove-connection", rental.remote_rental.synchronized? ? "btn-success" : "btn-warning"],
           data: { disable_with: t('.disconnecting_rental') }, method: :delete, remote: true do %>
           <% unless rental.remote_rental.synchronized? %>
-            <span class="hover_hide"><%= icon('spinner') %></span>
+            <span class="hover_hide"><%= icon("far", "spinner") %></span>
           <% else %>
-            <span class="hover_hide"><%= icon('check') %></span>
+            <span class="hover_hide"><%= icon("far", "check") %></span>
           <% end %>
           <span class="hover_show"><%= t('.disconnect_rental') %></span>
         <% end %>
diff --git a/app/views/bookingsync_portal/admin/rentals/_new_remote_account.html.erb b/app/views/bookingsync_portal/admin/rentals/_new_remote_account.html.erb
index 743a995c..bbf27599 100644
--- a/app/views/bookingsync_portal/admin/rentals/_new_remote_account.html.erb
+++ b/app/views/bookingsync_portal/admin/rentals/_new_remote_account.html.erb
@@ -1,3 +1,3 @@
 <%= link_to new_admin_remote_account_path, class: "btn btn-default" do %>
-  <%= icon :plus %> <%= t '.connect_accounts' %>
+  <%= icon "far", "plus" %> <%= t '.connect_accounts' %>
 <% end %>
diff --git a/app/views/bookingsync_portal/admin/rentals/_rentals.html.erb b/app/views/bookingsync_portal/admin/rentals/_rentals.html.erb
index 7066e77d..744c2e31 100644
--- a/app/views/bookingsync_portal/admin/rentals/_rentals.html.erb
+++ b/app/views/bookingsync_portal/admin/rentals/_rentals.html.erb
@@ -1,6 +1,6 @@
 <%- if visible_rentals.count == 0 -%>
   <div class="lead text-center well">
-    <p><%= t('.no_published_rentals_html', id: current_account.synced_id) %></p>
+    <p><%= t(".no_published_rentals_html", id: current_account.synced_id) %></p>
   </div>
 <%- elsif not_connected_rentals.count > 0 -%>
   <% not_connected_rentals.each do |rental| %>
@@ -8,7 +8,7 @@
   <% end %>
 <%- else -%>
   <div class="lead text-center well">
-    <p class=""><%= icon 'thumbs-up fa-lg' %></p>
-    <p><%=t '.all_synchronized' %></p>
+    <p class=""><%= icon "far", "thumbs-up fa-lg" %></p>
+    <p><%=t ".all_synchronized" %></p>
   </div>
 <%- end -%>
diff --git a/app/views/bookingsync_portal/admin/rentals/index.html.erb b/app/views/bookingsync_portal/admin/rentals/index.html.erb
index ff40aadb..c09de281 100644
--- a/app/views/bookingsync_portal/admin/rentals/index.html.erb
+++ b/app/views/bookingsync_portal/admin/rentals/index.html.erb
@@ -1,6 +1,6 @@
 <%- content_for :navbar_right do -%>
   <ul class="nav navbar-nav">
-    <li><%= link_to icon("life-ring", t('.help')), admin_help_path %></li>
+    <li><%= link_to icon("far", "life-ring", t('.help')), admin_help_path %></li>
   </ul>
 <%- end -%>
 <div class="rentals-container row">
@@ -39,7 +39,7 @@
             <% end %>
           <%- elsif !BookingsyncPortal.create_remote_rental -%>
             <div class="lead text-center well">
-              <p class=""><%= icon 'info fa-lg' %></p>
+              <p class=""><%= icon "far", "info fa-lg" %></p>
               <p><%=t '.create_listings_first', portal_name: BookingsyncPortal.portal_name %></p>
             </div>
           <%- end -%>
diff --git a/app/views/layouts/bookingsync_portal/_menu.html.erb b/app/views/layouts/bookingsync_portal/_menu.html.erb
index 64ff3fbb..cd9b351c 100644
--- a/app/views/layouts/bookingsync_portal/_menu.html.erb
+++ b/app/views/layouts/bookingsync_portal/_menu.html.erb
@@ -13,7 +13,7 @@
         </button>
       <%- end -%>
       <div>
-        <%= link_to icon("globe", BookingsyncPortal.portal_name), admin_root_path,
+        <%= link_to icon("far", "globe", BookingsyncPortal.portal_name), admin_root_path,
           class: "navbar-brand h1",
           data: { toggle: "dropdown" } %>
         </a>
diff --git a/lib/generators/templates/models/rental.rb b/lib/generators/templates/models/rental.rb
index effcf648..23cec653 100644
--- a/lib/generators/templates/models/rental.rb
+++ b/lib/generators/templates/models/rental.rb
@@ -3,7 +3,7 @@ class Rental < BookingsyncPortal::Rental
     local_attributes: [:position, :published_at],
     include: [:availability],
     delegate_attributes: [:name, :sleeps, :sleeps_max, :bedrooms_count, :bathrooms_count,
-      :surface, :surface_symbol]
+      :surface, :surface_unit]
 
   def surface_unit_symbol
     surface_unit == "imperial" ? "ft²" : "m²"

From b0523d32eda692fe18be3bc7cf204a5b5fd25188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Grosjean?= <public@zencocoon.com>
Date: Thu, 29 Mar 2018 23:12:45 +0200
Subject: [PATCH 2/2] Fix icons

---
 app/views/bookingsync_portal/admin/help/index.html.erb        | 2 +-
 .../admin/rentals/_connected_rental.html.erb                  | 4 ++--
 .../admin/rentals/_new_remote_account.html.erb                | 2 +-
 app/views/bookingsync_portal/admin/rentals/_rentals.html.erb  | 2 +-
 app/views/bookingsync_portal/admin/rentals/index.html.erb     | 4 ++--
 app/views/layouts/bookingsync_portal/_menu.html.erb           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/bookingsync_portal/admin/help/index.html.erb b/app/views/bookingsync_portal/admin/help/index.html.erb
index d0fcd165..0bcbbc09 100644
--- a/app/views/bookingsync_portal/admin/help/index.html.erb
+++ b/app/views/bookingsync_portal/admin/help/index.html.erb
@@ -1,6 +1,6 @@
 <article>
   <header>
-    <%= link_to icon("far", "times", t('.close')), admin_root_path, class: "pull-right" %>
+    <%= link_to icon("fa", "times", t('.close')), admin_root_path, class: "pull-right" %>
     <h1><%=t '.title' %></h1>
   </header>
   <%= render 'help' %>
diff --git a/app/views/bookingsync_portal/admin/rentals/_connected_rental.html.erb b/app/views/bookingsync_portal/admin/rentals/_connected_rental.html.erb
index 48e344b9..e61271bb 100644
--- a/app/views/bookingsync_portal/admin/rentals/_connected_rental.html.erb
+++ b/app/views/bookingsync_portal/admin/rentals/_connected_rental.html.erb
@@ -17,9 +17,9 @@
           class: ["btn", "btn-xs", "remove-connection", rental.remote_rental.synchronized? ? "btn-success" : "btn-warning"],
           data: { disable_with: t('.disconnecting_rental') }, method: :delete, remote: true do %>
           <% unless rental.remote_rental.synchronized? %>
-            <span class="hover_hide"><%= icon("far", "spinner") %></span>
+            <span class="hover_hide"><%= icon("fa", "spinner") %></span>
           <% else %>
-            <span class="hover_hide"><%= icon("far", "check") %></span>
+            <span class="hover_hide"><%= icon("fa", "check") %></span>
           <% end %>
           <span class="hover_show"><%= t('.disconnect_rental') %></span>
         <% end %>
diff --git a/app/views/bookingsync_portal/admin/rentals/_new_remote_account.html.erb b/app/views/bookingsync_portal/admin/rentals/_new_remote_account.html.erb
index bbf27599..b8e620d6 100644
--- a/app/views/bookingsync_portal/admin/rentals/_new_remote_account.html.erb
+++ b/app/views/bookingsync_portal/admin/rentals/_new_remote_account.html.erb
@@ -1,3 +1,3 @@
 <%= link_to new_admin_remote_account_path, class: "btn btn-default" do %>
-  <%= icon "far", "plus" %> <%= t '.connect_accounts' %>
+  <%= icon "fa", "plus" %> <%= t '.connect_accounts' %>
 <% end %>
diff --git a/app/views/bookingsync_portal/admin/rentals/_rentals.html.erb b/app/views/bookingsync_portal/admin/rentals/_rentals.html.erb
index 744c2e31..b7999d41 100644
--- a/app/views/bookingsync_portal/admin/rentals/_rentals.html.erb
+++ b/app/views/bookingsync_portal/admin/rentals/_rentals.html.erb
@@ -8,7 +8,7 @@
   <% end %>
 <%- else -%>
   <div class="lead text-center well">
-    <p class=""><%= icon "far", "thumbs-up fa-lg" %></p>
+    <p class=""><%= icon "fa", "thumbs-up fa-lg" %></p>
     <p><%=t ".all_synchronized" %></p>
   </div>
 <%- end -%>
diff --git a/app/views/bookingsync_portal/admin/rentals/index.html.erb b/app/views/bookingsync_portal/admin/rentals/index.html.erb
index c09de281..dc528f49 100644
--- a/app/views/bookingsync_portal/admin/rentals/index.html.erb
+++ b/app/views/bookingsync_portal/admin/rentals/index.html.erb
@@ -1,6 +1,6 @@
 <%- content_for :navbar_right do -%>
   <ul class="nav navbar-nav">
-    <li><%= link_to icon("far", "life-ring", t('.help')), admin_help_path %></li>
+    <li><%= link_to icon("fa", "life-ring", t('.help')), admin_help_path %></li>
   </ul>
 <%- end -%>
 <div class="rentals-container row">
@@ -39,7 +39,7 @@
             <% end %>
           <%- elsif !BookingsyncPortal.create_remote_rental -%>
             <div class="lead text-center well">
-              <p class=""><%= icon "far", "info fa-lg" %></p>
+              <p class=""><%= icon "fa", "info fa-lg" %></p>
               <p><%=t '.create_listings_first', portal_name: BookingsyncPortal.portal_name %></p>
             </div>
           <%- end -%>
diff --git a/app/views/layouts/bookingsync_portal/_menu.html.erb b/app/views/layouts/bookingsync_portal/_menu.html.erb
index cd9b351c..1e4a5814 100644
--- a/app/views/layouts/bookingsync_portal/_menu.html.erb
+++ b/app/views/layouts/bookingsync_portal/_menu.html.erb
@@ -13,7 +13,7 @@
         </button>
       <%- end -%>
       <div>
-        <%= link_to icon("far", "globe", BookingsyncPortal.portal_name), admin_root_path,
+        <%= link_to icon("fa", "globe", BookingsyncPortal.portal_name), admin_root_path,
           class: "navbar-brand h1",
           data: { toggle: "dropdown" } %>
         </a>