Merge branch 'v1.3.x' into v1.3.1

Qloapps · Oct 31, 2018 · 102343d · 102343d
2 parents 3f49dd4 + e13d07f
commit 102343d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,4 +33,4 @@ after_failure:
   - cat /etc/apache2/sites-available/000-default.conf
   - sudo cat /var/log/php-fpm.log
   - sudo ls -l /var/log/apache2
-  - sudo cat /var/log/apache2/other_vhosts_access.log
+  - sudo cat /var/log/apache2/other_vhosts_access.log
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -342,4 +342,4 @@
 [-] MO : wktestimonialblock : Fixed while adding the image in valid format on configuration page then showing error page.
 [-] MO : wkpaypaladaptive : Fixed paypal is not working because paypal api has been changed.
 [-] MO : wkpaypaladaptive : Fixed fopen issues fixed, done by CURL.
-[-] MO : wkpaypaladaptive : Fixed payment negative value bug fixed.
+[-] MO : wkpaypaladaptive : Fixed payment negative value bug fixed.
diff --git a/install/controllers/http/system.php b/install/controllers/http/system.php
@@ -160,4 +160,4 @@ public function display()
 
         $this->displayTemplate('system');
     }
-}
+}
diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
@@ -1530,4 +1530,4 @@ public function getRowByIdOrderIdProductInDateRange($id_order, $id_product, $dat
     {
         return Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_order`='.(int) $id_order.' AND `id_product`='.(int) $id_product.' AND `date_from`=\''.$date_from.'\' AND `date_to`= \''.$date_to.'\'');
     }
-}
+}
diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php
@@ -805,4 +805,4 @@ public static function getHotelCartInfoIdOrderIdProduct($id_cart, $id_product)
     {
         return Db::getInstance()->executeS("SELECT * FROM `"._DB_PREFIX_."htl_cart_booking_data` WHERE `id_cart`=".(int) $id_cart." AND `id_product`=".(int) $id_product);
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -160,4 +160,4 @@ public function display() @@
             $this->displayTemplate('system');
         }
-    }
+    }