bookingsync_portal 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 883ef9dd634929c8ad2e22a7ca7a0c1a8870c486
-  data.tar.gz: b463a96bfd2ca504685f5cd5fc5de68b7820adca
+  metadata.gz: c409dc3f373173cf63975b3e7deea34767d19a3d
+  data.tar.gz: bea7083a6fb9bde9eeeb60da4101db6b1d501206
 SHA512:
-  metadata.gz: 030b887351b316322b4a958e1a4ca4b7097f52e7c46898012d82de9d8a473be5b1ed90845aebb399be694eb2887a6ee811820debf9bb152a3e5c5e8ae98e8fec
-  data.tar.gz: 647c7f128b8d5b9dd0adbffa65dfde59e9fa5291d207952d24ccc6a98580906ab6a0e137b4fe9d76a334801db51f17d539fdf76b04b7f88c08136ef71c5c3742
+  metadata.gz: b86598c7bca993d3105cbb5518f22cbce58c90355dc2f09c16b4ac65168423e389f4b60f07897b7ec6921f48fdc5f315f6f9efc58934c1c0a1af54bbd4195da4
+  data.tar.gz: 30dbf6577ba6ddfcaf4206c0e96c2f7bddcc264fe2ae4b0a99a96c0e93dd35fa2095b82a6c4af1b1a715de5e8096cb64a46c0fd78774ba5c574799595481113c

data/app/assets/javascripts/bookingsync_portal/admin/application.js.coffee

@@ -23,3 +23,7 @@
 #= require ./lib/list-filter
 #= require_tree ./templates
 #= require_tree .
+
+window.extractIdFromDomId = (attribute) ->
+  if attribute
+    attribute.split("_").pop()

data/app/assets/javascripts/bookingsync_portal/admin/connections.js.coffee

@@ -0,0 +1,48 @@
+$ ->
+  $(".bookingsync-rental").draggable
+    revert: "invalid"
+    zIndex: 50
+    revertDuration: 100
+    cursor: "move"
+    containment: '.rentals-container'
+    appendTo: '.rentals-container'
+    helper: "clone"
+    scroll: false
+
+    start: (e, ui) ->
+      $(ui.helper).addClass "ui-draggable-helper"
+
+  $(".panel.panel-remote").droppable
+    accept: ".bookingsync-rental"
+    activeClass: "dropzone-active"
+    hoverClass: "dropzone-hover"
+    greedy: true
+    tolerance: "pointer"
+    drop: (event, ui) ->
+      remoteRentalDropZone = $(@)
+
+      rentalId = extractIdFromDomId($(ui.draggable).attr("id"))
+      remoteRentalId = extractIdFromDomId(remoteRentalDropZone.attr("id"))
+      remoteAccountId = remoteRentalDropZone.data("remote-account-id")
+      remoteRentalUid = remoteRentalDropZone.data("uid")
+
+      if remoteRentalId
+        postData = { "rental_id": rentalId, "remote_rental_id": remoteRentalId }
+      else
+        postData = { "rental_id": rentalId, "remote_account_id": remoteAccountId }
+        # clone new remote rental drop zone and append to the end
+        remoteRentalDropZone.clone().insertBefore(remoteRentalDropZone).addClass('new_rental_placeholder');
+
+      $(ui.draggable).remove()
+
+      connect_url = $('.remote-rentals-list.rentals-list').data('connect-url')
+
+      $.ajax
+        url: connect_url
+        type: "POST"
+        data: postData
+        dataType: 'script'
+        beforeSend: ->
+          $(@).addClass('loading')
+        success: ->
+          $(@).removeClass('loading')

data/app/assets/javascripts/bookingsync_portal/admin/rentals.js.coffee

@@ -1,83 +1,4 @@
 $ ->
