From 7f797761cabcec22fb80860d5ee15340743ada8e Mon Sep 17 00:00:00 2001
From: Pablo <pabloqb@gmail.com>
Date: Wed, 30 Jan 2019 17:56:26 +0100
Subject: [PATCH] [UPD] Done

---
 hotel_calendar/static/src/css/view.css        |  8 +++++--
 .../calendar/hotel_calendar_controller.js     | 24 ++++++++++---------
 .../src/xml/hotel_calendar_templates.xml      | 12 +++++++---
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/hotel_calendar/static/src/css/view.css b/hotel_calendar/static/src/css/view.css
index 0310a3b88..6a5cf20c6 100644
--- a/hotel_calendar/static/src/css/view.css
+++ b/hotel_calendar/static/src/css/view.css
@@ -261,7 +261,7 @@ input#bookings_search {
 }
 .fa-text-inside {
   font-family: Garuda, sans-serif;
-  font-size: 14px;
+  font-size: 12px;
 }
 .popover .col-sm-2, .popover .col-sm-4, .popover .col-sm-6, .popover .col-sm-12 {
   padding-top: 3px;
@@ -299,6 +299,10 @@ input#bookings_search {
 .mt-10 {
   margin-top: 10px !important;
 }
+.my-10 {
+  margin-top: 10px !important;
+  margin-bottom: 10px !important;
+}
 .mt-25 {
   margin-top: 25px;
 }
@@ -366,7 +370,7 @@ div.triangle-right {
 .triangle-right:before {
   content: "";
   position: absolute;
-  border: 25px solid #ddd;
+  border: 26px solid #ddd;
   height: 0;
   width: 100%;
   left: 47%;
diff --git a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js
index ce5217931..22ec2a94d 100644
--- a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js
+++ b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js
@@ -458,19 +458,21 @@ var PMSCalendarController = AbstractController.extend({
               _destroy_and_clear_popover_mark();
               var x = self._rpc({
                 model: 'hotel.reservation',
-                method: 'action_pay_folio',
+                method: '',
                 args: [ev.data.reservation_id],
               }).then(function (result){
-                return self.do_action({
-                  name: result.name,
-                  view_type: result.view_type,
-                  view_mode: result.view_mode,
-                  type: result.type,
-                  res_model: result.res_model,
-                  views: [[result.view_id, 'form']],
-                  context: result.context,
-                  target: result.target,
-                });
+                return self.do_action(result);
+              });
+            });
+            $reservationPopover.data('bs.popover').tip().find(".btn_popover_open_invoice").on('click',
+                {reservation_id: ev.detail.reservationObj.id}, function(ev){
+              _destroy_and_clear_popover_mark();
+              var x = self._rpc({
+                model: 'hotel.reservation',
+                method: 'open_invoices_reservation',
+                args: [ev.data.reservation_id],
+              }).then(function (result){
+                return self.do_action(result);
               });
             });
             $reservationPopover.data('bs.popover').tip().find(".btn_popover_close").on('click', function(ev){
diff --git a/hotel_calendar/static/src/xml/hotel_calendar_templates.xml b/hotel_calendar/static/src/xml/hotel_calendar_templates.xml
index 15c7cdffa..793163e6d 100644
--- a/hotel_calendar/static/src/xml/hotel_calendar_templates.xml
+++ b/hotel_calendar/static/src/xml/hotel_calendar_templates.xml
@@ -170,7 +170,7 @@
 	<div class="row row-eq-height mt-3">
 		<div class="col-sm-12 triangle-right">
 			<div class="col-sm-6 px-0">
-				<i class="fa fa-sign-in fa-2x fa-pull-left py-5"/>
+				<i class="fa fa-sign-in fa-2x fa-pull-left pl-5 py-5"/>
 				<h3><t t-esc="checkin"/></h3>
 				<p><t t-esc="checkin_day_of_week"/> <t t-esc="arrival_hour"/></p>
 			</div>
@@ -185,7 +185,7 @@
 
 <t t-name="HotelCalendar.TooltipReservation.Footer">
 	<div class="row row-eq-height mt-10">
-		<div class="col-sm-4 btn_popover_open_folio">
+		<div class="col-sm-4 btn_popover_open_folio pr-0">
 			<i class="fa fa-file-text-o fa-2x fa-pull-left" role="button"
 			   title="View Folio Details"> <span class="fa-text-inside"><t t-esc="folio_name"/></span></i>
 		</div>
@@ -205,6 +205,12 @@
 			<span class="fa fa-money fa-2x" role="button"
 				title="Folio Payments" />
 		</div>
+		<t t-if="reservation_type =='normal'">
+			<div class="col-sm-2 btn_popover_open_invoice">
+				<span class="fa fa-pencil-square-o fa-2x" role="button"
+					title="Invoice Folio" />
+			</div>
+		</t>
 	</div>
 	<div class="row row-eq-height mt-10">
 		<div class="col-sm-12">
@@ -268,7 +274,7 @@
 			</div>
 		</div>
 		<t t-call="HotelCalendar.TooltipReservation.Dates"/>
-		<div class="row row-eq-height mt-10">
+		<div class="row row-eq-height my-10">
 			<div class="col-sm-4 btn_popover_open_folio">
 				<i class="fa fa-file-text-o fa-2x fa-pull-left" role="button"
 				   title="View Folio Details"> <span class="fa-text-inside"><t t-esc="folio_name"/></span></i>