-  $(".bookingsync-rental").draggable
-    revert: "invalid"
-    zIndex: 50
-    revertDuration: 100
-    cursor: "move"
-    containment: '.rentals-container'
-    appendTo: '.rentals-container'
-    helper: "clone"
-    scroll: false
-
-    start: (e, ui) ->
-      $(ui.helper).addClass "ui-draggable-helper"
-
-  $(".not-connected-remote-rental").droppable
-    accept: ".bookingsync-rental"
-    activeClass: "dropzone-active"
-    hoverClass: "dropzone-hover"
-    greedy: true
-    tolerance: "pointer"
-    drop: (event, ui) ->
-      remoteRental = $(@)
-
-      rentalId = parseInt($(ui.draggable).attr("id").split("_").pop())
-      remoteRentalId = parseInt(remoteRental.attr("id").split("_").pop())
-      remoteRentalUid = parseInt(remoteRental.data("uid"))
-
-      remoteRental.replaceWith HandlebarsTemplates["rentals/connected_rental"]
-        rentalName: $(ui.draggable).children('.panel-heading').text()
-        rentalDescription: $(ui.draggable).children('.panel-body').html()
-        rentalId: rentalId
-        listingId: "Listing #" + remoteRentalUid
-      $(ui.draggable).remove()
-
-      connect_url = "/en/admin/rentals/" + rentalId + "/connect" +
-        "?remote_rental_id=" + remoteRentalId
-
-      $.ajax
-        url: connect_url
-        type: "PUT"
-        dataType: 'json'
-        beforeSend: ->
-          $(@).addClass('loading')
-        success: ->
-          $(@).removeClass('loading')
-
-  $(".remote-new-rental").droppable
-    accept: ".bookingsync-rental"
-    activeClass: "dropzone-active"
-    hoverClass: "dropzone-hover"
-    greedy: true
-    tolerance: "pointer"
-    drop: (event, ui) ->
-      rentalId = parseInt($(ui.draggable).attr("id").split("_")[1])
-      remoteAccountId = parseInt($(@).data("remote-account-id"))
-
-      newRental = HandlebarsTemplates["rentals/connected_rental"]
-        rentalName: $(ui.draggable).children('.panel-heading').text()
-        rentalDescription: $(ui.draggable).children('.panel-body').html()
-        rentalId: rentalId
-
-      rentalsScrollingList = $(@).closest(".rentals-list").find(".rentals-list-scroll")
-      $(newRental).appendTo(rentalsScrollingList).addClass('pending')
-      rentalsScrollingList.animate
-        scrollTop: rentalsScrollingList.prop("scrollHeight")
-
-      $(ui.draggable).remove()
-
-      new_connect_url = "/en/admin/rentals/" + rentalId + "/connect_to_new" +
-        "?remote_account_id=" + remoteAccountId
-
-      $.ajax
-        url: new_connect_url
-        type: "PUT"
-        dataType: 'json'
-        beforeSend: ->
-          $(@).addClass('loading')
-        success: ->
-          $(@).removeClass('loading')
-
   for rentalsList, index in $(".rentals-list")
     inputId = "rentals-list-filter-#{index}"
     new ListFilter(

data/app/assets/stylesheets/bookingsync_portal/admin/application.css.scss

@@ -1,5 +1,3 @@
-$dropzone-active-bg: #fbf9ee;
-
 @import "font-awesome-sprockets";
 @import "font-awesome";
 @import "bootstrap-bookingsync-sprockets";
@@ -112,20 +110,6 @@ body > .footer {
 .remote-rentals-list {
   background-color: #fff;
 
-  &.dropzone-active {
-    border: 1px dashed darken($dropzone-active-bg, 7%);
-    background-color: lighten($dropzone-active-bg, 2%);
-  }
-
-  &.dropzone-hover {
-    border: 1px solid darken($dropzone-active-bg, 7%);
-    background-color: $dropzone-active-bg;
-
-    .remote-new-rental {
-      border: 1px solid $btn-success-border;
-    }
-  }
-
   .dropzone-active {
     border: 1px dashed $btn-success-border;
   }
@@ -201,40 +185,36 @@ body > .footer {
 }
 
 .panel-connected {
-  &.pending {
-    border-color: darken($dropzone-active-bg, 7%);
-
-    .panel-heading {
-      background-color: $dropzone-active-bg;
-      color: darken($dropzone-active-bg, 50%);
-    }
-  }
-
   .panel-heading {
     position: relative;
   }
 
-  .remove-connection {
+  .status {
     position: absolute;
     right: 3px;
     top: 8px;
-    border-radius: 11px;
-
-    span {
-      display: none;
-    }
-
-    &:hover {
-      background-color: $brand-danger;
-      border-color: $brand-danger;
-      border-radius: $border-radius-small;
 
-      i {
+    .remove-connection {
+      .hover_show {
         display: none;
       }
 
-      span {
-        display: block;
+      .fa-check {
+        border-radius: 11px;
+      }
+
+      &:hover {
+        background-color: $brand-danger;
+        border-color: $brand-danger;
+        border-radius: $border-radius-small;
+
+        .hover_hide {
+          display: none;
+        }
+
+        .hover_show {
+          display: block;
+        }
       }
     }
   }

data/app/controllers/bookingsync_portal/admin/base_controller.rb

@@ -3,6 +3,7 @@ require 'bookingsync_application/admin/common_base_controller'
 module BookingsyncPortal
   module Admin
     class BaseController < ApplicationController
+      helper BookingsyncPortal::Admin::ApplicationHelper
       layout 'bookingsync_portal/admin'
       respond_to :html
       include BookingsyncApplication::Admin::CommonBaseController

data/app/controllers/bookingsync_portal/admin/connections_controller.rb

@@ -0,0 +1,45 @@
+module BookingsyncPortal
+  module Admin
+    class ConnectionsController < Admin::BaseController
+      def create
+        if remote_account? && BookingsyncPortal.create_remote_rental
+          new_remote_rental = BookingsyncPortal.remote_rental_model.constantize.new(remote_account: remote_account)
+          @connection = rental.create_connection(remote_rental: new_remote_rental)
+        else
+          @connection = rental.create_connection(remote_rental: remote_rental)
+        end
+
+        respond_to do |wants|
+          wants.html { redirect_to admin_rentals_path }
+          wants.js
+        end
+      end
+
+      def destroy
+        connection = current_account.connections.find(params[:id]).destroy
+
+        respond_to do |wants|
+          wants.html { redirect_to admin_rentals_path }
+        end
+      end
+
+      private
+
+      def rental
+        @rental ||= current_account.rentals.not_connected.visible.find(params[:rental_id])
+      end
+
+      def remote_rental
+        @remote_rental ||= current_account.remote_rentals.not_connected.find(params[:remote_rental_id])
+      end
+
+      def remote_account
+        @remote_account ||= current_account.remote_accounts.find(params[:remote_account_id])
+      end
+
+      def remote_account?
+        params[:remote_account_id].present? && remote_account
+      end
+    end
+  end
+end

data/app/controllers/bookingsync_portal/admin/rentals_controller.rb

@@ -16,24 +16,6 @@ module BookingsyncPortal
         rental
       end
 
-      def connect
-        remote_rental = current_account.remote_rentals.find(params[:remote_rental_id])
-        connection = rental.build_connection(remote_rental: remote_rental)
-        connection.save
-
-        BookingsyncPortal.connection_created(connection)
-        redirect_or_js_response
-      end
-
-      def disconnect
-        connection = rental.connection
-        rental.remote_rental.update_attribute(:synchronized_at, nil)
-        connection.destroy
-
-        BookingsyncPortal.connection_destroyed(connection)
-        redirect_or_js_response
-      end
-
       private
 
       def synchronize_rentals
@@ -49,13 +31,6 @@ module BookingsyncPortal
       def rental
         @rental ||= current_account.rentals.visible.find(params[:id])
       end
-
-      def redirect_or_js_response
-        respond_to do |wants|
-          wants.html { redirect_to admin_rentals_path }
-          wants.json { head :ok }
-        end
-      end
     end
   end
 end

data/app/helpers/bookingsync_portal/admin/{rentals_helper.rb → application_helper.rb}

@@ -1,6 +1,6 @@
 module BookingsyncPortal
   module Admin
-    module RentalsHelper
+    module ApplicationHelper
       def rental_details(rental)
         scope = 'bookingsync_portal.admin.rentals.rental'
 

data/app/models/bookingsync_portal/connection.rb

@@ -9,6 +9,15 @@ class BookingsyncPortal::Connection < ActiveRecord::Base
 
   validate :matching_accounts, if: -> { rental && remote_rental }
 
+  after_save :notify_via_message_bus
+  after_destroy :notify_via_message_bus
+
+  def notify_via_message_bus
+    MessageBus.publish "/account-#{rental.account_id}", { refresh_from:
+      BookingsyncPortal::Engine.routes.url_helpers.admin_rental_path(rental, format: :js)
+    }
+  end
+
   private
 
   def matching_accounts?

data/app/models/bookingsync_portal/remote_rental.rb

@@ -17,6 +17,10 @@ class BookingsyncPortal::RemoteRental < ActiveRecord::Base
   scope :connected, -> { joins(:rental) }
   scope :not_connected, -> { includes(:rental).where(rentals: { id: nil }) }
 
+  def display_name
+    uid
+  end
+
   def connected?
     rental.present?
   end

data/app/views/bookingsync_portal/admin/connections/create.js.erb

@@ -0,0 +1,5 @@
+<%- if @connection.persisted? %>
+  $("#<%= dom_id @connection.remote_rental %>, .new_rental_placeholder").replaceWith(
+   "<%=j render 'bookingsync_portal/admin/rentals/connected_rental', rental: @connection.rental, remote_rental: @connection.remote_rental,
+      disconnect_url: bookingsync_portal.admin_connection_url(@connection) %>");
+<%- end %>

data/app/views/bookingsync_portal/admin/rentals/_connected_rental.html.erb

@@ -1,31 +1,29 @@
-<%-
-disconnect_label = content_tag(:i, "", { class: 'fa fa-check' }) + h(" ") +
-  content_tag(:span, t('.disconnect_rental'))
--%>
-<div
-  class="panel panel-connected <%= "pending" unless remote_rental.synchronized? %>"
-  id="<%= dom_id rental %>">
-  <% if rental.remote_rental.synchronized? %>
-    <div class="panel-body-grid">
-      <div class="panel-body-grid-photo">
-        <%- if rental.ordered_photos.first -%>
-          <%= image_tag rental.ordered_photos.first.thumb_url, class: "img-responsive" %>
-        <%- end -%>
-      </div>
-      <div class="panel-body-grid-text">
-        <h4 title="<%= RemoteRental.human_attribute_name(:name) %>: <%= remote_rental.name %>
-          <%= RemoteRental.human_attribute_name(:uid) %>: <%= remote_rental.uid %>">
-            <%= remote_rental.rental.name %>
-        </h4>
-        <%= link_to disconnect_label,
-          bookingsync_portal.disconnect_admin_rental_path(rental),
-          class: "btn btn-default btn-xs btn-success remove-connection",
-          data: { disable_with: t('.disconnecting_rental') },
-          method: :put %>
-        <p class="text-overflow"><%= rental_details(rental) %></p>
+<div id="<%= dom_id rental %>"
+  class="panel panel-connected <%= "pending" unless rental.remote_rental.synchronized? %>">
+
+  <div class="panel-body-grid">
+    <div class="panel-body-grid-photo">
+      <%- if rental.ordered_photos.first -%>
+        <%= image_tag rental.ordered_photos.first.thumb_url, class: "img-responsive" %>
+      <%- end -%>
+    </div>
+    <div class="panel-body-grid-text">
+      <h4 title="<%= RemoteRental.human_attribute_name(:uid) %>: <%= remote_rental.uid %>">
+          <%= remote_rental.display_name %> / <%= rental.name %>
+      </h4>
+      <div class="status">
+        <%= link_to bookingsync_portal.admin_connection_path(rental.connection),
+          class: ["btn", "btn-xs", "remove-connection", rental.remote_rental.synchronized? ? "btn-success" : "btn-warning"],
+          data: { disable_with: t('.disconnecting_rental') }, method: :delete do %>
+          <% unless rental.remote_rental.synchronized? %>
+            <span class="hover_hide"><%= icon('spinner') %></span>
+          <% else %>
+            <span class="hover_hide"><%= icon('check') %></span>
+          <% end %>
+          <span class="hover_show"><%= t('.disconnect_rental') %></span>
+        <% end %>
       </div>
+      <p class="text-overflow"><%= rental_details(rental) %></p>
     </div>
-  <% else %>
-    <div class="panel-body"><%= icon('spinner fa-spin', t('.synchronizing')) %></div>
-  <% end %>
+  </div>
 </div>

data/app/views/bookingsync_portal/admin/rentals/_new_remote_rental.html.erb

@@ -0,0 +1,6 @@
+<div class="panel panel-remote"
+  data-remote-account-id="<%= remote_account.id %>">
+  <div class="panel-body-grid text-center">
+    <%=t ".drop_here", portal_name: BookingsyncPortal.portal_name %>
+  </div>
+</div>

data/app/views/bookingsync_portal/admin/rentals/_remote_rental.html.erb

@@ -1,11 +1,11 @@
-<div class="panel panel-remote not-connected-remote-rental" id="<%= dom_id remote_rental %>"
+<div class="panel panel-remote" id="<%= dom_id remote_rental %>"
   data-uid="<%= remote_rental.uid %>">
   <div class="panel-body-grid">
     <div class="panel-body-grid-photo">
     </div>
     <div class="panel-body-grid-text">
       <h4 title="<%= RemoteRental.human_attribute_name(:uid) %>
-        <%= remote_rental.uid %>"><%= remote_rental.name %></h4>
+        <%= remote_rental.uid %>"><%= remote_rental.display_name %></h4>
       <p class="text-overflow"></p>
     </div>
   </div>

data/app/views/bookingsync_portal/admin/rentals/_rental.html.erb

@@ -1,6 +1,5 @@
 <div class="panel panel-bookingsync bookingsync-rental"
-  id="<%= dom_id rental %>"
-  data-connect-url="<%= connect_admin_rental_url(rental) %>">
+  id="<%= dom_id rental %>">
   <div class="panel-body-grid">
     <div class="panel-body-grid-photo">
       <%- if rental.ordered_photos.first -%>

data/app/views/bookingsync_portal/admin/rentals/index.html.erb

@@ -28,7 +28,8 @@
     </div>
   </div>
   <div class="col-xs-6">
-    <div class="remote-rentals-list rentals-list">
+    <div class="remote-rentals-list rentals-list"
+      data-connect-url="<%= bookingsync_portal.admin_connections_url %>">
       <div class="rentals-list-header">
         <legend class="text-center">
           <%= image_tag("#{BookingsyncPortal.portal_name.parameterize}.png",
@@ -48,12 +49,15 @@
                 <%= render "remote_rental", remote_rental: remote_rental %>
               <% end %>
             <% end %>
-          <%- else -%>
+          <%- elsif !BookingsyncPortal.create_remote_rental -%>
             <div class="lead text-center well">
               <p class=""><%= icon 'info fa-lg' %></p>
-              <p><%=t '.create_listings_first' %></p>
+              <p><%=t '.create_listings_first', portal_name: BookingsyncPortal.portal_name %></p>
             </div>
           <%- end -%>
+          <%- if BookingsyncPortal.create_remote_rental -%>
+            <%= render "new_remote_rental", remote_account: remote_account %>
+          <%- end -%>
         <% end %>
       </div>
       <div class="rentals-list-footer text-center">

data/app/views/bookingsync_portal/admin/rentals/show.js.erb

@@ -1,6 +1,7 @@
 $("#<%= dom_id @rental %>").replaceWith(
   <%- if @rental.connected? %>
-  "<%=j render 'connected_rental', rental: @rental, remote_rental: @rental.remote_rental %>");
+   "<%=j render 'connected_rental', rental: @rental, remote_rental: @rental.remote_rental,
+      disconnect_url: bookingsync_portal.admin_connection_url(@rental.connection) %>");
   <%- else %>
-  "<%=j render 'rental', rental: @rental %>");
+   "<%=j render 'rental', rental: @rental %>");
   <%- end %>

data/config/locales/en.yml

@@ -41,12 +41,14 @@ en:
       rentals:
         new_remote_account:
           connect_accounts: Connect additional accounts
+        new_remote_rental:
+          drop_here: "Drop here to create a new rental on %{portal_name}"
         index:
           connect: Connect
           bookingsync_header: "BookingSync: %{account_name}"
           all_synchronized: Perfect! All your rentals are synchronized.
           no_published_rentals_html: 'No published rentals present, please make sure to <a href="https://www.bookingsync.com/en/admin/v2/%{id}/rentals" target="_blank">fill all your rentals details</a>.'
-          create_listings_first: You must create your rentals on Remote Account before you can synchronize them automatically.
+          create_listings_first: "You must create your rentals on %{portal_name} before you can synchronize them automatically."
           connect_accounts: Add External Portal Account
           remote_header: "%{portal_name}: %{account_name}"
           help: Help

data/config/routes.rb

@@ -1,9 +1,7 @@
 BookingsyncPortal::Engine.routes.draw do
   namespace :admin do
-    resources :rentals, only: [:index, :show] do
-      put :disconnect, on: :member
-      put :connect, on: :member
-    end
+    resources :rentals, only: [:index, :show]
+    resources :connections, only: [:create, :destroy]
     resources :remote_accounts, only: [:new, :create]
     get 'help', to: 'help#index'
     root to: 'rentals#index'

data/lib/bookingsync_portal.rb

@@ -21,6 +21,13 @@ module BookingsyncPortal
   mattr_accessor :portal_name
   @@portal_name = 'Portal'
 
+  # source name for use in bookings
+  mattr_accessor :source_name
+
+  # Allow to create a remote rental from this app.
+  mattr_accessor :create_remote_rental
+  @@create_remote_rental = false
+
   # account model class
   mattr_accessor :account_model
   @@account_model = 'BookingsyncPortal::Account'
@@ -49,20 +56,9 @@ module BookingsyncPortal
   mattr_accessor :rate_model
   @@rate_model = 'BookingsyncPortal::Rate'
 
-  # source name for use in bookings
-  mattr_accessor :source_name
-
   # message bus channel scope
   mattr_accessor :message_bus_channel_scope
 
-  # handle synchronization of rentals after connection is made
-  def self.connection_created(connection)
-  end
-
-  # handle synchronization of rentals after connection is destroyed
-  def self.connection_destroyed(connection)
-  end
-
   # fetch remote rentals
   def self.fetch_remote_rentals(account)
     # return false if remote account is not present or not valid

data/lib/bookingsync_portal/version.rb

@@ -1,3 +1,3 @@
 module BookingsyncPortal
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/generators/templates/initializers/bookingsync_portal.rb

@@ -1,5 +1,17 @@
 # Use this to customize the behaviour of BookingsyncPortal engine and hook up custom synchronization
 BookingsyncPortal.setup do |config|
+  # customize the portal name
+  config.portal_name = "Replace with portal app name"
+
+  # customize the source name
+  config.source_name = "Replace with portal name"
+
+  # specify message_bus_channel_scope to allow shared redis setup
+  config.message_bus_channel_scope = 'portal_app_name'
+
+  # Allow to create a remote rental directly from this app.
+  config.create_remote_rental = false
+
   # customize account model class, can extend BookingsyncPortal::Account
   config.account_model = '::Account'
 
@@ -22,15 +34,15 @@ BookingsyncPortal.setup do |config|
   config.rate_model = '::Rate'
 
   # handle synchronization of rentals after connection is made
-  def config.connection_created(connection)
-  end
+  # def config.connection_created(connection)
+  # end
 
   # handle synchronization of rentals after connection is destroyed
-  def config.connection_destroyed(connection)
-  end
+  # def config.connection_destroyed(connection)
+  # end
 
   # fetch remote rentals
-  def config.fetch_remote_rentals(account)
-    # return false if remote account is not present or not valid
-  end
+  # def config.fetch_remote_rentals(account)
+  #   return false if remote account is not present or not valid
+  # end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookingsync_portal
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Piotr Marciniak
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -335,20 +335,21 @@ files:
 - app/assets/images/bookingsync_portal/bookingsync.png
 - app/assets/images/bookingsync_portal/help/connect.gif
 - app/assets/javascripts/bookingsync_portal/admin/application.js.coffee
+- app/assets/javascripts/bookingsync_portal/admin/connections.js.coffee
 - app/assets/javascripts/bookingsync_portal/admin/handle_remote_errors.js.coffee
 - app/assets/javascripts/bookingsync_portal/admin/lib/list-filter.js.coffee
 - app/assets/javascripts/bookingsync_portal/admin/live_updates.js.coffee
 - app/assets/javascripts/bookingsync_portal/admin/rentals.js.coffee
 - app/assets/javascripts/bookingsync_portal/admin/templates/filter_input.hbs
-- app/assets/javascripts/bookingsync_portal/admin/templates/rentals/connected_rental.hbs
 - app/assets/javascripts/bookingsync_portal/admin/vendor/css-contains.js
 - app/assets/stylesheets/bookingsync_portal/admin/application.css.scss
 - app/controllers/bookingsync_portal/admin/base_controller.rb
+- app/controllers/bookingsync_portal/admin/connections_controller.rb
 - app/controllers/bookingsync_portal/admin/help_controller.rb
 - app/controllers/bookingsync_portal/admin/remote_accounts_controller.rb
 - app/controllers/bookingsync_portal/admin/rentals_controller.rb
 - app/controllers/bookingsync_portal/application_controller.rb
-- app/helpers/bookingsync_portal/admin/rentals_helper.rb
+- app/helpers/bookingsync_portal/admin/application_helper.rb
 - app/models/bookingsync_portal/account.rb
 - app/models/bookingsync_portal/connection.rb
 - app/models/bookingsync_portal/photo.rb
@@ -358,6 +359,7 @@ files:
 - app/models/bookingsync_portal/rental.rb
 - app/synchronizers/bookingsync_portal/write/ensure_source_exists.rb
 - app/synchronizers/bookingsync_portal/write/source.rb
+- app/views/bookingsync_portal/admin/connections/create.js.erb
 - app/views/bookingsync_portal/admin/help/_help.html.erb
 - app/views/bookingsync_portal/admin/help/index.html.erb
 - app/views/bookingsync_portal/admin/remote_accounts/_form.html.erb
@@ -365,6 +367,7 @@ files:
 - app/views/bookingsync_portal/admin/remote_accounts/new.html.erb
 - app/views/bookingsync_portal/admin/rentals/_connected_rental.html.erb
 - app/views/bookingsync_portal/admin/rentals/_new_remote_account.html.erb
+- app/views/bookingsync_portal/admin/rentals/_new_remote_rental.html.erb
 - app/views/bookingsync_portal/admin/rentals/_remote_rental.html.erb
 - app/views/bookingsync_portal/admin/rentals/_rental.html.erb
 - app/views/bookingsync_portal/admin/rentals/index.html.erb

data/app/assets/javascripts/bookingsync_portal/admin/templates/rentals/connected_rental.hbs

@@ -1,8 +0,0 @@
-<div class="panel panel-connected" id="rental_{{rentalId}}"}}>
-  <div class="panel-heading" title="{{listingId}}">{{rentalName}}
-    <a href="/en/admin/rentals/{{rentalId}}/disconnect"
-      class="btn btn-default btn-xs remove-connection"
-      data-method="put">Remove Connection</a>
-  </div>
-  <div class="panel-body"><i class="fa fa-spinner fa-spin"></i> Synchronizing...</div>
-</div>